Minor config updates for ARMv7

config-armv7

@@ -51,9 +51,9 @@ CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_8250_OMAP=m
 
+CONFIG_GPIO_OMAP=m
 CONFIG_GPIO_TWL4030=m
 CONFIG_GPIO_TWL6040=m
-CONFIG_GPIO_PCF857X=m
 CONFIG_I2C_OMAP=m
 CONFIG_CHARGER_TWL4030=m
 CONFIG_CHARGER_ISP1704=m
@@ -84,7 +84,7 @@ CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_OMAP2PLUS=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
@@ -215,8 +215,6 @@ CONFIG_RADIO_WL128X=m
 
 CONFIG_OMAP_REMOTEPROC=m
 
-CONFIG_GPIO_OMAP=m
-
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
 # CONFIG_OMAP_IOMMU_DEBUG is not set
 # CONFIG_OMAP_MUX_DEBUG is not set
@@ -274,6 +272,7 @@ 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
@@ -308,8 +307,8 @@ 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_MSM_IOMMU is not set
 CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_FBDEV=y
 CONFIG_USB_EHCI_MSM=m

config-armv7-generic

@@ -186,15 +186,6 @@ CONFIG_SUNXI_SRAM=y
 CONFIG_DMA_SUN6I=m
 CONFIG_SUNXI_WATCHDOG=m
 CONFIG_NET_VENDOR_ALLWINNER=y
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DWMAC_IPQ806X=m
-CONFIG_DWMAC_LPC18XX=m
-CONFIG_DWMAC_MESON=m
-CONFIG_DWMAC_ROCKCHIP=m
-CONFIG_DWMAC_SOCFPGA=m
-CONFIG_DWMAC_STI=m
-CONFIG_DWMAC_SUNXI=m
 CONFIG_EEPROM_SUNXI_SID=m
 CONFIG_RTC_DRV_SUNXI=m
 CONFIG_PHY_SUN4I_USB=m
@@ -205,12 +196,14 @@ CONFIG_SPI_SUN6I=m
 CONFIG_MMC_SUNXI=m
 CONFIG_I2C_SUN6I_P2WI=m
 CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
 CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_MFD_AXP20X=y
 CONFIG_REGULATOR_AXP20X=m
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_IR_SUNXI=m
 CONFIG_MDIO_SUN4I=m
+CONFIG_DWMAC_SUNXI=m
 CONFIG_SUN4I_EMAC=m
 CONFIG_RTC_DRV_SUN6I=m
 CONFIG_AXP288_ADC=m
@@ -354,6 +347,7 @@ CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_DWMAC_ROCKCHIP=m
 
 # Tegra
 CONFIG_ARCH_TEGRA_114_SOC=y
@@ -828,8 +822,19 @@ CONFIG_KEYBOARD_CROS_EC=m
 CONFIG_I2C_CROS_EC_TUNNEL=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_PROTO=y
+
+# This newly introduced mess needs to be fixed upstream :-(
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+# CONFIG_DWMAC_IPQ806X is not set
+# CONFIG_DWMAC_LPC18XX is not set
+# CONFIG_DWMAC_MESON is not set
+# CONFIG_DWMAC_SOCFPGA is not set
+# CONFIG_DWMAC_STI is not set
 
 CONFIG_R8188EU=m
+
 # CONFIG_88EU_AP_MODE is not set
 
 # CAN drivers

kernel.spec

@@ -2033,6 +2033,9 @@ fi
 #
 # 
 %changelog
+* Fri Aug 21 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor config updates for ARMv7
+
 * Thu Aug 20 2015 Josh Boyer <jwboyer@fedoraproject.org>
 - Fix incorrect ext4 freezing behavior on non-journaled fs (rhbz 1250717)