[oe-commits] Koen Kooi : linux-omap-pm: correctly re-diff beagle-cpufreq patch

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 295cf17323907fc55298b1c22f11199b243cd287
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=295cf17323907fc55298b1c22f11199b243cd287

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Jan 13 19:53:40 2009 +0100

linux-omap-pm: correctly re-diff beagle-cpufreq patch

---

 packages/linux/linux-omap-pm/beagle-cpufreq.diff |   31 +++++-----------------
 packages/linux/linux-omap-pm_git.bb              |    2 +-
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/packages/linux/linux-omap-pm/beagle-cpufreq.diff b/packages/linux/linux-omap-pm/beagle-cpufreq.diff
index 95234a1..811f1ed 100644
--- a/packages/linux/linux-omap-pm/beagle-cpufreq.diff
+++ b/packages/linux/linux-omap-pm/beagle-cpufreq.diff
@@ -1,6 +1,6 @@
---- /tmp/board-omap3beagle.c	2009-01-12 15:46:26.000000000 +0100
-+++ git/arch/arm/mach-omap2/board-omap3beagle.c	2009-01-12 15:46:28.000000000 +0100
-@@ -41,14 +41,73 @@
+--- /tmp/board-omap3beagle.c	2009-01-13 19:49:19.000000000 +0100
++++ git/arch/arm/mach-omap2/board-omap3beagle.c	2009-01-13 19:51:26.000000000 +0100
+@@ -41,13 +41,72 @@
  #include <mach/usb-ehci.h>
  #include <mach/common.h>
  #include <mach/gpmc.h>
@@ -10,7 +10,6 @@
  #include <mach/omapfb.h>
  #include <mach/display.h>
 +#include <mach/clock.h>
-+
  
  #include "twl4030-generic-scripts.h"
  #include "mmc-twl4030.h"
@@ -47,7 +46,7 @@
 +	/*OPP5*/
 +	{S600M, VDD1_OPP5, 0x3C},
 +};
- 
++
 +static struct omap_opp l3_rate_table[] = {
 +	{0, 0, 0},
 +	/*OPP1*/
@@ -72,32 +71,16 @@
 +	{S430M, VDD1_OPP5, 0x3C},
 +};
  
- #define GPMC_CS0_BASE  0x60
- #define GPMC_CS_SIZE   0x30
-@@ -142,7 +201,15 @@
- 	 * power switch and overcurrent detect
- 	 */
- 
--        /* TODO: This needs to be modified to not rely on u-boot */
-+	gpio_request(gpio + 1, "EHCI_nOC");
-+	gpio_direction_input(gpio + 1);
-+
-+	/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
-+	gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
-+	gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
-+
-+	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
-+	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
  
- 	return 0;
- }
-@@ -227,7 +294,8 @@
+ #define GPMC_CS0_BASE  0x60
+@@ -227,7 +286,9 @@
  
  static void __init omap3_beagle_init_irq(void)
  {
 -	omap2_init_common_hw(mt46h32m32lf6_sdrc_params, NULL, NULL, NULL);
 +	omap2_init_common_hw(mt46h32m32lf6_sdrc_params, mpu_rate_table,
 +						 dsp_rate_table, l3_rate_table);
++
  	omap_init_irq();
  	omap_gpio_init();
  }
diff --git a/packages/linux/linux-omap-pm_git.bb b/packages/linux/linux-omap-pm_git.bb
index 2eed0d6..24ce5d3 100644
--- a/packages/linux/linux-omap-pm_git.bb
+++ b/packages/linux/linux-omap-pm_git.bb
@@ -42,9 +42,9 @@ SRC_URI_append = " \
            file://0010-DSS-OMAPFB-remove-extra-omapfb_setup_overlay-call.patch;patch=1 \
            file://0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch;patch=1 \
            file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;patch=1 \
-           file://beagle-cpufreq.diff;patch=1 \
            file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \
            file://dss2.diff;patch=1 \
+           file://beagle-cpufreq.diff;patch=1 \
 "