Linux v4.2

This is a squashed patch of the history from F22 + the 4.2 rebase

1 files changed, 171 insertions, 224 deletions

diff --git a/config-armv7 b/config-armv7
index 4aaa913a6..b3a496c46 100644
--- a/config-armv7
+++ b/config-armv7
@@ -2,17 +2,13 @@
 
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_KEYSTONE is not set
-CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_MXC=y
-# CONFIG_ARCH_OMAP2 is not set
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_PICOXCELL=y
-CONFIG_ARCH_ROCKCHIP=y
-# CONFIG_ARCH_SOCFPGA is not set
+CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_U8500=y
-# CONFIG_ARCH_VIRT is not set
 CONFIG_ARCH_ZYNQ=y
 
 # These are supported in the LPAE kernel
@@ -21,106 +17,48 @@ CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARM_VIRT_EXT is not set
 # CONFIG_VIRTUALIZATION is not set
 
-# mvebu
-CONFIG_MACH_ARMADA_370_XP=y
-CONFIG_MACH_ARMADA_370=y
-CONFIG_MACH_ARMADA_XP=y
-# CONFIG_MACH_ARMADA_375 is not set
-# CONFIG_MACH_ARMADA_38X is not set
-CONFIG_MACH_DOVE=y
-
-CONFIG_MVEBU_DEVBUS=y
-CONFIG_PCI_MVEBU=y
-CONFIG_CACHE_TAUROS2=y
-CONFIG_MV_XOR=y
-CONFIG_CRYPTO_DEV_MV_CESA=m
-CONFIG_MV643XX_ETH=m
-CONFIG_PINCTRL_MVEBU=y
-CONFIG_PINCTRL_ARMADA_370=y
-CONFIG_PINCTRL_ARMADA_XP=y
-CONFIG_PINCTRL_DOVE=y
-CONFIG_EDAC_MV64X60=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_88PM80X=m
-CONFIG_RTC_DRV_MV=m
-CONFIG_MVNETA=m
-CONFIG_GPIO_MVEBU=y
-CONFIG_MVEBU_CLK_CORE=y
-CONFIG_MVEBU_CLK_COREDIV=y
-CONFIG_MVEBU_CLK_GATING=y
-CONFIG_MMC_MVSDIO=m
-CONFIG_MMC_SDHCI_DOVE=m
-CONFIG_SPI_ORION=m
-CONFIG_USB_MV_UDC=m
-CONFIG_MVEBU_MBUS=y
-CONFIG_PHY_MVEBU_SATA=y
-CONFIG_ARMADA_THERMAL=m
-CONFIG_DOVE_THERMAL=m
-CONFIG_DRM_ARMADA=m
-CONFIG_ORION_WATCHDOG=m
-CONFIG_SND_KIRKWOOD_SOC=m
-CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
-CONFIG_USB_EHCI_HCD_ORION=m
-# CONFIG_CACHE_FEROCEON_L2 is not set
-# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
-
 # omap 
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_OMAP5=y
 # CONFIG_SOC_DRA7XX is not set
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
-# CONFIG_MACH_CM_T35 is not set
-# CONFIG_MACH_CM_T3517 is not set
-# CONFIG_MACH_CRANEBOARD is not set
-# CONFIG_MACH_DEVKIT8000 is not set
-# CONFIG_MACH_IGEP0030 is not set
 # CONFIG_MACH_NOKIA_RX51 is not set
-# CONFIG_MACH_OMAP_3430SDP is not set
-# CONFIG_MACH_OMAP_3630SDP is  not set
 # CONFIG_MACH_OMAP_LDP is not set
-# CONFIG_MACH_OMAP3_BEAGLE is not set
-# CONFIG_MACH_OMAP3517EVM is not set
 # CONFIG_MACH_OMAP3530_LV_SOM is not set
-# CONFIG_MACH_OMAP3EVM is not set
-# CONFIG_MACH_OMAP3_PANDORA is not set
 # CONFIG_MACH_OMAP3_TORPEDO is not set
-# CONFIG_MACH_OVERO is not set
-# CONFIG_MACH_SBC3530 is not set
-# CONFIG_MACH_TI8168EVM is not set
-# CONFIG_MACH_TI8148EVM is not set
-# CONFIG_MACH_TOUCHBOOK is not set
+# CONFIG_MACH_OMAP3517EVM is not set
+# CONFIG_MACH_OMAP3_PANDORA is not set
 
 CONFIG_SOC_HAS_REALTIME_COUNTER=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX=y
 CONFIG_OMAP_MUX_WARNINGS=y
 CONFIG_OMAP_32K_TIMER=y
-CONFIG_OMAP_32K_TIMER_HZ=128
 CONFIG_OMAP_PACKAGE_CBB=y
 CONFIG_OMAP_PACKAGE_CUS=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 
-CONFIG_OMAP_MCBSP=y
 CONFIG_OMAP2PLUS_MBOX=m
-CONFIG_OMAP_MBOX_FWK=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_PM_NOOP=y
-CONFIG_DMA_OMAP=y
+CONFIG_DMA_OMAP=m
 CONFIG_OMAP_IOMMU=y
-CONFIG_OMAP_IOVMM=m
 CONFIG_HWSPINLOCK_OMAP=m
-CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
+# CONFIG_PHY_DM816X_USB is not set
 
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_SERIAL_8250_OMAP=m
 
+# Needed by omap_hsmmc for card detect on at least the am33xx (BBone) platforms (changed in 4.2)
+CONFIG_GPIO_OMAP=y
 CONFIG_GPIO_TWL4030=m
 CONFIG_GPIO_TWL6040=m
 CONFIG_I2C_OMAP=m
 CONFIG_CHARGER_TWL4030=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_BQ2415X=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_MADC=m
@@ -130,9 +68,9 @@ CONFIG_BATTERY_TWL4030_MADC=m
 CONFIG_OMAP_USB2=m
 CONFIG_OMAP_CONTROL_PHY=m
 CONFIG_TI_PIPE3=m
+CONFIG_PCI_DRA7XX=y
 CONFIG_TWL4030_USB=m
 CONFIG_TWL6030_USB=m
-CONFIG_TWL6030_PWM=m
 CONFIG_TWL6040_CORE=y
 CONFIG_CLK_TWL6040=m
 CONFIG_OMAP_INTERCONNECT=m
@@ -145,9 +83,9 @@ CONFIG_USB_EHCI_HCD_OMAP=m
 CONFIG_USB_OHCI_HCD_OMAP3=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
-CONFIG_OMAP_CONTROL_USB=m
+CONFIG_USB_DWC3_OMAP=m
 CONFIG_MMC_OMAP=m
-CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_OMAP_HS=m
 CONFIG_RTC_DRV_MAX8907=m
 # CONFIG_RTC_DRV_TWL92330 is not set
 CONFIG_RTC_DRV_TWL4030=y
@@ -165,6 +103,9 @@ CONFIG_PINCTRL_PALMAS=y
 CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_PBIAS=m
 CONFIG_RTC_DRV_PALMAS=m
+CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_INPUT_PALMAS_PWRBUTTON=m
 
 CONFIG_WL_TI=y
 CONFIG_WLCORE_SDIO=m
@@ -178,8 +119,6 @@ CONFIG_MTD_ONENAND_OMAP2=m
 CONFIG_MTD_NAND_OMAP2=m
 CONFIG_MTD_NAND_OMAP_BCH=y
 CONFIG_SPI_OMAP24XX=m
-CONFIG_MFD_TI_SSP=m
-CONFIG_SPI_TI_SSP=m
 CONFIG_SPI_TI_QSPI=m
 
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
@@ -187,12 +126,9 @@ CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_TWL6040_VIBRA=m
 CONFIG_KEYBOARD_OMAP4=m
 CONFIG_KEYBOARD_TWL4030=m
-CONFIG_TOUCHSCREEN_TI_TSCADC=m
+CONFIG_LEDS_TCA6507=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=y
-CONFIG_TI_THERMAL=y
+# OMAP thermal temp.
 CONFIG_OMAP4_THERMAL=y
 CONFIG_OMAP5_THERMAL=y
 
@@ -217,13 +153,10 @@ CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_NUM_CRTCS=2
 CONFIG_OMAP2_VRFB=y
-# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
-# CONFIG_FB_OMAP_LCD_VGA is not set
 # CONFIG_FB_OMAP2 is not set
 # CONFIG_FB_DA8XX is not set
 
 CONFIG_OMAP2_DSS=m
-# CONFIG_OMAP2_DSS_DEBUG_SUPPORT is not set
 # CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
 CONFIG_OMAP2_DSS_DPI=y
 CONFIG_OMAP2_DSS_RFBI=y
@@ -231,11 +164,10 @@ CONFIG_OMAP2_DSS_VENC=y
 CONFIG_OMAP4_DSS_HDMI=y
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
-# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
 CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
-CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y
 CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 
+CONFIG_DISPLAY_ENCODER_OPA362=m
 CONFIG_DISPLAY_ENCODER_TFP410=m
 CONFIG_DISPLAY_ENCODER_TPD12S015=m
 CONFIG_DISPLAY_CONNECTOR_DVI=m
@@ -251,42 +183,32 @@ CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
 CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m
 
 # Enable V4L2 drivers for OMAP2+
-CONFIG_MEDIA_CONTROLLER=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_OMAP2_VOUT is not set
 CONFIG_VIDEO_OMAP3=m
+CONFIG_VIDEO_ADP1653=m
 # CONFIG_VIDEO_OMAP4 is not set
-# CONFIG_VIDEO_OMAP4_DEBUG is not set
 # The ones below are for TI Davinci
-# CONFIG_VIDEO_VPFE_CAPTURE is not set
-# CONFIG_VIDEO_VPSS_SYSTEM is not set
 # CONFIG_VIDEO_DM6446_CCDC is not set
-# CONFIG_VIDEO_DM644X_VPBE is not set
 # CONFIG_VIDEO_DM355_CCDC is not set
-# CONFIG_VIDEO_ISIF is not set
-# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIVI=m
 
 CONFIG_SND_OMAP_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_OMAP_SOC_AM3517EVM=m
 CONFIG_SND_OMAP_SOC_DMIC=m
-CONFIG_SND_OMAP_SOC_HDMI=m
-CONFIG_SND_OMAP_SOC_IGEP0020=m
+CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
 CONFIG_SND_OMAP_SOC_MCBSP=m
 CONFIG_SND_OMAP_SOC_MCPDM=m
-CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
-CONFIG_SND_OMAP_SOC_OMAP3EVM=m
-CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-CONFIG_SND_OMAP_SOC_OVERO=m
 CONFIG_SND_OMAP_SOC_RX51=m
-CONFIG_SND_OMAP_SOC_SDP4430=m
 CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
 CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 CONFIG_SND_SOC_PCM1792A=m
@@ -294,22 +216,12 @@ CONFIG_RADIO_WL128X=m
 
 CONFIG_OMAP_REMOTEPROC=m
 
-# CONFIG_TIDSPBRIDGE is not set
-# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000
-# CONFIG_TIDSPBRIDGE_DEBUG is not set
-# CONFIG_TIDSPBRIDGE_RECOVERY=y
-# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set
-# CONFIG_TIDSPBRIDGE_WDT3=y
-# CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5
-# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set
-# CONFIG_TIDSPBRIDGE_BACKTRACE is not set
-
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
 # CONFIG_OMAP_IOMMU_DEBUG is not set
 # CONFIG_OMAP_MUX_DEBUG is not set
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
 
-# AM33xx
+# AM33xx/43xx
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
 CONFIG_AM335X_CONTROL_USB=m
@@ -325,40 +237,123 @@ CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_CPSW=m
 CONFIG_TI_CPSW_PHY_SEL=y
+CONFIG_TI_CPSW_ALE=m
 CONFIG_TI_CPTS=y
 # Builtin needed for BBone White
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_TI_EMIF=m
 CONFIG_DRM_TILCDC=m
+# We only need this until the BBB dts is actually updated
+CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
 CONFIG_SPI_DAVINCI=m
 CONFIG_SND_DAVINCI_SOC=m
 CONFIG_SND_DAVINCI_SOC_I2S=m
 CONFIG_SND_DAVINCI_SOC_MCASP=m
 CONFIG_SND_DAVINCI_SOC_VCIF=m
 CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
+CONFIG_SND_EDMA_SOC=m
 CONFIG_SND_AM33XX_SOC_EVM=m
 CONFIG_REGULATOR_TI_ABB=m
 CONFIG_TI_ADC081C=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_PWM_TIPWMSS=y
-# CONFIG_GPIO_DAVINCI is not set
-# CONFIG_DAVINCI_WATCHDOG is not set
+CONFIG_MFD_TPS65218=m
+CONFIG_REGULATOR_TPS65218=m
+CONFIG_INPUT_TPS65218_PWRBUTTON=m
+CONFIG_VIDEO_AM437X_VPFE=m
+CONFIG_UIO_PRUSS=m
+CONFIG_WKUP_M3_RPROC=m
+
+# QCom
+CONFIG_ARCH_MSM8X60=y
+CONFIG_ARCH_MSM8960=y
+CONFIG_ARCH_MSM8974=y
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_PINCTRL_APQ8064=m
+CONFIG_PINCTRL_APQ8084=m
+CONFIG_PINCTRL_IPQ8064=m
+CONFIG_PINCTRL_MSM8660=m
+CONFIG_PINCTRL_MSM8960=m
+CONFIG_PINCTRL_MSM8X74=m
+CONFIG_PINCTRL_MSM8916=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_COMMON_CLK_QCOM=m
+# CONFIG_MSM_GCC_8916 is not set
+# CONFIG_IPQ_LCC_806X is not set
+# CONFIG_MSM_LCC_8960 is not set
+CONFIG_MFD_QCOM_RPM=m
+CONFIG_MFD_PM8921_CORE=m
+CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_MMCC_8084=m
+CONFIG_IPQ_GCC_806X=m
+CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_MMCC_8960=m
+CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_MMCC_8974=m
+CONFIG_HW_RANDOM_MSM=m
+CONFIG_I2C_QUP=m
+CONFIG_SPI_QUP=m
+CONFIG_GPIO_MSM_V2=m
+CONFIG_POWER_RESET_MSM=y
+CONFIG_USB_MSM_OTG=m
+CONFIG_MMC_SDHCI_MSM=m
+CONFIG_MMC_QCOM_DML=m
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_PM=y
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_USB_DWC3_QCOM=m
+CONFIG_DWMAC_IPQ806X=m
+CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_FBDEV=y
+CONFIG_USB_EHCI_MSM=m
+CONFIG_MFD_PM8XXX=m
+CONFIG_KEYBOARD_PMIC8XXX=m
+CONFIG_INPUT_PM8XXX_VIBRATOR=m
+CONFIG_INPUT_PMIC8XXX_PWRKEY=m
+CONFIG_INPUT_PM8941_PWRKEY=m
+CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set 
+CONFIG_QCOM_WDT=m
+CONFIG_MFD_SPMI_PMIC=m
+CONFIG_SPMI=m
+CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_LEDS_PM8941_WLED=m
+CONFIG_SND_SOC_QCOM=m
+CONFIG_SND_SOC_LPASS_CPU=m
+CONFIG_SND_SOC_LPASS_PLATFORM=m
+CONFIG_SND_SOC_STORM=m
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_HWSPINLOCK_QCOM=m
 
 # i.MX
-CONFIG_MXC_IRQ_PRIOR=y
 # CONFIG_MXC_DEBUG_BOARD is not set
 CONFIG_SOC_IMX50=y
+CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
+CONFIG_SOC_IMX7D=y
+# CONFIG_SOC_LS1021A is not set
 # CONFIG_SOC_VF610 is not set
-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_POWER_RESET_IMX=y
+CONFIG_PCI_IMX6=y
 CONFIG_IMX_THERMAL=m
+CONFIG_IMX_SDMA=m
+CONFIG_IMX_DMA=m
+CONFIG_MXS_DMA=y
+CONFIG_AHCI_IMX=m
 CONFIG_PATA_IMX=m
-CONFIG_PCI_IMX6=y
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
@@ -366,7 +361,10 @@ CONFIG_USB_CHIPIDEA_HOST=y
 # CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_FSL_USB2=m
 CONFIG_NET_VENDOR_FREESCALE=y
+# CONFIG_GIANFAR is not set
 CONFIG_FEC=m
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_KEYBOARD_IMX=m
 CONFIG_KEYBOARD_STMPE=m
 CONFIG_TOUCHSCREEN_STMPE=m
@@ -376,32 +374,46 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_I2C_IMX=m
 CONFIG_STMPE_I2C=y
 CONFIG_SPI_IMX=m
+CONFIG_SPI_FSL_QUADSPI=m
 CONFIG_STMPE_SPI=y
-CONFIG_MFD_MC13783=m
 CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_STMPE=y
+CONFIG_MTD_NAND_GPMI_NAND=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_RTC_DRV_SNVS=m
+CONFIG_FB_MXS=m
 # CONFIG_FB_MX3 is not set
 # CONFIG_FB_IMX is not set
 
 CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_IMX_SSI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_PCM_FIQ=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 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_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8962=m
 
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
@@ -412,24 +424,18 @@ CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_MXC=m
 # CONFIG_MX3_IPU is not set
 # CONFIG_MX3_IPU_IRQS is not set
-CONFIG_IMX_SDMA=m
-CONFIG_IMX_DMA=m
-CONFIG_AHCI_IMX=m
-# CONFIG_MXS_DMA is not set
 
 CONFIG_PWM_IMX=m
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_FB_HELPER=m
 CONFIG_DRM_IMX_HDMI=m
-CONFIG_DRM_IMX_IPUV3_CORE=m
+CONFIG_IMX_IPUV3_CORE=m
 CONFIG_DRM_IMX_IPUV3=m
 CONFIG_DRM_IMX_LDB=m
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
 CONFIG_VIDEO_CODA=m
 
-CONFIG_MFD_SYSCON=y
-CONFIG_GPIO_SYSCON=m
 CONFIG_SENSORS_MC13783_ADC=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_MC13783=m
@@ -464,15 +470,25 @@ CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
 
 # picoxcell
-CONFIG_CRYPTO_DEV_PICOXCELL=m
-CONFIG_HW_RANDOM_PICOXCELL=m
+# CONFIG_CRYPTO_DEV_PICOXCELL is not set
+
+# Exynos 4
+CONFIG_ARCH_EXYNOS4=y
+CONFIG_SOC_EXYNOS4212=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS4415=y
+CONFIG_ARM_EXYNOS4210_CPUFREQ=y
+CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
+CONFIG_AK8975=m
+CONFIG_CM36651=m
+CONFIG_KEYBOARD_SAMSUNG=m
 
 # ST Ericsson
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
 
 CONFIG_ABX500_CORE=y
-CONFIG_ARM_U8500_CPUIDLE=y
+# CONFIG_ARM_U8500_CPUIDLE is not set
 CONFIG_UX500_DEBUG_UART=2
 CONFIG_AB8500_CORE=y
 CONFIG_STE_DMA40=y
@@ -488,6 +504,8 @@ CONFIG_AHCI_ST=m
 CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_REGULATOR_AB8500=y
 CONFIG_AB8500_USB=m
+CONFIG_USB_MUSB_UX500=m
+# CONFIG_USB_UX500_DMA is not set
 CONFIG_RTC_DRV_AB8500=m
 CONFIG_PWM_AB8500=m
 CONFIG_SND_SOC_UX500=m
@@ -516,45 +534,19 @@ CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-# tegra
+# Allwinner
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+
+# Tegra (non A15)
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
-CONFIG_ARCH_TEGRA_114_SOC=y
-CONFIG_ARCH_TEGRA_124_SOC=y
-CONFIG_ARM_TEGRA_CPUFREQ=y
 CONFIG_TEGRA20_MC=y
-CONFIG_TEGRA30_MC=y
-CONFIG_TRUSTED_FOUNDATIONS=y
-
-CONFIG_SERIAL_TEGRA=y
-
-CONFIG_PCI_TEGRA=y
 CONFIG_TEGRA_IOMMU_GART=y
-CONFIG_TEGRA_IOMMU_SMMU=y
-CONFIG_MMC_SDHCI_TEGRA=m
-CONFIG_TEGRA_WATCHDOG=m
-CONFIG_I2C_TEGRA=m
-
-CONFIG_TEGRA_SYSTEM_DMA=y
-CONFIG_TEGRA_EMC_SCALING_ENABLE=y
-CONFIG_TEGRA_AHB=y
-CONFIG_TEGRA20_APB_DMA=y
-CONFIG_SPI_TEGRA114=m
 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
-CONFIG_PINCTRL_TEGRA30=y
-CONFIG_USB_EHCI_TEGRA=m
-CONFIG_RTC_DRV_TEGRA=m
-
-CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
-CONFIG_SND_SOC_TEGRA_MAX98090=m
-CONFIG_SND_SOC_TEGRA_RT5640=m
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA_WM8753=m
 CONFIG_SND_SOC_TEGRA_WM8903=m
@@ -562,8 +554,6 @@ CONFIG_SND_SOC_TEGRA_WM9712=m
 CONFIG_SND_SOC_TEGRA20_AC97=m
 CONFIG_SND_SOC_TEGRA20_DAS=m
 CONFIG_SND_SOC_TEGRA20_SPDIF=m
-CONFIG_SND_SOC_TEGRA30_AHUB=m
-CONFIG_SND_SOC_TEGRA30_I2S=m
 
 # AC100 (PAZ00)
 CONFIG_MFD_NVEC=y
@@ -571,52 +561,49 @@ CONFIG_MFD_TPS80031=y
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_SERIO_NVEC_PS2=y
 CONFIG_NVEC_POWER=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_NVEC_LEDS=y
 CONFIG_NVEC_PAZ00=y
 CONFIG_MFD_TPS6586X=y
 CONFIG_GPIO_TPS6586X=y
 CONFIG_RTC_DRV_TPS6586X=m
 
-CONFIG_PWM_TEGRA=m
-
-CONFIG_TEGRA_HOST1X=m
-CONFIG_TEGRA_HOST1X_FIREWALL=y
-CONFIG_DRM_TEGRA=m
-CONFIG_DRM_TEGRA_FBDEV=y
-# CONFIG_DRM_TEGRA_DEBUG is not set
-CONFIG_DRM_TEGRA_STAGING=y
-CONFIG_DRM_PANEL=y
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_LD9040=m
-CONFIG_DRM_PANEL_S6E8AA0=m
-
-CONFIG_CRYPTO_DEV_TEGRA_AES=m
-
 # OLPC XO
 CONFIG_SERIO_OLPC_APSP=m
 
 # Zynq-7xxx
-# likely needs usb 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
-CONFIG_ARM_ZYNQ_CPUIDLE=y
+CONFIG_COMMON_CLK_SI570=m
+CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
+# CONFIG_ARM_ZYNQ_CPUIDLE is not set
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
 CONFIG_GPIO_XILINX=y
+CONFIG_GPIO_ZYNQ=m
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
+CONFIG_SPI_CADENCE=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_I2C_CADENCE=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_XILINX_XADC=m
+CONFIG_XILINX_VDMA=m
 CONFIG_SND_SOC_ADI=m
 CONFIG_SND_SOC_ADI_AXI_I2S=m
 CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYBUS_OF=m
+CONFIG_GS_FPGABOOT=m
+CONFIG_USB_GADGET_XILINX=m
+CONFIG_PCIE_XILINX=y
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_EDAC_SYNOPSYS=m
+CONFIG_PINCTRL_ZYNQ=y
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
@@ -641,43 +628,3 @@ CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8907=m
 CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX8973=m
-
-# Needs work/investigation
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
-
-# CONFIG_ARM_KPROBES_TEST is not set
-
-# Defined config options we don't use yet
-# CONFIG_PINCTRL_IMX35 is not set
-
-# CONFIG_MFD_SMSC is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_SMSC is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PMIC_ADP5520 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
-# drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration]
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_EGALAX is not set
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
-
-# CONFIG_POWER_RESET_QNAP is not set
-# CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
-# CONFIG_AB8500_DEBUG is not set
-
-# CONFIG_MMC_TMIO is not set