aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-17 12:51:02 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-17 12:51:02 +0000
commitafbf3d994e57e06f8f5669033ab0e89af44e49c4 (patch)
treec94f0225aafe46c2716aa14d0f53941d81d40b8d /target/linux/ixp4xx
parent23578461a92aca344eb5d34d59352da3163281a8 (diff)
downloadupstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.tar.gz
upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.tar.bz2
upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.zip
kernel: update linux 3.3 to 3.3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31336 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-3.3/010-backport_ixp4xx_mtd_fix.patch43
-rw-r--r--target/linux/ixp4xx/patches-3.3/193-cambria_pld_gpio.patch2
2 files changed, 1 insertions, 44 deletions
diff --git a/target/linux/ixp4xx/patches-3.3/010-backport_ixp4xx_mtd_fix.patch b/target/linux/ixp4xx/patches-3.3/010-backport_ixp4xx_mtd_fix.patch
deleted file mode 100644
index 426714f933..0000000000
--- a/target/linux/ixp4xx/patches-3.3/010-backport_ixp4xx_mtd_fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit a3c1e3b732b3708a80e4035b9d845f3f7c7dd0c9
-Author: Marc Kleine-Budde <mkl@blackshift.org>
-Date: Wed Feb 8 20:24:29 2012 +0100
-
- mtd: ixp4xx: oops in ixp4xx_flash_probe
-
- In commit "c797533 mtd: abstract last MTD partition parser argument" the
- third argument of "mtd_device_parse_register()" changed from start address
- of the MTD device to a pointer to a struct.
-
- The "ixp4xx_flash_probe()" function was not converted properly, causing
- an oops during boot.
-
- This patch fixes the problem by filling the needed information into a
- "struct mtd_part_parser_data" and passing it to
- "mtd_device_parse_register()".
-
- Signed-off-by: Marc Kleine-Budde <mkl@blackshift.org>
- Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
- Cc: stable@kernel.org [3.2+]
- Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-
---- a/drivers/mtd/maps/ixp4xx.c
-+++ b/drivers/mtd/maps/ixp4xx.c
-@@ -182,6 +182,9 @@ static int ixp4xx_flash_probe(struct pla
- {
- struct flash_platform_data *plat = dev->dev.platform_data;
- struct ixp4xx_flash_info *info;
-+ struct mtd_part_parser_data ppdata = {
-+ .origin = dev->resource->start,
-+ };
- int err = -1;
-
- if (!plat)
-@@ -247,7 +250,7 @@ static int ixp4xx_flash_probe(struct pla
- /* Use the fast version */
- info->map.write = ixp4xx_write16;
-
-- err = mtd_device_parse_register(info->mtd, probes, dev->resource->start,
-+ err = mtd_device_parse_register(info->mtd, probes, &ppdata,
- plat->parts, plat->nr_parts);
- if (err) {
- printk(KERN_ERR "Could not parse partitions\n");
diff --git a/target/linux/ixp4xx/patches-3.3/193-cambria_pld_gpio.patch b/target/linux/ixp4xx/patches-3.3/193-cambria_pld_gpio.patch
index 299630f171..171898d6c7 100644
--- a/target/linux/ixp4xx/patches-3.3/193-cambria_pld_gpio.patch
+++ b/target/linux/ixp4xx/patches-3.3/193-cambria_pld_gpio.patch
@@ -90,7 +90,7 @@
}
static struct cambria_board_info cambria_boards[] __initdata = {
-@@ -460,6 +507,14 @@ static struct i2c_board_info __initdata
+@@ -460,6 +507,14 @@ static struct i2c_board_info __initdata
I2C_BOARD_INFO("24c08", 0x51),
.platform_data = &cambria_eeprom_info
},