Import F320 V30D kernel into LA.BF.1.1.1_RB1.05.00.02.042.013

Conflicts:
	drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
	drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.h
	drivers/nfc/nfc-nci.c
	drivers/video/msm/mdss/mdss_mdp_ctl.c
	sound/soc/codecs/Makefile
	sound/soc/codecs/wcd9320.c
	sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

AndroidKernel.mk

@@ -24,7 +24,8 @@ DTS_NAMES ?= $(shell $(PERL) -e 'while (<>) {$$a = $$1 if /CONFIG_ARCH_((?:MSM|Q
 KERNEL_USE_OF ?= $(shell $(PERL) -e '$$of = "n"; while (<>) { if (/CONFIG_USE_OF=y/) { $$of = "y"; break; } } print $$of;' kernel/arch/arm/configs/$(KERNEL_DEFCONFIG))
 
 ifeq "$(KERNEL_USE_OF)" "y"
-DTS_FILES = $(wildcard $(TOP)/kernel/arch/arm/boot/dts/$(DTS_NAME)*.dts)
+DTS_FILES = $(wildcard $(TOP)/kernel/arch/arm/boot/dts/$(DTS_TARGET)/$(DTS_NAME)*.dts)
+# DTS_FILES = $(wildcard $(TOP)/kernel/arch/arm/boot/dts/$(DTS_NAME)*.dts)
 DTS_FILE = $(lastword $(subst /, ,$(1)))
 DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call DTS_FILE,$(1))))
 ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call DTS_FILE,$(1))))
@@ -70,16 +71,68 @@ endef
 $(KERNEL_OUT):
 	mkdir -p $(KERNEL_OUT)
 
+
+# LGE_CHANGE_S
+# porting bootchart2 to android
+# # [email protected] 20120620
+ifeq ($(INIT_BOOTCHART2),true)
+KERNEL_DEFCONFIG_PATH:=kernel/arch/arm/configs/$(KERNEL_DEFCONFIG)
+KERNEL_DEFCONFIG_BC2_PATH:=kernel/arch/arm/configs/bc2_$(KERNEL_DEFCONFIG)
+
+bootchart2defconfig:
+	cp -f $(KERNEL_DEFCONFIG_PATH) $(KERNEL_DEFCONFIG_BC2_PATH)
+	echo "CONFIG_TASKSTATS=y" >> $(KERNEL_DEFCONFIG_BC2_PATH)
+	echo "CONFIG_TASK_DELAY_ACCT=y" >> $(KERNEL_DEFCONFIG_BC2_PATH)
+	echo "CONFIG_TASK_XACCT=y" >> $(KERNEL_DEFCONFIG_BC2_PATH)
+	echo "CONFIG_TASK_IO_ACCOUNTING=y" >> $(KERNEL_DEFCONFIG_BC2_PATH)
+	echo "CONFIG_CONNECTOR=y" >> $(KERNEL_DEFCONFIG_BC2_PATH)
+	echo "CONFIG_PROC_EVENTS=y" >> $(KERNEL_DEFCONFIG_BC2_PATH)
+
+
+$(KERNEL_CONFIG): $(KERNEL_OUT) bootchart2defconfig
+	$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- bc2_$(KERNEL_DEFCONFIG)
+else
+# LGE_CHANGE_E
+
 $(KERNEL_CONFIG): $(KERNEL_OUT)
 	$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- $(KERNEL_DEFCONFIG)
 
+ifneq ($(TARGET_BUILD_VARIANT), user)
+	echo "CONFIG_MMC_MSM_DEBUGFS=y" >> $(KERNEL_CONFIG)
+endif
+
+# LGE_CHANGE_S
+# porting bootchart2 to android
+# [email protected] 20120620
+endif
+# LGE_CHANGE_E
+
+#[BRCM][WAPI][CHINA]Broadcom chipset yongcan.guo for CHINA WAPI  CONFIG_BRCM_WAPI=y
+ifeq ($(TARGET_COUNTRY),CN)
+	echo "CONFIG_BRCM_WAPI=y" >> $(KERNEL_CONFIG)
+endif
+
 $(KERNEL_OUT)/piggy : $(TARGET_PREBUILT_INT_KERNEL)
 	$(hide) gunzip -c $(KERNEL_OUT)/arch/arm/boot/compressed/piggy.gzip > $(KERNEL_OUT)/piggy
 
 $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL)
 	$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi-
 	$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- modules
 	$(MAKE) -C kernel O=../$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 ARCH=arm CROSS_COMPILE=arm-eabi- modules_install
+
+ifeq ($(PRODUCT_SUPPORT_EXFAT), y)
+	@cp -f $(ANDROID_BUILD_TOP)/kernel/tuxera_update.sh $(ANDROID_BUILD_TOP)
+	@sh tuxera_update.sh --target target/lg.d/mobile-msm8974 --use-cache --latest --max-cache-entries 2 --source-dir $(ANDROID_BUILD_TOP)/kernel --output-dir $(ANDROID_BUILD_TOP)/$(KERNEL_OUT) -a --user lg-mobile --pass AumlTsj0ou
+	@tar -xzf tuxera-exfat*.tgz
+	@mkdir -p $(TARGET_OUT_EXECUTABLES)
+	@cp $(ANDROID_BUILD_TOP)/tuxera-exfat*/exfat/kernel-module/texfat.ko $(ANDROID_BUILD_TOP)/$(TARGET_OUT_EXECUTABLES)/../lib/modules/
+	@cp $(ANDROID_BUILD_TOP)/tuxera-exfat*/exfat/tools/* $(TARGET_OUT_EXECUTABLES)
+	@rm -f kheaders*.tar.bz2
+	@rm -f tuxera-exfat*.tgz
+	@rm -rf tuxera-exfat*
+	@rm -f tuxera_update.sh
+endif
+
 	$(mv-modules)
 	$(clean-module-folder)
 	$(append-dtb)

Documentation/devicetree/bindings/leds/leds-max77819-flash.txt

@@ -0,0 +1,23 @@
+Device Tree bindings for max77819 Flash
+
+Valid node name : flash
+
+Optional properties for regulator:
+ - flash-en-control : Boolean. Flash triggered by FLASHEN pin.
+ - torch-en-control : Boolean. Flash triggered by TORCHEN pin.
+ - enable-maxflash : Boolean. MaxFlash function enable/disable.
+ - maxflash-threshold : Integer. Max Flash Low battery detection threshold.
+		2400000uV to 3400000uV in 33333uV steps.
+ - maxflash-hysteresis: Integer. Low battery detection hysteresis.
+		One of 100000uV, 200000uV, 300000uV or -1. -1 means disabled.
+ - maxflash-falling-timer : Integer. Low Battery mask timer for falling edge of battery.
+		256us to 2048us in 256us steps.
+ - maxflash-rising-timer : Integer. Low Battery mask timer for rising edge of battery.
+		256us to 2048us in 256us steps.
+
+Example:
+
+	flash {
+		flash-en-control;
+		enable-maxflash;
+	};

Documentation/devicetree/bindings/mfd/max77819.txt

@@ -0,0 +1,75 @@
+Maxim MAX77819 multi-functional device
+
+MAX77819 is a Mulitifunction device with Charger, SFO and etc.
+
+* PMIC *
+Required properties:
+ - compatible : Must be "maxim,max77819-pmic".
+ - interrupt-parent : The parent interrupt controller.
+ - interrupts : Interrupt number.
+ - interrupt-controller : Mark the device node as an interrupt controller.
+ - #interrupt-cells : Should be four.
+
+Nodes:
+- charger
+- sfo
+- flah
+
+* Peripheral *
+Required properties:
+ - compatible : Must be "maxim,max77819-periph".
+
+Nodes:
+- wled
+- vibrator
+
+
+Example:
+	max77819_0: max77819@66 {
+		compatible = "maxim,max77819-pmic";
+		#address-cells = <0>;
+		max77819,int-gpio = //TBD
+		interrupt-parent = //TBD
+		interrupts = //TBD
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		reg = <0x66>;
+		status = "ok";
+
+		sfo {
+			//TBD
+		};
+
+		charger {
+			compatible = "maxim,max77819-charger";
+			status = "ok";
+			interrupt-parent = <&max77819_0>;
+			interrupts = <0>;
+			psy_name = "ac";
+			ext_psy_name = "usb";
+			supplied_to = "battery";
+			fast_charge_current = <1500000>;
+			charge_termination_voltage = <4350000>;
+			topoff_timer = <0>;
+			topoff_current = <200000>;
+			charge_restart_threshold = <150000>;
+			coop_psy_name = //TBD
+			enable_thermistor;
+			enable_aicl;
+			aicl_detection_voltage = <4500000>;
+			aicl_reset_threshold = <100000>;
+			current_limit_usb = <500000>;
+			current_limit_ac = <1500000>;
+		};
+
+		flash {
+			//TBD
+		};
+
+	max77819_1: max77819@48 {
+		//TBD
+
+		vibrator {
+			//TBD
+		};
+	};

Documentation/devicetree/bindings/misc/max77819-vibrator.txt

@@ -0,0 +1,11 @@
+max77819 Vibrator bindings
+
+Valid node name : vibrator
+
+Optional properties :
+ - current : Integer. 1000uA to 140000uA.
+
+Example:
+	vibrator {
+		current = <30>;
+	};

Documentation/devicetree/bindings/platform/device_name.txt

@@ -0,0 +1,73 @@
+Setting simple platform device name
+
+In case of legacy platform bus, device name could be set to combination
+with name and id of device in platform data of machine-board file.
+Especially, device name was same as platform device name itself when
+device id is -1.
+
+Now, in the age of device tree, platform device name consists of node name
+and unique id from global atomic value which are increased by registering
+order. So, this name has variant by device environment even though it points
+to same device. For example, simple platform device, "simple_dev" supports
+sysfs for user space to provide device information may have name as
+"simple_dev.95" in A device. But, same platform device in B devices may have
+"simple_dev.83" as name. Therefore, user space can't determine proper sysfs
+to get the information.
+
+Of course, this can be solved by using class driver. But, to simple platform
+driver like "simple_dev" as above example, usage of class driver is cost-waste.
+
+By this reason, it introduces two properties as following;
+
+- platform,dev,id
+- platform,dev,name
+
+If platform,dev,id and platform,dev,name are exist both, name is assigned to
+[name].[id].
+
+If platform,dev,id is 0 and platform,dev,name is exist, name is assigned to
+[name].
+
+If platform,dev,id is exist only, name is assigned to [node name].[id].
+
+If platform,dev,id is not exist(at this time, existence of name is not care),
+name is followed by original setting([node name].[unique id by atomic value]).
+
+Example:
+&soc {
+	...
+	platform,device,A@0 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		interrupt-controller;
+		#interrupt-cells = <3>;
+
+		/* /sys/devices/sim/... */
+		platform,dev,id = <0>;
+		platform,dev,name = "sim";
+	};
+
+	platform,device,B@1 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		interrupt-controller;
+		#interrupt-cells = <3>;
+
+		/* /sys/devices/sim.32/... */
+		platform,dev,id = <32>;
+		platform,dev,name = "sim";
+
+	};
+
+	platform,device,C@1 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		interrupt-controller;
+		#interrupt-cells = <3>;
+
+		/* maybe /sys/devices/platform,device,C.36/... */
+		platform,dev,name = "sim";
+	};
+
+	...
+};

Documentation/devicetree/bindings/power_supply/max17048.txt

@@ -0,0 +1,20 @@
+max17048 bindings
+
+Required properties :
+ - compatible : "maxim,max17048"
+ - model-data : Short Integer[32]
+
+Optional properties :
+ - rcomp : compensates the model for different lithium chemistries.
+ - empty-alert-threshold : the SOC threshold, where an interrupt is generated on the ALRT pin
+		and can be programmed from 1% up to 32%
+ - voltage-alert-threshold : Voltage alert maximum alerts.
+		It can be programmed from 0uV to 5120000uV.
+
+Example:
+	max17048@36 {
+		compatible = "maxim,max17048";
+		rcomp = <151>;
+		empty-alert-threshold = <4>;
+		model-data = <...>;
+	};

Documentation/devicetree/bindings/power_supply/max77819-charger.txt

@@ -0,0 +1,32 @@
+Device Tree bindings for max77819 Charger
+
+Required Properties :
+ - compatible : Should be "maxim,max77819-charger".
+
+Optional Properties :
+ - psy_name : Power supply name.
+ - fast_charge_current : fast charge current(uA)
+ - charge_termination_voltage : CV voltage(uV)
+ - topoff_timer : topoff timer(min)
+ - topoff_current : topoff current (uA)
+ - charge_restart_threshold : restart charging threshold (uV)
+ - enable_coop : enable dual charging with MAX8971.
+		If you use only MAX77819 charger, you should not define it.
+ - coop_psy_name : cooperation power supply name if you use dual charging.
+ - enable_thermistor : Enable thermistor
+ - enable_aicl : enable AICL function.
+ - aicl_detection_voltage : AICL detection voltage(uV)
+ - aicl_reset_threshold : AICL reset threshold(uV)
+
+
+Example:
+
+		charger {
+			compatible = "maxim,max77819-charger";
+			psy_name = "max77819-charger";
+			fast_charge_current = <0>;
+			enable_thermistor;
+			enable_aicl;
+			aicl_detection_voltage = <4500000>;
+			aicl_reset_threshold = <100000>;
+		};

Documentation/devicetree/bindings/regulator/max77819-sfo.txt

@@ -0,0 +1,15 @@
+Device Tree regulator bindings for max77819 SFO
+
+Optional properties for regulator:
+ - active-discharge : bool: Turn ON Active Discharge
+ - Any optional property defined in bindings/regulator/regulator.txt
+
+The valid names for regulators are:
+	safeout
+
+Example:
+
+	safeout {
+		regulator-min-microvolt = <500000>;
+		regulator-max-microvolt = <500000>;
+	};