Some minor ARMv7/aarch64 cleanups

7 files changed, 29 insertions, 34 deletions

diff --git a/config-arm-generic b/config-arm-generic
index e533137e4..57f6c4327 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -17,10 +17,6 @@ CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_BIG_LITTLE is not set
 # CONFIG_IWMMXT is not set
 
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_FSL_FTM is not set
-
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
 
@@ -227,6 +223,24 @@ CONFIG_ARM_SCPI_PROTOCOL=m
 # NVMem
 CONFIG_NVMEM=m
 
+# SPI
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_DESIGNWARE=m
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_SUN4I is not set
+# CONFIG_SPI_SUN6I is not set
+# CONFIG_SPI_TEGRA20_SFLASH is not set
+# CONFIG_SPI_TEGRA20_SLINK is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_FSL_FTM is not set
+
 # USB
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -391,6 +405,7 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MV64XXX=m
 
 # spi
 CONFIG_SPI_PL022=m
diff --git a/config-arm64 b/config-arm64
index 2300ee161..8e4355272 100644
--- a/config-arm64
+++ b/config-arm64
@@ -151,10 +151,13 @@ CONFIG_PINCTRL_AMD=y
 
 # HiSilicon
 CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_COMMON_CLK_HI6220=y
 CONFIG_PCI_HISI=y
 CONFIG_POWER_RESET_HISI=y
 CONFIG_HISI_THERMAL=m
 CONFIG_STUB_CLK_HI6220=y
+CONFIG_MFD_HI655X_PMIC=m
+CONFIG_REGULATOR_HI655X=m
 CONFIG_PHY_HI6220_USB=m
 CONFIG_COMMON_RESET_HI6220=m
 CONFIG_HI6220_MBOX=m
@@ -173,7 +176,6 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 # CONFIG_KEYBOARD_SUN4I_LRADC is not set
 # CONFIG_TOUCHSCREEN_SUN4I is not set
 # CONFIG_SERIO_SUN4I_PS2 is not set
-CONFIG_I2C_MV64XXX=m
 CONFIG_SUNXI_WATCHDOG=m
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_IR_SUNXI=m
diff --git a/config-armv7-generic b/config-armv7-generic
index f042deef9..a51a85b40 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -229,6 +229,7 @@ CONFIG_MTD_NAND_SUNXI=m
 CONFIG_SERIO_SUN4I_PS2=m
 CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_PWM_SUN4I=m
+CONFIG_CAN_SUN4I=m
 CONFIG_USB_MUSB_SUNXI=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_SND_SUN4I_CODEC=m
@@ -284,6 +285,7 @@ CONFIG_MMC_DW_EXYNOS=m
 # CONFIG_EXYNOS_IOMMU is not set
 CONFIG_PCI_EXYNOS=y
 CONFIG_PHY_EXYNOS5_USBDRD=m
+CONFIG_SAMSUNG_USBPHY=m
 CONFIG_PHY_SAMSUNG_USB2=m
 CONFIG_USB_EHCI_EXYNOS=m
 CONFIG_USB_OHCI_EXYNOS=m
@@ -527,29 +529,6 @@ CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_GPIO_RCAR is not set
 CONFIG_W1_MASTER_GPIO=m
 
-# SPI
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_SC18IS602=m
-CONFIG_SPI_TLE62X0=m
-CONFIG_SPI_XCOMM=m
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-
-CONFIG_NFC_NCI_SPI=y
-
-# i2c
-CONFIG_I2C_MV64XXX=m
-
 # HW crypto and rng
 # CONFIG_CRYPTO_SHA1_ARM_CE is not set
 # CONFIG_CRYPTO_SHA2_ARM_CE is not set
@@ -786,7 +765,6 @@ CONFIG_R8188EU=m
 # CONFIG_CAN_TI_HECC is not set
 # CONFIG_CAN_FLEXCAN is not set
 # CONFIG_CAN_RCAR is not set
-# CONFIG_CAN_MCP251X is not set
 
 # Needs work/investigation
 # CONFIG_ARM_KPROBES_TEST is not set
diff --git a/config-armv7-lpae b/config-armv7-lpae
index e500e1d58..64970f7a1 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -81,3 +81,4 @@ CONFIG_TI_MESSAGE_MANAGER=m
 # CONFIG_SND_SOC_TEGRA20_DAS is not set
 # CONFIG_SND_SOC_TEGRA20_SPDIF is not set
 # CONFIG_DRM_OMAP is not set
+# CONFIG_AM335X_PHY_USB is not set
diff --git a/config-generic b/config-generic
index c80f957e5..42430fbbb 100644
--- a/config-generic
+++ b/config-generic
@@ -219,7 +219,6 @@ CONFIG_BINFMT_MISC=m
 # CONFIG_COMMON_CLK_CS2000_CP is not set
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_HI6220 is not set
 # 
 
 #
@@ -2085,6 +2084,7 @@ CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCP251X is not set
 CONFIG_CAN_PLX_PCI=m
 # CONFIG_CAN_TSCAN1 is not set
 CONFIG_CAN_C_CAN=m
@@ -2099,7 +2099,6 @@ CONFIG_CAN_GS_USB=m
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_SOFTING=m
 # CONFIG_CAN_SOFTING_CS is not set
-CONFIG_CAN_SUN4I=m
 CONFIG_CAN_IFI_CANFD=m
 
 CONFIG_NETROM=m
@@ -4355,8 +4354,6 @@ CONFIG_USB_ULPI_BUS=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_TUSB1210 is not set
-# CONFIG_PHY_HI6220_USB is not set
-# CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USBPHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_USB_RCAR_PHY is not set
diff --git a/config-x86-generic b/config-x86-generic
index 818d389c1..13de9462e 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -328,7 +328,6 @@ CONFIG_XEN_SYMS=y
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_PXA2XX=m
-# CONFIG_CAN_MCP251X is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
diff --git a/kernel.spec b/kernel.spec
index f1bb672dc..15d6b3987 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2167,6 +2167,9 @@ fi
 #
 # 
 %changelog
+* Sun Apr  3 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Some minor ARMv7/aarch64 cleanups
+
 * Thu Mar 31 2016 Josh Boyer <jwboyer@fedoraproject.org>
 - Add another patch for CVE-2016-2184