diff options
| author | John Crispin <blogic@openwrt.org> | 2014-06-26 13:47:50 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-06-26 13:47:50 +0000 |
| commit | 275b1c0474ae4978ad45e73075d8c59ac6bccbfa (patch) | |
| tree | 036ad37896c583f4426eb897c57f60b04de26367 /target/linux/ramips | |
| parent | a5a86f528d940531f3a24eb3c1b1e66fac492852 (diff) | |
| download | master-187ad058-275b1c0474ae4978ad45e73075d8c59ac6bccbfa.tar.gz master-187ad058-275b1c0474ae4978ad45e73075d8c59ac6bccbfa.tar.bz2 master-187ad058-275b1c0474ae4978ad45e73075d8c59ac6bccbfa.zip | |
ralink: refresh kernel patches
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41353 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips')
5 files changed, 11 insertions, 13 deletions
diff --git a/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index b48023dd29..4853348f08 100644 --- a/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device +@@ -927,10 +927,13 @@ static int m25p_probe(struct spi_device unsigned i; struct mtd_part_parser_data ppdata; struct device_node __maybe_unused *np = spi->dev.of_node; @@ -28,7 +28,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> #endif /* Platform data helps sort out which chip type we have, as -@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device +@@ -1006,6 +1009,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; diff --git a/target/linux/ramips/patches-3.10/0125-i2c-MIPS-adds-ralink-I2C-driver.patch b/target/linux/ramips/patches-3.10/0125-i2c-MIPS-adds-ralink-I2C-driver.patch index bb5f492bde..99654a12ac 100644 --- a/target/linux/ramips/patches-3.10/0125-i2c-MIPS-adds-ralink-I2C-driver.patch +++ b/target/linux/ramips/patches-3.10/0125-i2c-MIPS-adds-ralink-I2C-driver.patch @@ -45,7 +45,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +}; --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -630,6 +630,10 @@ config I2C_PXA_SLAVE +@@ -632,6 +632,10 @@ config I2C_PXA_SLAVE is necessary for systems where the PXA may be a target on the I2C bus. diff --git a/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch b/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch index 751a9bcd0c..74453e1bdc 100644 --- a/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch +++ b/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch @@ -146,7 +146,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1058,6 +1180,12 @@ static int m25p_probe(struct spi_device +@@ -1059,6 +1181,12 @@ static int m25p_probe(struct spi_device flash->fast_read = true; #endif diff --git a/target/linux/ramips/patches-3.10/0135-mtd-add-rtn56u-support.patch b/target/linux/ramips/patches-3.10/0135-mtd-add-rtn56u-support.patch index 52379916b9..f48c7cbf97 100644 --- a/target/linux/ramips/patches-3.10/0135-mtd-add-rtn56u-support.patch +++ b/target/linux/ramips/patches-3.10/0135-mtd-add-rtn56u-support.patch @@ -1,6 +1,6 @@ ---- a/drivers/mtd/mtdpart.c 2014-04-27 10:09:21.566294160 +0300 -+++ b/drivers/mtd/mtdpart.c 2014-06-09 11:27:48.952211672 +0300 -@@ -793,8 +793,11 @@ +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -793,8 +793,11 @@ static void split_uimage(struct mtd_info { struct { __be32 magic; @@ -13,7 +13,7 @@ } hdr; size_t len; -@@ -804,7 +807,11 @@ +@@ -804,7 +807,11 @@ static void split_uimage(struct mtd_info if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC)) return; diff --git a/target/linux/ramips/patches-3.10/0218-rt2880-add-wmac-clock.patch b/target/linux/ramips/patches-3.10/0218-rt2880-add-wmac-clock.patch index 20b186b0f7..d7f8a2f551 100644 --- a/target/linux/ramips/patches-3.10/0218-rt2880-add-wmac-clock.patch +++ b/target/linux/ramips/patches-3.10/0218-rt2880-add-wmac-clock.patch @@ -1,7 +1,5 @@ -Index: linux-3.10.34/arch/mips/ralink/rt288x.c -=================================================================== ---- linux-3.10.34.orig/arch/mips/ralink/rt288x.c -+++ linux-3.10.34/arch/mips/ralink/rt288x.c +--- a/arch/mips/ralink/rt288x.c ++++ b/arch/mips/ralink/rt288x.c @@ -52,7 +52,7 @@ static void rt288x_wdt_reset(void) void __init ralink_clk_init(void) @@ -11,7 +9,7 @@ Index: linux-3.10.34/arch/mips/ralink/rt288x.c u32 t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG); t = ((t >> SYSTEM_CONFIG_CPUCLK_SHIFT) & SYSTEM_CONFIG_CPUCLK_MASK); -@@ -78,6 +78,7 @@ void __init ralink_clk_init(void) +@@ -77,6 +77,7 @@ void __init ralink_clk_init(void) ralink_clk_add("300500.uart", cpu_rate / 2); ralink_clk_add("300c00.uartlite", cpu_rate / 2); ralink_clk_add("400000.ethernet", cpu_rate / 2); |