From 8ab0a24351b020bc80c6520328d0d2935891f289 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Feb 28 2015 14:26:39 +0000
Subject: Fix Panda on ARMv7 crash on boot


---

diff --git a/config-armv7 b/config-armv7
index 652d224..8eb0e1a 100644
--- a/config-armv7
+++ b/config-armv7
@@ -544,7 +544,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 cd5f89b..dd233a7 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -387,6 +387,8 @@ CONFIG_USB_OTG=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_VBUS_DRAW=100
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# Use PIO on musb as upstream doesn't support multiple DMA engines yet :-/
+CONFIG_MUSB_PIO_ONLY=y
 # CONFIG_USB_GADGET_XILINX is not set
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
@@ -405,7 +407,6 @@ CONFIG_USB_CONFIGFS_SERIAL=y
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
 # CONFIG_USB_CONFIGFS_F_FS 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
diff --git a/kernel.spec b/kernel.spec
index 9f114b6..ebd5002 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2321,6 +2321,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sat Feb 28 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fix Panda on ARMv7 crash on boot
+
 * Fri Feb 27 2015 Josh Boyer <jwboyer@fedoraproject.org - 3.18.8-100
 - Linux v3.18.8