From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 9 Aug 2011 02:06:42 +0000 (+0800)
Subject: Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
X-Git-Tag: firefly_0821_release~9775^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2f206fddfe16efd5722cfce24f8335bea3ff6692;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

Conflicts:
	drivers/input/touchscreen/Makefile
	drivers/media/video/rk29_camera.c
	sound/soc/codecs/wm8994.c
---

2f206fddfe16efd5722cfce24f8335bea3ff6692
diff --cc arch/arm/mach-rk29/board-rk29phonepadsdk.c
index 32b847998127,e1c21f3c836b..2dcf75d5c4eb
mode 100644,100755..100755
--- a/arch/arm/mach-rk29/board-rk29phonepadsdk.c
+++ b/arch/arm/mach-rk29/board-rk29phonepadsdk.c
diff --cc drivers/input/touchscreen/Makefile
index ac2ae262e849,4c05a40954ae..219d37e20282
mode 100755,100644..100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@@ -54,6 -42,6 +54,7 @@@ obj-$(CONFIG_TOUCHSCREEN_WM97XX_ATMEL)	
  obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE)	+= mainstone-wm97xx.o
  obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE)	+= zylonite-wm97xx.o
  obj-$(CONFIG_TOUCHSCREEN_W90X900)	+= w90p910_ts.o
++obj-$(CONFIG_TOUCHSCREEN_TPS6507X)	+= tps6507x-ts.o
  obj-$(CONFIG_TOUCHSCREEN_PCAP)		+= pcap_ts.o
  obj-$(CONFIG_TOUCHSCREEN_XPT2046_NORMAL_SPI)	+= xpt2046_ts.o
  obj-$(CONFIG_TOUCHSCREEN_XPT2046_TSLIB_SPI)	+= xpt2046_tslib_ts.o ts_lib/
diff --cc drivers/media/video/rk29_camera.c
index ac95527486c5,3e19731fe08c..f4bcf2023b93
--- a/drivers/media/video/rk29_camera.c
+++ b/drivers/media/video/rk29_camera.c
@@@ -555,4 -555,4 +555,4 @@@ static struct platform_device android_p
  
  #endif
  
--#endif //#ifdef CONFIG_VIDEO_RK29
++#endif //#ifdef CONFIG_VIDEO_RK29
diff --cc drivers/mmc/host/rk29_sdmmc.c
index 72cf1c428f9a,a4635fd95afa..0e8de6d7c1bd
mode 100644,100755..100755
--- a/drivers/mmc/host/rk29_sdmmc.c
+++ b/drivers/mmc/host/rk29_sdmmc.c
@@@ -2757,9 -2793,9 +2795,10 @@@ static int rk29_sdmmc_probe(struct plat
  	}
  
      mmc->ops = &rk29_sdmmc_ops[pdev->id];
 +	mmc->pm_flags |= MMC_PM_IGNORE_PM_NOTIFY;
  	mmc->f_min = FOD_FREQ;
- #if 0
+ 	
+ #if RK29_SDMMC_DEFAULT_SDIO_FREQ
      mmc->f_max = SDHC_FPP_FREQ;
  #else
      if(RK29_CTRL_SDMMC_ID== host->pdev->id)