[kernel] r19631 - in dists/trunk/linux/debian: . config/armhf

[Ben Hutchings]

Author: benh
Date: Sat Dec 22 13:57:58 2012
New Revision: 19631

Log:
[armhf/mx5] Fix up config for recent renaming, merging, removal, and other mess

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/armhf/config.mx5

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Dec 22 04:47:09 2012	(r19630)
+++ dists/trunk/linux/debian/changelog	Sat Dec 22 13:57:58 2012	(r19631)
@@ -18,6 +18,12 @@
   * staging: Enable RTLLIB; re-enable RTL8192E as module
   * media: Enable IR_TTUSBIR as module, replacing LIRC_TTUSBIR
   * media: Enable VIDEO_STK1160 as module, replacing EASYCAP
+  * [armhf/mx5] Update configuration:
+    - Enable MACH_IMX51_DT, replacing MACH_MX51_EFIKAMX (but not fully
+      working in this kernel version)
+    - Enable SOC_IMX53, replacing MACH_MX53_{EVK,SMD,LOCO,ARD}
+    - Re-enable MFD_MC13XXX_SPI (formerly included in MFD_MC13XXX)
+    - Enable PWM and re-enable PWM_IMX (formerly known as MXC_PWM)
 
  -- maximilian attems <maks at debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 

Modified: dists/trunk/linux/debian/config/armhf/config.mx5
==============================================================================
--- dists/trunk/linux/debian/config/armhf/config.mx5	Sat Dec 22 04:47:09 2012	(r19630)
+++ dists/trunk/linux/debian/config/armhf/config.mx5	Sat Dec 22 13:57:58 2012	(r19631)
@@ -21,11 +21,9 @@
 ##
 ## file: arch/arm/mach-imx/Kconfig
 ##
-CONFIG_MACH_MX51_EFIKAMX=y
-CONFIG_MACH_MX53_EVK=y
-CONFIG_MACH_MX53_SMD=y
-CONFIG_MACH_MX53_LOCO=y
-CONFIG_MACH_MX53_ARD=y
+#. CONFIG_MACH_MX51_EFIKAMX is gone 
+CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX53=y
 
 ##
 ## file: drivers/ata/Kconfig
@@ -69,6 +67,11 @@
 CONFIG_LEDS_TRIGGER_GPIO=y
 
 ##
+## file: drivers/mfd/Kconfig
+##
+CONFIG_MFD_MC13XXX_SPI=y
+
+##
 ## file: drivers/mmc/Kconfig
 ##
 CONFIG_MMC=m
@@ -97,6 +100,12 @@
 CONFIG_MWIFIEX_SDIO=m
 
 ##
+## file: drivers/pwm/Kconfig
+##
+CONFIG_PWM=y
+CONFIG_PWM_IMX=y
+
+##
 ## file: drivers/regulator/Kconfig
 ##
 #. Provide dummy if lookup fails