linux-omap 2.6.37: add support for beagleboard xM rev C

Signed-off-by: Koen Kooi <koen@openembedded.org>

diff --git a/recipes/linux/linux-omap-2.6.37/0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch b/recipes/linux/linux-omap-2.6.37/0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch
new file mode 100644 (file)
index 0000000..44397d4
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.37/0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch
@@ -0,0 +1,29 @@
+From 3b1dc08ab568d1fdbc2a3731d7643cfeb48023e8 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 10 Mar 2011 14:16:08 +0100
+Subject: [PATCH] BeagleBoard: Adjust USER button pin for xM
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 731f4b5..fae3104 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -949,6 +949,11 @@ static void __init omap3_beagle_init(void)
+       omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
+       omap3_beagle_init_rev();
+       omap3_beagle_i2c_init();
++
++      if (cpu_is_omap3630()) {
++              gpio_buttons[0].gpio = 4;
++      }
++
+       platform_add_devices(omap3_beagle_devices,
+                       ARRAY_SIZE(omap3_beagle_devices));
+       omap_serial_init();
+-- 
+1.7.0
+

diff --git a/recipes/linux/linux-omap-2.6.37/0001-beagleboard-hack-in-support-from-xM-rev-C.patch b/recipes/linux/linux-omap-2.6.37/0001-beagleboard-hack-in-support-from-xM-rev-C.patch
new file mode 100644 (file)
index 0000000..77c2928
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.37/0001-beagleboard-hack-in-support-from-xM-rev-C.patch
@@ -0,0 +1,94 @@
+From d9c289c5f98bb109aa7a9e5a802638ba89639e70 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 10 Mar 2011 13:15:38 +0100
+Subject: [PATCH] beagleboard: hack in support from xM rev C
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   20 +++++++++++++-------
+ 1 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 6abb79a..731f4b5 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -64,6 +64,7 @@
+  *    C4      = GPIO173, GPIO172, GPIO171: 1 0 1
+  *    XMA     = GPIO173, GPIO172, GPIO171: 0 0 0
+  *    XMB     = GPIO173, GPIO172, GPIO171: 0 0 1
++ *  XMC = GPIO173, GPIO172, GPIO171: 0 1 0
+  */
+ enum {
+       OMAP3BEAGLE_BOARD_UNKN = 0,
+@@ -71,6 +72,7 @@ enum {
+       OMAP3BEAGLE_BOARD_C1_3,
+       OMAP3BEAGLE_BOARD_C4,
+       OMAP3BEAGLE_BOARD_XM,
++      OMAP3BEAGLE_BOARD_XMC,
+ };
+ 
+ static u8 omap3_beagle_version;
+@@ -129,9 +131,13 @@ static void __init omap3_beagle_init_rev(void)
+               printk(KERN_INFO "OMAP3 Beagle Rev: xM B\n");
+               omap3_beagle_version = OMAP3BEAGLE_BOARD_XM;
+               break;
++      case 2:
++              printk(KERN_INFO "OMAP3 Beagle Rev: xM C\n");
++              omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC;
++              break;
+       default:
+-              printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev);
+-              omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN;
++              printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd, assuming xM C or newer\n", beagle_rev);
++              omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC;
+       }
+ 
+       return;
+@@ -484,7 +490,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
+ {
+       int r;
+ 
+-      if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
++      if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) {
+               mmc[0].gpio_wp = -EINVAL;
+       } else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) ||
+               (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) {
+@@ -517,7 +523,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
+       /* REVISIT: need ehci-omap hooks for external VBUS
+        * power switch and overcurrent detect
+        */
+-      if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) {
++      if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM && omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC) {
+               r = gpio_request(gpio + 1, "EHCI_nOC");
+               if (!r) {
+                       r = gpio_direction_input(gpio + 1);
+@@ -539,7 +545,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
+               gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+ 
+       /* DVI reset GPIO is different between beagle revisions */
+-      if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
++      if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)
+               beagle_dvi_device.reset_gpio = 129;
+       else
+               beagle_dvi_device.reset_gpio = 170;
+@@ -553,7 +559,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
+        * P7/P8 revisions(prototype): Camera EN
+        * A2+ revisions (production): LDO (supplies DVI, serial, led blocks)
+        */
+-      if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
++      if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) {
+               r = gpio_request(gpio + 1, "nDVI_PWR_EN");
+               if (!r) {
+                       r = gpio_direction_output(gpio + 1, 0);
+@@ -899,7 +905,7 @@ static void __init beagle_opp_init(void)
+       }
+ 
+       /* Custom OPP enabled for XM */
+-      if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
++      if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) {
+               struct omap_hwmod *mh = omap_hwmod_lookup("mpu");
+               struct omap_hwmod *dh = omap_hwmod_lookup("iva");
+               struct device *dev;
+-- 
+1.6.6.1
+

diff --git a/recipes/linux/linux-omap-2.6.37/0001-omap3-allow-1GHz-mpurates.patch b/recipes/linux/linux-omap-2.6.37/0001-omap3-allow-1GHz-mpurates.patch
new file mode 100644 (file)
index 0000000..f84163c
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.37/0001-omap3-allow-1GHz-mpurates.patch
@@ -0,0 +1,26 @@
+From 095749d8941257799eaf5b2509918373f1a08152 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 10 Mar 2011 14:03:08 +0100
+Subject: [PATCH] omap3: allow 1GHz mpurates
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ arch/arm/plat-omap/clock.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
+index fc62fb5..f3e3d29 100644
+--- a/arch/arm/plat-omap/clock.c
++++ b/arch/arm/plat-omap/clock.c
+@@ -181,7 +181,7 @@ static int __init omap_clk_setup(char *str)
+       if (!mpurate)
+               return 1;
+ 
+-      if (mpurate < 1000)
++      if (mpurate < 2000)
+               mpurate *= 1000000;
+ 
+       return 1;
+-- 
+1.6.6.1
+

diff --git a/recipes/linux/linux-omap-2.6.37/0001-xM-audio-fix-from-Ashok.patch b/recipes/linux/linux-omap-2.6.37/0001-xM-audio-fix-from-Ashok.patch
new file mode 100644 (file)
index 0000000..1254c80
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.37/0001-xM-audio-fix-from-Ashok.patch
@@ -0,0 +1,27 @@
+From d53f988fc10fe22ec7e64457eac22f264bb72491 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Thu, 13 Jan 2011 11:37:56 -0600
+Subject: [PATCH] xM audio fix from Ashok
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ sound/soc/omap/omap-mcbsp.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
+index 7e84f24..1038686 100644
+--- a/sound/soc/omap/omap-mcbsp.c
++++ b/sound/soc/omap/omap-mcbsp.c
+@@ -332,6 +332,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
+       } else if (cpu_is_omap343x()) {
+               dma = omap24xx_dma_reqs[bus_id][substream->stream];
+               port = omap34xx_mcbsp_port[bus_id][substream->stream];
++      } else if (cpu_is_omap3630()) {
++              dma = omap24xx_dma_reqs[bus_id][substream->stream];
++              port = omap34xx_mcbsp_port[bus_id][substream->stream];
+       } else {
+               return -ENODEV;
+       }
+-- 
+1.7.1
+

diff --git a/recipes/linux/linux-omap_2.6.37.bb b/recipes/linux/linux-omap_2.6.37.bb
index dba3fbb..2953097 100644 (file)
--- a/recipes/linux/linux-omap_2.6.37.bb
+++ b/recipes/linux/linux-omap_2.6.37.bb
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(beagleboard|overo|omap3evm|omap3-touchbook|usrp-e1xx)"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
 PV = "2.6.37"
-MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}"
+MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}"
 SRCREV = "fa3b4e23ec20cfc944db7cc2b30b0d82c20e4472"
 
 FILESPATHPKG_prepend = "linux-omap-2.6.37:"
@@ -192,6 +192,11 @@ SRC_URI_append = " \
                   file://media/0041-omap3-Add-function-to-register-omap3isp-platform-dev.patch \
                   file://media/0042-omap2-Fix-camera-resources-for-multiomap.patch \
                   file://media/0043-OMAP3-ISP-driver.patch \
+                  \
+                  file://0001-beagleboard-hack-in-support-from-xM-rev-C.patch \
+                  file://0001-xM-audio-fix-from-Ashok.patch \
+                  file://0001-omap3-allow-1GHz-mpurates.patch \
+                  file://0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch \
                   "
 
 SRC_URI_append_usrp-e1xx = "\