linux-rp: Fix pcmcia ids patch, Use ASoC patches directly from Wolfson for >= 2.6.18

diff --git a/packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
index df1f6b3..b09acac 100644 (file)
--- a/packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/pcnet_cs.c
        PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
        PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
                0xb4be14e3, 0x43ac239b, 0x0877b627),
-+      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +              0x00b2e941, 0x43ac239b, 0x0877b627),
        PCMCIA_DEVICE_NULL
  };

diff --git a/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
index df1f6b3..b09acac 100644 (file)
--- a/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/pcnet_cs.c
        PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
        PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
                0xb4be14e3, 0x43ac239b, 0x0877b627),
-+      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +              0x00b2e941, 0x43ac239b, 0x0877b627),
        PCMCIA_DEVICE_NULL
  };

diff --git a/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
index df1f6b3..b09acac 100644 (file)
--- a/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/pcnet_cs.c
        PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
        PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
                0xb4be14e3, 0x43ac239b, 0x0877b627),
-+      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +              0x00b2e941, 0x43ac239b, 0x0877b627),
        PCMCIA_DEVICE_NULL
  };

diff --git a/packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch
index df1f6b3..b09acac 100644 (file)
--- a/packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/pcnet_cs.c
        PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
        PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
                0xb4be14e3, 0x43ac239b, 0x0877b627),
-+      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +              0x00b2e941, 0x43ac239b, 0x0877b627),
        PCMCIA_DEVICE_NULL
  };

diff --git a/packages/linux/linux-rp-2.6.19/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.19/hrw-pcmcia-ids-r5.patch
index df1f6b3..b09acac 100644 (file)
--- a/packages/linux/linux-rp-2.6.19/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.19/hrw-pcmcia-ids-r5.patch
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/pcnet_cs.c
        PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
        PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
                0xb4be14e3, 0x43ac239b, 0x0877b627),
-+      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++      PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +              0x00b2e941, 0x43ac239b, 0x0877b627),
        PCMCIA_DEVICE_NULL
  };

diff --git a/packages/linux/linux-rp_2.6.18+git.bb b/packages/linux/linux-rp_2.6.18+git.bb
index ec17d97..c25307c 100644 (file)
--- a/packages/linux/linux-rp_2.6.18+git.bb
+++ b/packages/linux/linux-rp_2.6.18+git.bb
@@ -15,8 +15,7 @@ DEFAULT_PREFERENCE = "-1"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ae99a78af33f00565a05dbbc6ca9b247fed002c5 \
-           ${RPSRC}/alsa/asoc-v0.12.4.patch;patch=1 \
-           ${RPSRC}/asoc_makefile-r1.patch;patch=1 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \

diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index aaecc90..6e688d1 100644 (file)
--- a/packages/linux/linux-rp_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -13,8 +13,7 @@ PR = "r6"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
-           ${RPSRC}/alsa/asoc-v0.12.4.patch;patch=1 \
-           ${RPSRC}/asoc_makefile-r1.patch;patch=1 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
            ${RPSRC}/poodle_audio-r6.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \

diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb
index 9fcb700..87b1bd0 100644 (file)
--- a/packages/linux/linux-rp_2.6.19.bb
+++ b/packages/linux/linux-rp_2.6.19.bb
@@ -15,8 +15,7 @@ DEFAULT_PREFERENCE = "-1"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
-           ${RPSRC}/alsa/asoc-v0.12.4.patch;patch=1 \
-           ${RPSRC}/asoc_makefile-r1.patch;patch=1 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \