From e6b799b67d2dc6cc1491f78a1a89decfcaaf656b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sat, 28 Feb 2015 18:55:52 +0000
Subject: [PATCH] ARMv7 OMAP updates, fix panda boot

---
 config-armv7         | 8 ++++----
 config-armv7-generic | 6 ++++--
 config-generic       | 1 -
 kernel.spec          | 3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/config-armv7 b/config-armv7
index 4e62e3a79..cae845b40 100644
--- a/config-armv7
+++ b/config-armv7
@@ -100,9 +100,7 @@ CONFIG_OMAP_PACKAGE_CUS=y
 
 CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_PM_NOOP=y
-CONFIG_DMA_OMAP=y
+CONFIG_DMA_OMAP=m
 CONFIG_OMAP_IOMMU=y
 CONFIG_HWSPINLOCK_OMAP=m
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
@@ -116,6 +114,8 @@ CONFIG_GPIO_TWL6040=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_I2C_OMAP=m
 CONFIG_CHARGER_TWL4030=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_BQ2415X=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_MADC=m
@@ -540,7 +540,7 @@ CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_REGULATOR_AB8500=y
 CONFIG_AB8500_USB=m
 CONFIG_USB_MUSB_UX500=m
-CONFIG_USB_UX500_DMA=y
+# CONFIG_USB_UX500_DMA is not set
 CONFIG_RTC_DRV_AB8500=m
 CONFIG_PWM_AB8500=m
 CONFIG_SND_SOC_UX500=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 45704e28f..3c48586cf 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -171,6 +171,7 @@ CONFIG_AMBA_PL08X=y
 CONFIG_GPIO_PL061=y
 CONFIG_PL320_MBOX=y
 CONFIG_SND_ARMAACI=m
+CONFIG_USB_ISP1760=m
 
 # highbank
 CONFIG_EDAC_HIGHBANK_MC=m
@@ -425,10 +426,11 @@ CONFIG_USB_OTG=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_VBUS_DRAW=100
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_USB_GADGET_XILINX is not set
 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_USB_MUSB_TUSB6010 is not set
 # CONFIG_USB_MUSB_UX500 is not set
 CONFIG_USB_GPIO_VBUS=m
@@ -450,7 +452,6 @@ CONFIG_USB_CONFIGFS_SERIAL=y
 # CONFIG_USB_CONFIGFS_F_HID is not set
 # CONFIG_USB_CONFIGFS_F_UVC is not set
 
-# CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
@@ -806,6 +807,7 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_FB_XILINX is not set
+# CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_FB_SAVAGE is not set
diff --git a/config-generic b/config-generic
index 62726d61a..275aa230e 100644
--- a/config-generic
+++ b/config-generic
@@ -3633,7 +3633,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760 is not set
-# CONFIG_USB_ISP1760_HCD is not set
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_FUSBH200_HCD=m
 # CONFIG_USB_FOTG210_HCD is not set
diff --git a/kernel.spec b/kernel.spec
index df1ca04c6..4fc47f2cc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2215,6 +2215,9 @@ fi
 #
 # 
 %changelog
+* Sat Feb 28 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- ARMv7 OMAP updates, fix panda boot
+
 * Fri Feb 27 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc1.git2.1
 - Linux v4.0-rc1-36-g4f671fe2f952