From c9b2c4708ed2b6feda3a00a657214f438335f73f Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 22 Jun 2014 11:16:40 +0100
Subject: Enable Exynos now it's finally multi platform capable, Minor ARM
 config cleanups

---
 config-armv7 | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

(limited to 'config-armv7')

diff --git a/config-armv7 b/config-armv7
index 5339d760..bf5ed831 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
-- 
cgit