Minor ARM config updates/cleanups, ARM GPIO/I2C updates, ARM usb gadget updates

9 files changed, 44 insertions, 26 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 6f3811f01..21f66b0f1 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -17,6 +17,7 @@ CONFIG_ARM_ARCH_TIMER=y
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
 CONFIG_NR_CPUS=8
 CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
 
 # ARM AMBA generic HW
 CONFIG_ARM_AMBA=y
@@ -44,6 +45,7 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_DEVICE=y
+CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
@@ -77,11 +79,23 @@ CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
 
 # GPIO
-CONFIG_GENERIC_GPIO=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIO_GENERIC=m
 CONFIG_GPIOLIB=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_MDIO_GPIO=m
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_RESTART=y
+
+#i2c
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_MUX=m
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_MUX_PCA9541=m
 
 # MFD
 CONFIG_MFD_CORE=m
diff --git a/config-arm64 b/config-arm64
index 9ddfaf288..850295082 100644
--- a/config-arm64
+++ b/config-arm64
@@ -30,7 +30,6 @@ CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GPIO_DEVRES=y
 CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
@@ -67,7 +66,6 @@ CONFIG_VM_EVENT_COUNTERS=y
 # not arm64
 # CONFIG_HW_RANDOM_ATMEL is not set
 # CONFIG_HW_RANDOM_EXYNOS is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_ADNP is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
diff --git a/config-armv7 b/config-armv7
index 0ad00f2b7..09ee753af 100644
--- a/config-armv7
+++ b/config-armv7
@@ -20,11 +20,6 @@ CONFIG_ARCH_ZYNQ=y
 # CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_ARM_VIRT_EXT is not set
 
-# Generic
-CONFIG_REMOTEPROC=m
-# Need at some point for am33xx and others
-# CONFIG_IIO is not set
-
 # mvebu
 CONFIG_MACH_ARMADA_370_XP=y
 CONFIG_MACH_ARMADA_370=y
@@ -147,10 +142,6 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD_OMAP3=y
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
-# CONFIG_MUSB_PIO_ONLY is not set
-# CONFIG_USB_MUSB_DEBUG is not set
 CONFIG_OMAP_CONTROL_USB=m
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
@@ -312,6 +303,8 @@ CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
 CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
+CONFIG_USB_MUSB_AM335X_CHILD=y
+CONFIG_USB_TI_CPPI41_DMA=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_TI_ST=m
 CONFIG_TI_DAC7512=m
@@ -440,11 +433,6 @@ CONFIG_RTC_DRV_DA9055=m
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
 
-# exynos
-# CONFIG_DRM_EXYNOS is not set
-# CONFIG_PINCTRL_EXYNOS5440 is not set
-# CONFIG_PINCTRL_EXYNOS is not set
-
 # picoxcell
 CONFIG_CRYPTO_DEV_PICOXCELL=m
 CONFIG_HW_RANDOM_PICOXCELL=m
@@ -586,6 +574,11 @@ CONFIG_MFD_TC6387XB=y
 
 # Generic drivers
 
+CONFIG_REMOTEPROC=m
+
+# Need at some point for am33xx and others
+# CONFIG_IIO is not set
+
 # Regulator drivers
 CONFIG_REGULATOR_FAN53555=m
 # CONFIG_REGULATOR_88PM800 is not set
@@ -602,8 +595,19 @@ CONFIG_REGULATOR_MAX8907=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8973=m
 
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_GPIO=m
+CONFIG_PDA_POWER=m
+
 # usb gadget 
 CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_DUAL_ROLE=y
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_GPIO_VBUS=m
+# CONFIG_MUSB_PIO_ONLY is not set
+# CONFIG_USB_MUSB_DEBUG is not set
 CONFIG_USB_GADGET_VBUS_DRAW=100
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_FSL_USB2 is not set
@@ -665,7 +669,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 
 # CONFIG_VIRTUALIZATION is not set
-# CONFIG_CHARGER_MANAGER is not set
 # CONFIG_POWER_RESET_QNAP is not set
 # CONFIG_OMAP2_DSS_DEBUG is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index a89644a22..67b43d132 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -107,7 +107,6 @@ CONFIG_SCHED_SMT=y
 
 CONFIG_RCU_FANOUT=32
 
-# 2013/04/19 - disable due to stability issues in 3.9 for the moment
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
@@ -139,7 +138,6 @@ CONFIG_LBDAF=y
 CONFIG_USE_OF=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
-CONFIG_I2C_MUX_PINCTRL=m
 
 # General vexpress ARM drivers
 CONFIG_ARM_TIMER_SP804=y
@@ -157,6 +155,7 @@ CONFIG_PL330_DMA=m
 CONFIG_AMBA_PL08X=y
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_GPIO_PL061=y
+CONFIG_PL320_MBOX=y
 
 # usb
 CONFIG_USB_OTG=y
@@ -185,6 +184,7 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_SAMSUNG is not set
 # CONFIG_PINCTRL_EXYNOS4 is not set
 
@@ -193,7 +193,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
 # CONFIG_GPIO_EM is not set
 CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_MCP23S08=m
-CONFIG_POWER_RESET_GPIO=y
 CONFIG_SERIAL_8250_EM=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
@@ -247,9 +246,11 @@ CONFIG_MPCORE_WATCHDOG=m
 
 # Thermal / powersaving
 CONFIG_THERMAL=y
-CONFIG_POWER_RESET_RESTART=y
 CONFIG_ARM_PSCI=y
 
+# Mailbox
+CONFIG_MAILBOX=y
+
 # MTD
 # CONFIG_MG_DISK is not set
 CONFIG_MTD_DATAFLASH=m
diff --git a/config-generic b/config-generic
index 4efadb9b7..5c3c28e58 100644
--- a/config-generic
+++ b/config-generic
@@ -4819,6 +4819,7 @@ CONFIG_ZSWAP=y
 # CONFIG_W1_MASTER_GPIO is not set
 # CONFIG_LEDS_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
diff --git a/config-powerpc-generic b/config-powerpc-generic
index f24becf02..2037e893f 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -334,7 +334,6 @@ CONFIG_I2C_MPC=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 # CONFIG_CRYPTO_SHA1_PPC is not set
 
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MCP23S08 is not set
 
 # CONFIG_CAN_FLEXCAN is not set
diff --git a/config-s390x b/config-s390x
index a292f425e..b4c95a552 100644
--- a/config-s390x
+++ b/config-s390x
@@ -234,8 +234,6 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 # CONFIG_S390_PTDUMP is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 # CONFIG_PCI is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_MCP23S08 is not set
 
 # CONFIG_NEW_LEDS is not set
 # CONFIG_HID is not set
diff --git a/config-x86-generic b/config-x86-generic
index 4623c1112..d2926802e 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -365,7 +365,6 @@ CONFIG_LPC_ICH=m
 
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_F7188X is not set
 
diff --git a/kernel.spec b/kernel.spec
index 080525448..9f888e2a0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2275,6 +2275,11 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sun Oct 13 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config updates/cleanups
+- ARM GPIO/I2C updates
+- ARM usb gadget updates
+
 * Sat Oct 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc4.git4.1
 - Linux v3.12-rc4-91-g46f3751