Enable Exynos now it's finally multi platform capable, Minor ARM config cleanups

4 files changed, 126 insertions, 113 deletions

diff --git a/config-armv7 b/config-armv7
index 5339d7606..bf5ed831c 100644
--- a/config-armv7
+++ b/config-armv7
@@ -255,26 +255,6 @@ CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
 CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
 CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m
 
-# QCom
-CONFIG_ARCH_MSM8X60=y
-CONFIG_ARCH_MSM8960=y
-CONFIG_ARCH_MSM8974=y
-CONFIG_SERIAL_MSM=y
-CONFIG_SERIAL_MSM_CONSOLE=y
-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_QCOM_BAM_DMA=m
-CONFIG_QCOM_GSBI=m
-CONFIG_MSM_IOMMU=y
-CONFIG_DRM_MSM=m
-CONFIG_DRM_MSM_FBDEV=y
-# CONFIG_DRM_MSM_REGISTER_LOGGING is not set 
-
 # Enable V4L2 drivers for OMAP2+
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
@@ -369,6 +349,26 @@ CONFIG_PWM_TIPWMSS=y
 # CONFIG_GPIO_DAVINCI is not set
 # CONFIG_DAVINCI_WATCHDOG is not set
 
+# QCom
+CONFIG_ARCH_MSM8X60=y
+CONFIG_ARCH_MSM8960=y
+CONFIG_ARCH_MSM8974=y
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
+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_QCOM_BAM_DMA=m
+CONFIG_QCOM_GSBI=m
+CONFIG_MSM_IOMMU=y
+CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_FBDEV=y
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set 
+
 # i.MX
 CONFIG_MXC_IRQ_PRIOR=y
 # CONFIG_MXC_DEBUG_BOARD is not set
@@ -492,8 +492,11 @@ 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
+# CONFIG_HW_RANDOM_PICOXCELL is not set
+
+# Rockchips
+CONFIG_I2C_RK3X=m
 
 # ST Ericsson
 CONFIG_MACH_HREFV60=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 4199415dd..b9c7afcb3 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -51,23 +51,23 @@ CONFIG_IRQ_CROSSBAR=y
 # CONFIG_ARM_VIRT_EXT is not set
 
 # Platforms enabled/disabled globally on ARMv7
+CONFIG_ARCH_EXYNOS=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
-# CONFIG_ARCH_VEXPRESS_SPC is not set
 # CONFIG_ARCH_BCM is not set
-# CONFIG_PLAT_SPEAR is not set
-# CONFIG_ARCH_STI is not set
-# CONFIG_ARCH_SIRF is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_WM8850 is not set
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_HI3xxx is not set
 # CONFIG_ARCH_MSM_DT is not set
 # CONFIG_ARCH_QCOM is not set
-# CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VEXPRESS_SPC is not set
+# CONFIG_ARCH_WM8850 is not set
 
 # errata
 # v5/v6
@@ -184,10 +184,97 @@ CONFIG_AHCI_SUNXI=m
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
 CONFIG_MMC_SUNXI=m
+CONFIG_I2C_SUN6I_P2WI=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_POWER_RESET_SUN6I=y
 CONFIG_TOUCHSCREEN_SUN4I=m
 
+# Exynos
+CONFIG_ARCH_EXYNOS3=y
+CONFIG_ARCH_EXYNOS4=y
+CONFIG_ARCH_EXYNOS5=y
+CONFIG_SOC_EXYNOS3250=y
+CONFIG_SOC_EXYNOS4212=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5420=y
+CONFIG_SOC_EXYNOS5440=y
+CONFIG_SOC_EXYNOS5260=y
+CONFIG_SOC_EXYNOS5410=y
+CONFIG_SOC_EXYNOS5800=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_ARM_EXYNOS4210_CPUFREQ=y
+CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
+CONFIG_ARM_EXYNOS5250_CPUFREQ=y
+CONFIG_ARM_EXYNOS5440_CPUFREQ=y
+CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y
+CONFIG_ARM_EXYNOS_CPUIDLE=y
+
+CONFIG_I2C_EXYNOS5=m
+CONFIG_I2C_S3C2410=m
+CONFIG_SPI_S3C64XX=m
+CONFIG_EXYNOS_THERMAL=m
+CONFIG_EXYNOS_THERMAL_CORE=y
+CONFIG_MMC_SDHCI_S3C=m
+CONFIG_MMC_SDHCI_S3C_DMA=y
+CONFIG_MMC_DW_EXYNOS=m
+CONFIG_EXYNOS_IOMMU=y
+CONFIG_PCI_EXYNOS=y
+CONFIG_PHY_EXYNOS5_USBDRD=m
+CONFIG_USB_EHCI_EXYNOS=m
+CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_PHY_EXYNOS5250_SATA=m
+CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_CRYPTO_DEV_S5P=m
+CONFIG_PWM_SAMSUNG=m
+CONFIG_S3C2410_WATCHDOG=m
+# CONFIG_RTC_DRV_S3C is not set
+
+CONFIG_EXYNOS_VIDEO=y
+CONFIG_EXYNOS_MIPI_DSI=y
+CONFIG_DRM_EXYNOS=m
+CONFIG_DRM_EXYNOS_DMABUF=y
+CONFIG_DRM_EXYNOS_DP=y
+CONFIG_DRM_EXYNOS_DPI=y
+CONFIG_DRM_EXYNOS_DSI=y
+CONFIG_DRM_EXYNOS_FIMC=y
+CONFIG_DRM_EXYNOS_FIMD=y
+CONFIG_DRM_EXYNOS_G2D=y
+CONFIG_DRM_EXYNOS_GSC=y
+CONFIG_DRM_EXYNOS_HDMI=y
+CONFIG_DRM_EXYNOS_IOMMU=y
+CONFIG_DRM_EXYNOS_IPP=y
+CONFIG_DRM_EXYNOS_ROTATOR=y
+CONFIG_DRM_EXYNOS_VIDI=y
+# CONFIG_FB_S3C is not set
+# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
+CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
+CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+# CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+
+CONFIG_SND_SOC_SAMSUNG=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
+CONFIG_SND_SOC_SMDK_WM8994_PCM=m
+CONFIG_SND_SOC_SNOW=m
+# CONFIG_GPIO_WM8994 is not set
+# CONFIG_REGULATOR_WM8994 is not set
+# CONFIG_EXYNOS_IOMMU_DEBUG is not set
+# CONFIG_SAMSUNG_PM_DEBUG is not set
+# CONFIG_SAMSUNG_PM_CHECK is not set
+
+# Arndale/Origen
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_SEC_CORE=y
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_COMMON_CLK_MAX77686=m
+
+# regmap
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_SPI=m
@@ -289,7 +376,6 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_SAMSUNG is not set
-# CONFIG_PINCTRL_EXYNOS4 is not set
 # CONFIG_PINCTRL_CAPRI is not set
 # CONFIG_PINCTRL_MSM8X74 is not set
 # CONFIG_PINCTRL_BCM281XX is not set
@@ -331,7 +417,6 @@ CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_OC_TINY=m
 CONFIG_SPI_PL022=m
-CONFIG_SPI_S3C64XX=m
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_XCOMM=m
@@ -408,7 +493,6 @@ CONFIG_MMC_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
 # CONFIG_MMC_DW_SOCFPGA is not set
-# CONFIG_MMC_DW_EXYNOS is not set
 # CONFIG_MMC_DW_IDMAC is not set
 # CONFIG_MMC_DW_K3 is not set
 CONFIG_USB_DWC2=y
@@ -420,13 +504,11 @@ CONFIG_USB_DWC2_PCI=y
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_OMAP=m
-CONFIG_USB_DWC3_EXYNOS=m
 CONFIG_USB_DWC3_PCI=m
 # CONFIG_USB_DWC3_DEBUG is not set
 # CONFIG_USB_DWC3_KEYSTONE is not set
 CONFIG_DW_WATCHDOG=m
 CONFIG_PCIE_DW=y
-CONFIG_PCI_EXYNOS=y
 
 # Sound
 CONFIG_SND_SOC=m
@@ -442,6 +524,8 @@ CONFIG_SND_SOC_ALL_CODECS=m
 CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -452,14 +536,12 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271 is not set
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
-# CONFIG_SND_SOC_HDMI_CODEC is not set
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM1792A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-# CONFIG_SND_SOC_SPDIF is not set
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_WM8510 is not set
@@ -648,7 +730,6 @@ CONFIG_BPF_JIT=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_PATA_PLATFORM is not set
-# CONFIG_DRM_EXYNOS is not set
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_IMX is not set
 # CONFIG_AHCI_IMX is not set
@@ -656,7 +737,6 @@ CONFIG_BPF_JIT=y
 # CONFIG_CS89x0 is not set
 # CONFIG_DM9000 is not set
 # CONFIG_HW_RANDOM_ATMEL is not set
-# CONFIG_HW_RANDOM_EXYNOS is not set
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_TI_DAC7512 is not set
@@ -677,7 +757,6 @@ CONFIG_BPF_JIT=y
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_FSL_DSPI is not set
 # CONFIG_FB_XILINX is not set
-# CONFIG_USB_S3C_HSOTG is not set
 # CONFIG_BRCMSTB_GISB_ARB is not set
 
 # these modules all fail with missing __bad_udelay
@@ -693,7 +772,6 @@ CONFIG_BPF_JIT=y
 # these all currently fail due to missing symbols __bad_udelay or
 # error: implicit declaration of function ‘iowrite32be’
 # CONFIG_SND_ALI5451 is not set
-# CONFIG_DRM_NOUVEAU is not set
 # CONFIG_MLX4_EN is not set
 
 # Debug options. We need to deal with them at some point like x86
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 4f39ef5dd..37d67b066 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -53,62 +53,6 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_WDT=m
 # CONFIG_XEN_BALLOON is not set
 
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-# CONFIG_SAMSUNG_PM_DEBUG is not set
-# CONFIG_SAMSUNG_PM_CHECK is not set
-CONFIG_SOC_EXYNOS5250=y
-CONFIG_SOC_EXYNOS5420=y
-CONFIG_SOC_EXYNOS5440=y
-# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
-# CONFIG_ARM_EXYNOS5440_CPUFREQ is not set
-# CONFIG_ARM_EXYNOS_CPUFREQ is not set
-CONFIG_EXYNOS_THERMAL=m
-CONFIG_PCI_EXYNOS=y
-
-CONFIG_TCG_TIS_I2C_INFINEON=m
-
-# CONFIG_EXYNOS_ATAGS is not set
-CONFIG_PINCTRL_EXYNOS=y
-CONFIG_PINCTRL_EXYNOS5440=y
-CONFIG_EXYNOS_IOMMU=y
-CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
-CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
-CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
-CONFIG_EXYNOS_VIDEO=y
-CONFIG_EXYNOS_MIPI_DSI=y
-CONFIG_EXYNOS_DP=y
-# CONFIG_EXYNOS_LCD_S6E8AX0 is not set
-CONFIG_DRM_EXYNOS=m
-CONFIG_DRM_EXYNOS_IOMMU=y
-CONFIG_DRM_EXYNOS_DMABUF=y
-CONFIG_DRM_EXYNOS_FIMD=y
-CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_VIDI=y
-CONFIG_DRM_EXYNOS_G2D=y
-CONFIG_DRM_EXYNOS_IPP=y
-CONFIG_DRM_EXYNOS_FIMC=y
-CONFIG_DRM_EXYNOS_ROTATOR=y
-CONFIG_DRM_EXYNOS_GSC=y
-CONFIG_DRM_EXYNOS_DPI=y
-CONFIG_DRM_EXYNOS_DSI=y
-# CONFIG_FB_S3C is not set
-CONFIG_SND_SOC_SAMSUNG=m
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_S5P=m
-CONFIG_USB_OHCI_EXYNOS=y
-CONFIG_PWM_SAMSUNG=m
-CONFIG_SAMSUNG_GPIO_EXTRA=8
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
-CONFIG_USB_EHCI_S5P=y
-CONFIG_SAMSUNG_USBPHY=m
-CONFIG_SAMSUNG_USB2PHY=m
-CONFIG_SAMSUNG_USB3PHY=m
-CONFIG_MMC_DW_EXYNOS=m
-CONFIG_RTC_DRV_S3C=m
-
 # TI Keystone
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_USB_DWC3_KEYSTONE=m
@@ -121,22 +65,6 @@ CONFIG_POWER_RESET_KEYSTONE=y
 # CONFIG_SND_DAVINCI_SOC is not set
 # CONFIG_TI_SOC_THERMAL is not set
 
-# Arndale/Origen
-CONFIG_MFD_MAX8997=y
-CONFIG_MFD_SEC_CORE=y
-CONFIG_REGULATOR_MAX8997=m
-CONFIG_REGULATOR_S5M8767=m
-CONFIG_COMMON_CLK_MAX77686=m
-
-CONFIG_S3C_LOWLEVEL_UART_PORT=1
-# CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set
-# CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set
-
-# CONFIG_S3C_BOOT_ERROR_RESET is not set
-# CONFIG_S3C_BOOT_UART_FORCE_FIFO is not set
-# CONFIG_I2C_S3C2410 is not set
-# CONFIG_S3C2410_WATCHDOG is not set
-# CONFIG_MMC_SDHCI_S3C is not set
 # CONFIG_TEGRA_HOST1X is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
 # CONFIG_DRM_PANEL_LD9040 is not set
diff --git a/kernel.spec b/kernel.spec
index 4f11a814d..19bc2e73e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2225,6 +2225,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sun Jun 22 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable Exynos now it's finally multi platform capable
+- Minor ARM config cleanups
+
 * Fri Jun 20 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Bring in intel_pstate regression fixes for BayTrail