From a5e1babd3ec59fb8ff9d82d64a3a580002f3da48 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 8 Nov 2015 20:06:54 +0000
Subject: [PATCH] Minor ARMv7 updates

---
 config-armv7         |  1 +
 config-armv7-generic | 14 ++++++++------
 kernel.spec          |  3 +++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/config-armv7 b/config-armv7
index 36ea19868..2803a067e 100644
--- a/config-armv7
+++ b/config-armv7
@@ -83,6 +83,7 @@ CONFIG_USB_EHCI_HCD_OMAP=m
 CONFIG_USB_OHCI_HCD_OMAP3=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
+CONFIG_USB_INVENTRA_DMA=y
 CONFIG_USB_DWC3_OMAP=m
 CONFIG_MMC_OMAP=m
 CONFIG_RTC_DRV_MAX8907=m
diff --git a/config-armv7-generic b/config-armv7-generic
index abb8ed76c..888764be1 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -200,11 +200,12 @@ CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_MFD_AXP20X=y
+CONFIG_AXP20X_POWER=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_REGULATOR_AXP20X=m
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_AXP288_ADC=m
 CONFIG_EXTCON_AXP288=m
-CONFIG_INPUT_AXP20X_PEK=m
-CONFIG_REGULATOR_AXP20X=m
 CONFIG_AXP288_CHARGER=m
 CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
 CONFIG_IR_SUNXI=m
@@ -218,6 +219,7 @@ CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_PWM_SUN4I=m
 CONFIG_USB_MUSB_SUNXI=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_SND_SUN4I_CODEC=m
 
 # Exynos
 CONFIG_ARCH_EXYNOS3=y
@@ -346,15 +348,16 @@ CONFIG_REGULATOR_RK808=m
 CONFIG_RTC_DRV_HYM8563=m
 CONFIG_ROCKCHIP_SARADC=m
 CONFIG_ROCKCHIP_IOMMU=y
-CONFIG_SND_SOC_ROCKCHIP=m
-CONFIG_SND_SOC_ROCKCHIP_I2S=m
 CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_PHY_ROCKCHIP_USB=m
 CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
 CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
 CONFIG_SND_SOC_ROCKCHIP_RT5645=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_REGULATOR_ACT8865=m
 
 # Tegra
@@ -497,8 +500,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_DSPS=m
-# Use PIO on musb as upstream doesn't support multiple DMA engines yet :-/
-CONFIG_MUSB_PIO_ONLY=y
+# CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_USB_MUSB_TUSB6010 is not set
 # CONFIG_USB_MUSB_UX500 is not set
 CONFIG_USB_GPIO_VBUS=m
diff --git a/kernel.spec b/kernel.spec
index bc389604f..699afa0ce 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2038,6 +2038,9 @@ fi
 #
 # 
 %changelog
+* Sun Nov  8 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARMv7 updates
+
 * Fri Nov 06 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git4.2
 - Fix ARM dt compilation error