From aa42a31acf7776f627be3e33cceb54afce0584fa Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Apr 08 2013 15:30:40 +0000
Subject: Enable CMA on ARM tegra, Minor tweeks to ARM OMAP


---

diff --git a/config-arm-omap b/config-arm-omap
index 6c85403..cbffc64 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -192,6 +192,9 @@ CONFIG_TWL6030_PWM=m
 CONFIG_TWL6040_CORE=y
 CONFIG_SENSORS_TWL4030_MADC=m
 CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_RTC_DRV_OMAP=m
+CONFIG_RTC_DRV_TWL4030=m
+CONFIG_RTC_DRV_TPS65910=m
 CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
@@ -295,9 +298,12 @@ CONFIG_RADIO_WL128X=m
 
 CONFIG_USB_OTG=y
 CONFIG_USB_EHCI_HCD_OMAP=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
+CONFIG_USB_MUSB_OMAP2PLUS=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_TWL4030_USB=m
+CONFIG_TWL6030_USB=m
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_MUSB_PIO_ONLY is not set
@@ -317,11 +323,6 @@ CONFIG_MMC_SPI=y
 
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_TWL4030_USB=y
-CONFIG_TWL6030_USB=y
-CONFIG_RTC_DRV_OMAP=m
-CONFIG_RTC_DRV_TWL4030=y
-CONFIG_RTC_DRV_TPS65910=m
 
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
diff --git a/config-arm-tegra b/config-arm-tegra
index 80a15dd..8b62ded 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -94,6 +94,16 @@ CONFIG_NVEC_PAZ00=y
 
 CONFIG_PWM_TEGRA=m
 
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
+
 CONFIG_DRM_TEGRA=m
 
 CONFIG_CPU_PM=y
diff --git a/kernel.spec b/kernel.spec
index 009db95..93d1723 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2367,6 +2367,10 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Mon Apr  8 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable CMA on ARM tegra
+- Minor tweeks to ARM OMAP
+
 * Mon Apr 08 2013 Josh Boyer <jwboyer@redhat.com>
 - Add patch from Benjamin Tissoires to fix race in HID magicmouse (rhbz 908604)