* General ARM config cleanups

- Remove old/dupe ARM config options
- Enable external connectors on ARM
- Enable i.MX and TI thermal controllers
- Enable i.MX RNG driver
- ARM MFD and REGULATOR changes and cleanups
- AM33xx (BeagleBone) config improvements
- Rebase OMAP DVI patch
- Enable console for Zynq-7xxx SoCs

1 files changed, 57 insertions, 75 deletions

diff --git a/config-armv7 b/config-armv7
index 402939030..930365fe1 100644
--- a/config-armv7
+++ b/config-armv7
@@ -25,16 +25,6 @@ CONFIG_REMOTEPROC=m
 # Need at some point for am33xx and others
 # CONFIG_IIO is not set
 
-# FIXME should be generic (I think it's enabled by default)
-CONFIG_FB=y
-CONFIG_FB_ARMCLCD=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_TOUCHSCREEN_ADS7846=m
-
-CONFIG_OC_ETM=y
-
 # mvebu
 CONFIG_MACH_ARMADA_370_XP=y
 CONFIG_MACH_ARMADA_370=y
@@ -146,7 +136,6 @@ CONFIG_TWL6030_PWM=m
 CONFIG_TWL6040_CORE=y
 CONFIG_CLK_TWL6040=m
 CONFIG_OMAP_INTERCONNECT=m
-# CONFIG_MFD_TPS80031 is not set
 CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MTD_ONENAND_OMAP2=m
 CONFIG_HDQ_MASTER_OMAP=m
@@ -171,6 +160,14 @@ CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_OMAP=y
 CONFIG_SENSORS_TWL4030_MADC=m
 
+# OMAP5 (possibly other devices too)
+CONFIG_MFD_PALMAS=y
+CONFIG_PINCTRL_PALMAS=y
+CONFIG_EXTCON_PALMAS=m
+CONFIG_RTC_DRV_PALMAS=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_GPIO_PALMAS=y
+
 CONFIG_WL_TI=y
 CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
@@ -197,6 +194,8 @@ CONFIG_TOUCHSCREEN_TI_TSCADC=m
 
 # OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES
 CONFIG_OMAP_BANDGAP=y
+CONFIG_TI_SOC_THERMAL=m
+CONFIG_TI_THERMAL=y
 CONFIG_OMAP4_THERMAL=y
 CONFIG_OMAP5_THERMAL=y
 
@@ -250,16 +249,6 @@ CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m
 CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
 CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
 CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
-# CONFIG_PANEL_GENERIC_DPI is not set
-# CONFIG_PANEL_TFP410 is not set
-# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
-# CONFIG_PANEL_SHARP_LS037V7DW01 is not set
-# CONFIG_PANEL_NEC_NL8048HL11_01B is not set
-# CONFIG_PANEL_PICODLP is not set
-# CONFIG_PANEL_TAAL is not set
-# CONFIG_PANEL_TPO_TD043MTEA1 is not set
-# CONFIG_PANEL_ACX565AKM is not set
-# CONFIG_PANEL_N8X0 is not set
 
 # Enable V4L2 drivers for OMAP2+
 CONFIG_MEDIA_CONTROLLER=y
@@ -278,11 +267,6 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_V4L_TEST_DRIVERS=y
 CONFIG_VIDEO_VIVI=m
 
-CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
-CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
-CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-
 CONFIG_SND_OMAP_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_OMAP_SOC_AM3517EVM=m
@@ -326,10 +310,10 @@ CONFIG_OMAP_REMOTEPROC=m
 # AM33xx
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
+CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_TI_ST=m
-CONFIG_TI_SOC_THERMAL=m
 CONFIG_TI_DAC7512=m
 CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=m
@@ -339,14 +323,12 @@ CONFIG_TI_CPTS=y
 CONFIG_TI_EMIF=m
 CONFIG_DRM_TILCDC=m
 CONFIG_SPI_DAVINCI=m
-CONFIG_MFD_TPS65217=m
 CONFIG_REGULATOR_TI_ABB=y
-CONFIG_REGULATOR_TPS65217=m
-CONFIG_BACKLIGHT_TPS65217=m
 CONFIG_TI_PRIV_EDMA=y
 CONFIG_TI_EDMA=y
 CONFIG_TI_CPPI41=m
 CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_CHARGER_BQ24190=m
 
 # Allwinner a1x
 CONFIG_PINCTRL_SUNXI=y
@@ -358,12 +340,14 @@ CONFIG_SUN4I_EMAC=m
 # imx 
 CONFIG_MXC_IRQ_PRIOR=y
 # CONFIG_MXC_DEBUG_BOARD is not set
-CONFIG_MACH_IMX51_DT=y
-# CONFIG_MACH_MX51_BABBAGE is not set
-# CONFIG_MACH_EUKREA_CPUIMX51SD is not set
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_MACH_IMX51_DT=y
+# CONFIG_MACH_MX51_BABBAGE is not set
+# CONFIG_MACH_EUKREA_CPUIMX51SD is not set
+CONFIG_ARM_IMX6Q_CPUFREQ=m
+CONFIG_IMX_THERMAL=m
 CONFIG_PATA_IMX=m
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
@@ -381,8 +365,10 @@ CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_W1_MASTER_MXC=m
 CONFIG_IMX_WEIM=y
 CONFIG_IMX2_WDT=m
+CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_CRYPTO_DEV_SAHARA=m
 # CONFIG_FB_MX3 is not set
+
 CONFIG_SND_IMX_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
@@ -394,6 +380,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_IMX_SPDIF=m
+
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
@@ -408,6 +395,7 @@ CONFIG_IMX_SDMA=m
 CONFIG_IMX_DMA=m
 CONFIG_AHCI_IMX=m
 # CONFIG_MXS_DMA is not set
+
 CONFIG_PWM_IMX=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_DRM_IMX=m
@@ -418,7 +406,10 @@ CONFIG_DRM_IMX_IPUV3=m
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
 CONFIG_VIDEO_CODA=m
+
+CONFIG_MFD_SYSCON=y
 CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
 CONFIG_LEDS_MC13783=m
@@ -427,6 +418,27 @@ CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_88PM80X_ONKEY=m
 
+# i.MX6Q (and likely Samsung among others) 
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9055=y
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9055_ONKEY=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DA9055=m
+CONFIG_BATTERY_DA9052=m
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_DA9055=m
+CONFIG_DA9052_WATCHDOG=m
+CONFIG_DA9055_WATCHDOG=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_LEDS_DA9052=m
+CONFIG_RTC_DRV_DA9052=m
+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
@@ -501,6 +513,7 @@ CONFIG_TEGRA20_APB_DMA=y
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
 
+CONFIG_MFD_MAX8907=m
 CONFIG_KEYBOARD_TEGRA=m
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
@@ -530,7 +543,6 @@ CONFIG_NVEC_LEDS=y
 CONFIG_NVEC_PAZ00=y
 CONFIG_MFD_TPS6586X=y
 CONFIG_GPIO_TPS6586X=y
-CONFIG_REGULATOR_TPS6586X=m
 CONFIG_RTC_DRV_TPS6586X=m
 
 CONFIG_PWM_TEGRA=m
@@ -545,12 +557,15 @@ CONFIG_DRM_TEGRA=y
 CONFIG_CRYPTO_DEV_TEGRA_AES=m
 
 CONFIG_LEDS_RENESAS_TPU=y
+CONFIG_GPIO_PCA953X=m
 
 # OLPC XO
 CONFIG_SERIO_OLPC_APSP=m
 
 # Zynq-7xxx
 # likely needs usb/mmc still
+CONFIG_SERIAL_UARTLITE=y
+CONFIG_SERIAL_UARTLITE_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
@@ -562,42 +577,29 @@ CONFIG_GPIO_XILINX=y
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
 
-# MMC/SD
-CONFIG_MMC_TMIO=m
-CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MMC_SDHCI_PXAV2=m
-
 # Multi function devices
 CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
 CONFIG_MFD_T7L66XB=y
 CONFIG_MFD_TC6387XB=y
 
+# Generic drivers
+
 # Regulator drivers
 CONFIG_REGULATOR_FAN53555=m
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_REGULATOR_DUMMY is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 # CONFIG_REGULATOR_88PM800 is not set
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=y
+CONFIG_REGULATOR_LP8755=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8907=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6524X=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65912=m
-CONFIG_REGULATOR_MAX8907=m
-CONFIG_REGULATOR_LP872X=y
-CONFIG_REGULATOR_LP8755=m
 
 # usb gadget 
 CONFIG_USB_GADGET=m
@@ -628,8 +630,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_ETH_EEM is not set
 
 # Needs work/investigation
-
-# CONFIG_ARM_CHARLCD is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
@@ -639,37 +639,22 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 
 # Defined config options we don't use yet
 # CONFIG_PINCTRL_IMX35 is not set
-# CONFIG_DRM_IMX_FB_HELPER is not set
-# CONFIG_DRM_IMX_PARALLEL_DISPLAY is not set
-# CONFIG_DRM_IMX_IPUV3_CORE is not set
-# CONFIG_DRM_IMX_IPUV3 is not set
-# CONFIG_REGULATOR_ANATOP is not set
 
 # CONFIG_BATTERY_RX51 is not set
 # CONFIG_IR_RX51 is not set
 # CONFIG_GENERIC_CPUFREQ_CPU0 is not set
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_DA9055 is not set
 # CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_DA9052_I2C is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_MFD_DA9055 is not set
 # CONFIG_MFD_SMSC is not set
-# CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_ADP5520 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
 
 # CONFIG_DVB_USB_PCTV452E is not set
 # We need to fix these as they should be either generic includes or kconfig fixes
@@ -681,7 +666,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_VIRTUALIZATION is not set
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_POWER_RESET_QNAP is not set
-# CONFIG_POWER_RESET_RESTART is not set
 # CONFIG_OMAP2_DSS_DEBUG is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
 # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
@@ -689,6 +673,4 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 
 # CONFIG_SOC_VF610 is not set
 # CONFIG_ARM_CCI is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_SERIAL_UARTLITE is not set
-
+# CONFIG_MMC_TMIO is not set