linux omap2 git: update smartreflex patches

diff --git a/packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch b/packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch
index bdf9e29..8e60939 100644 (file)
--- a/packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch
+++ b/packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch
@@ -266,9 +266,9 @@ index 6a0459a..3667fd6 100644
 --- a/include/asm-arm/arch-omap/omap34xx.h
 +++ b/include/asm-arm/arch-omap/omap34xx.h
 @@ -54,6 +54,8 @@
+ #define OMAP34XX_HSUSB_OTG_BASE       (L4_34XX_BASE + 0xAB000)
  #define OMAP34XX_HSUSB_HOST_BASE      (L4_34XX_BASE + 0x64000)
  #define OMAP34XX_USBTLL_BASE  (L4_34XX_BASE + 0x62000)
- #define IRQ_SIR_IRQ           0x0040
 +#define OMAP34XX_SR1_BASE     0x480C9000
 +#define OMAP34XX_SR2_BASE     0x480CB000
  

diff --git a/packages/linux/linux-omap2-git/omap3evm/0002-ARM-OMAP-SmartReflex-driver.patch b/packages/linux/linux-omap2-git/omap3evm/0002-ARM-OMAP-SmartReflex-driver.patch
index bdf9e29..8e60939 100644 (file)
--- a/packages/linux/linux-omap2-git/omap3evm/0002-ARM-OMAP-SmartReflex-driver.patch
+++ b/packages/linux/linux-omap2-git/omap3evm/0002-ARM-OMAP-SmartReflex-driver.patch
@@ -266,9 +266,9 @@ index 6a0459a..3667fd6 100644
 --- a/include/asm-arm/arch-omap/omap34xx.h
 +++ b/include/asm-arm/arch-omap/omap34xx.h
 @@ -54,6 +54,8 @@
+ #define OMAP34XX_HSUSB_OTG_BASE       (L4_34XX_BASE + 0xAB000)
  #define OMAP34XX_HSUSB_HOST_BASE      (L4_34XX_BASE + 0x64000)
  #define OMAP34XX_USBTLL_BASE  (L4_34XX_BASE + 0x62000)
- #define IRQ_SIR_IRQ           0x0040
 +#define OMAP34XX_SR1_BASE     0x480C9000
 +#define OMAP34XX_SR2_BASE     0x480CB000
  

diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 04d9fd1..3a0d65d 100644 (file)
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA
 SRCREV = "5b97d3ec6732c87741b2fc04f2956f097a458818"
 
 PV = "2.6.25+2.6.26-rc6+${PR}+git${SRCREV}"
-PR = "r24"
+PR = "r25"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
@@ -14,18 +14,18 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
            file://flash.patch;patch=1 \
-#         file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
-#         file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
-#         file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+              file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+              file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+              file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
            file://0001-omap3-cpuidle.patch;patch=1 \ 
            file://0002-omap3-cpuidle.patch;patch=1 \
 "
 
 SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
            file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
-#           file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
-#           file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
-#           file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+           file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+           file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+           file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
            file://0001-omap3-cpuidle.patch;patch=1 \
            file://0002-omap3-cpuidle.patch;patch=1 \
 "