From 901d1efc1ee919732acf6e92438f17b6e1fe0e06 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 28 Aug 2012 22:57:38 +0100
Subject: [PATCH] Add patches to fix OMAP drm, radio shark, tweak ARM config

---
 arm-fix-omapdrm.patch     | 10 ++++++++++
 arm-fix_radio_shark.patch | 15 +++++++++++++++
 config-arm-generic        |  3 ++-
 config-arm-tegra          |  2 +-
 kernel.spec               |  8 ++++++++
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 arm-fix-omapdrm.patch
 create mode 100644 arm-fix_radio_shark.patch

diff --git a/arm-fix-omapdrm.patch b/arm-fix-omapdrm.patch
new file mode 100644
index 000000000..f70b861fa
--- /dev/null
+++ b/arm-fix-omapdrm.patch
@@ -0,0 +1,10 @@
+--- linux-3.6.0-0.rc3.git2.1.fc18.x86_64/drivers/staging/omapdrm/omap_drv.c.orig	2012-08-28 22:52:35.950826671 +0100
++++ linux-3.6.0-0.rc3.git2.1.fc18.x86_64/drivers/staging/omapdrm/omap_drv.c	2012-08-28 22:52:49.393910353 +0100
+@@ -761,7 +761,6 @@
+ 		.irq_postinstall = dev_irq_postinstall,
+ 		.irq_uninstall = dev_irq_uninstall,
+ 		.irq_handler = dev_irq_handler,
+-		.reclaim_buffers = drm_core_reclaim_buffers,
+ #ifdef CONFIG_DEBUG_FS
+ 		.debugfs_init = omap_debugfs_init,
+ 		.debugfs_cleanup = omap_debugfs_cleanup,
diff --git a/arm-fix_radio_shark.patch b/arm-fix_radio_shark.patch
new file mode 100644
index 000000000..63296a90e
--- /dev/null
+++ b/arm-fix_radio_shark.patch
@@ -0,0 +1,15 @@
+diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
+index ff3af6e..f99fa25 100644
+--- a/sound/pci/Kconfig
++++ b/sound/pci/Kconfig
+@@ -2,8 +2,8 @@ 
+ 
+ config SND_TEA575X
+ 	tristate
+-	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO
+-	default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO
++	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
++	default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
+ 
+ menuconfig SND_PCI
+ 	bool "PCI sound devices"
diff --git a/config-arm-generic b/config-arm-generic
index b75fc4203..fca13551a 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -37,6 +37,7 @@ CONFIG_USE_OF=y
 # CONFIG_OF_SELFTEST is not set
 CONFIG_PROC_DEVICETREE=y
 CONFIG_ARM_APPENDED_DTB=y
+CONFIG_I2C_MUX_PINCTRL=m
 
 # Generic options we want for ARM that aren't defualt
 CONFIG_HIGHMEM=y
@@ -88,7 +89,7 @@ CONFIG_RFKILL_GPIO=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIO_GENERIC_PLATFORM=m
 
-CONFIG_USB_ULPI=m
+CONFIG_USB_ULPI=y
 
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
diff --git a/config-arm-tegra b/config-arm-tegra
index 870ddc526..a754dd6ba 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -8,7 +8,7 @@ CONFIG_TEGRA_PCI=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 
-CONFIG_MACH_HARMONY=y
+# CONFIG_MACH_HARMONY is not set
 CONFIG_MACH_KAEN=y
 CONFIG_MACH_PAZ00=y
 CONFIG_MACH_SEABOARD=y
diff --git a/kernel.spec b/kernel.spec
index 20aa14ce6..61bfbab4d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -724,6 +724,8 @@ Patch14010: lis3-improve-handling-of-null-rate.patch
 
 # ARM
 Patch21000: arm-read_current_timer.patch
+Patch21001: arm-fix-omapdrm.patch
+Patch21002: arm-fix_radio_shark.patch
 # OMAP
 
 # ARM tegra
@@ -1314,6 +1316,8 @@ ApplyPatch team-net-next-20120808.patch
 # ARM
 #
 ApplyPatch arm-read_current_timer.patch
+ApplyPatch arm-fix-omapdrm.patch
+ApplyPatch arm-fix_radio_shark.patch
 ApplyPatch arm-tegra-nvec-kconfig.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 ApplyPatch arm-tegra-sdhci-module-fix.patch
@@ -2307,6 +2311,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Aug 28 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add patches to fix OMAP drm, radio shark
+- Tweak ARM config
+
 * Mon Aug 27 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc3.git2.1
 - Linux v3.6-rc3-177-gc182ae4