linux-toradex.git/drivers/input/touchscreen/Makefile, branch kk4.4.2_1.0.0-beta

Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_1.1.0' into imx_3.0.35_android

2012-11-30T03:59:33+00:00

Conflicts:
	arch/arm/mach-mx6/board-mx6q_sabrelite.c
	arch/arm/mach-mx6/board-mx6q_sabresd.c
	arch/arm/plat-mxc/cpufreq.c

ENGR00234781 input: add novatek touch screen driver.

2012-11-28T08:57:07+00:00

This patch add device drvier for novatek touch screen driver.
This touch screen chip will be support because it have
more populary screen size.

Signed-off-by: Zhang Jiejing

ENGR00214081-1 Input: Remove redefined Item in Kconfig And Makefile

2012-07-20T05:38:55+00:00

Remove redefined Item in Kconfig And Makefile for MAX11081

Signed-off-by: Lin Fuzhen

ENGR00180621-1: Add ELAN capacity touch screen driver

2012-07-20T05:36:42+00:00

Add Elan ts driver.

Signed-off-by: Robby Cai 
Acked-by: Lily Zhang

ENGR00139238-2 Touch: add p1003 and egalax

2012-07-20T05:14:50+00:00

Add p1003 and egalax touch driver

Signed-off-by: Frank Li

ENGR00138130-1 input: add max11801 resistance touchscreen controller driver

2012-07-20T05:10:42+00:00

Add MAXI max11801 resistance touch screen controller driver,
This driver use Auto Mode and Aperture Mode.

Other max1180x driver can support in this driver, they use
almost same register address and define, you can find a table in
max11801_ts.c

You can find data sheet under this link:
http://www.maxim-ic.com/datasheet/index.mvp/id/5943

Signed-off-by: Zhang Jiejing

ENGR00141391-2 PMIC: porting da9053 to i.mx platform

2012-07-20T05:10:24+00:00

Fix da9053 backlight Kconfig error
porting da9052 regulator driver

Signed-off-by: Zhou Jingyu 
Acked-by: Lily Zhang

ENGR00141217-7 touch: p1003 touch screen driver for 2.6.38

2012-07-20T05:10:22+00:00

add p1003

Signed-off-by: Frank Li

ENGR00214081-1 Input: Remove redefined Item in Kconfig And Makefile

2012-06-19T08:27:27+00:00

Remove redefined Item in Kconfig And Makefile for MAX11081

Signed-off-by: Lin Fuzhen

Merge remote branch 'fsl-linux-sdk/imx_3.0.15' into imx_3.0.15_android

2012-05-25T09:06:07+00:00

Conflicts:
	arch/arm/configs/imx6_defconfig
	arch/arm/kernel/smp.c
	arch/arm/mach-mx6/board-mx6q_arm2.c
	arch/arm/mach-mx6/board-mx6q_sabreauto.c
	arch/arm/mach-mx6/board-mx6q_sabrelite.c
	arch/arm/mach-mx6/board-mx6q_sabresd.c
	arch/arm/mach-mx6/bus_freq.c
	arch/arm/mach-mx6/clock.c
	arch/arm/mach-mx6/cpu.c
	arch/arm/mach-mx6/devices-imx6q.h
	arch/arm/mach-mx6/mx6_ddr_freq.S
	arch/arm/mach-mx6/mx6_mmdc.c
	arch/arm/mach-mx6/mx6_suspend.S
	arch/arm/mach-mx6/mx6_wfi.S
	arch/arm/mach-mx6/plat_hotplug.c
	arch/arm/mach-mx6/pm.c
	arch/arm/mach-mx6/system.c
	arch/arm/plat-mxc/cpufreq.c
	arch/arm/plat-mxc/system.c
	drivers/media/video/mxc/capture/Kconfig
	drivers/media/video/mxc/capture/mxc_v4l2_capture.c
	drivers/media/video/mxc/capture/ov5640_mipi.c
	drivers/media/video/mxc/output/mxc_vout.c
	drivers/mmc/host/sdhci.c
	drivers/mtd/nand/gpmi-nand/gpmi-lib.c
	drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
	drivers/mxc/ipu3/vdoa.c
	drivers/power/max8903_charger.c
	drivers/video/mxc/mxc_ipuv3_fb.c
	sound/soc/codecs/mxc_spdif.c
	sound/soc/imx/Makefile
	sound/soc/imx/imx-wm8962.c