From 520ac5551a22fcdd746a1c8d0ca7bb7ed9b25f70 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mar 23 2015 13:05:07 +0000
Subject: Refix Panda on ARMv7 crash on boot


---

diff --git a/config-armv7 b/config-armv7
index f071dd9..bc5e0e6 100644
--- a/config-armv7
+++ b/config-armv7
@@ -531,7 +531,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 5be7d4b..0a930f3 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -410,6 +410,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
@@ -434,7 +436,6 @@ CONFIG_USB_CONFIGFS_SERIAL=y
 # CONFIG_USB_CONFIGFS_F_MIDI is not set
 # CONFIG_USB_CONFIGFS_F_HID 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 31b073a..e02f787 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2271,6 +2271,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Mon Mar 23 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Refix Panda on ARMv7 crash on boot
+
 * Fri Mar 20 2015 Josh Boyer <jwboyer@fedoraproject.org>
 - Fix brightness on Lenovo Ideapad Z570 (rhbz 1187004)