From 9a495f6bbbcb294b9926f4ec32e5bbb339395d00 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 8 Dec 2014 12:04:25 +0000 Subject: kernel: refresh patches Signed-off-by: Felix Fietkau SVN-Revision: 43564 --- .../brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch | 4 ++-- ...46-MIPS-BCM47XX-add-Microsoft-MN-700-and-Asus-WL500G.patch | 2 +- .../151-MIPS-BCM47XX-Devices-database-update-for-3.17.patch | 6 +++--- ...MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch | 2 +- target/linux/brcm47xx/patches-3.14/159-cpu_fixes.patch | 4 ++-- target/linux/brcm47xx/patches-3.14/310-no_highpage.patch | 2 +- ...mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch | 7 +------ ...bcma-add-table-of-serial-flashes-with-smaller-blocks.patch | 11 +++-------- target/linux/brcm47xx/patches-3.14/920-cache-wround.patch | 8 ++++---- 9 files changed, 18 insertions(+), 28 deletions(-) (limited to 'target/linux/brcm47xx') diff --git a/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch index 0b3874b329..198bf4bcd5 100644 --- a/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch +++ b/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c -@@ -89,6 +89,7 @@ static int bcm47xxpart_parse(struct mtd_ +@@ -93,6 +93,7 @@ static int bcm47xxpart_parse(struct mtd_ int trx_part = -1; int last_trx_part = -1; int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; @@ -8,7 +8,7 @@ if (blocksize <= 0x10000) blocksize = 0x10000; -@@ -269,12 +270,23 @@ static int bcm47xxpart_parse(struct mtd_ +@@ -280,12 +281,23 @@ static int bcm47xxpart_parse(struct mtd_ if (buf[0] == NVRAM_HEADER) { bcm47xxpart_add_part(&parts[curr_part++], "nvram", master->size - blocksize, 0); diff --git a/target/linux/brcm47xx/patches-3.14/146-MIPS-BCM47XX-add-Microsoft-MN-700-and-Asus-WL500G.patch b/target/linux/brcm47xx/patches-3.14/146-MIPS-BCM47XX-add-Microsoft-MN-700-and-Asus-WL500G.patch index a7acd159be..373d14f098 100644 --- a/target/linux/brcm47xx/patches-3.14/146-MIPS-BCM47XX-add-Microsoft-MN-700-and-Asus-WL500G.patch +++ b/target/linux/brcm47xx/patches-3.14/146-MIPS-BCM47XX-add-Microsoft-MN-700-and-Asus-WL500G.patch @@ -102,7 +102,7 @@ Signed-off-by: Ralf Baechle break; --- a/arch/mips/bcm47xx/leds.c +++ b/arch/mips/bcm47xx/leds.c -@@ -64,6 +64,11 @@ bcm47xx_leds_asus_wl330ge[] __initconst +@@ -64,6 +64,11 @@ bcm47xx_leds_asus_wl330ge[] __initconst }; static const struct gpio_led diff --git a/target/linux/brcm47xx/patches-3.14/151-MIPS-BCM47XX-Devices-database-update-for-3.17.patch b/target/linux/brcm47xx/patches-3.14/151-MIPS-BCM47XX-Devices-database-update-for-3.17.patch index 7f01ae3122..e2a767c517 100644 --- a/target/linux/brcm47xx/patches-3.14/151-MIPS-BCM47XX-Devices-database-update-for-3.17.patch +++ b/target/linux/brcm47xx/patches-3.14/151-MIPS-BCM47XX-Devices-database-update-for-3.17.patch @@ -65,7 +65,7 @@ Signed-off-by: Ralf Baechle break; --- a/arch/mips/bcm47xx/leds.c +++ b/arch/mips/bcm47xx/leds.c -@@ -35,6 +35,15 @@ bcm47xx_leds_asus_rtn12[] __initconst = +@@ -35,6 +35,15 @@ bcm47xx_leds_asus_rtn12[] __initconst = }; static const struct gpio_led @@ -81,7 +81,7 @@ Signed-off-by: Ralf Baechle bcm47xx_leds_asus_rtn16[] __initconst = { BCM47XX_GPIO_LED(1, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON), BCM47XX_GPIO_LED(7, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF), -@@ -42,8 +51,8 @@ bcm47xx_leds_asus_rtn16[] __initconst = +@@ -42,8 +51,8 @@ bcm47xx_leds_asus_rtn16[] __initconst = static const struct gpio_led bcm47xx_leds_asus_rtn66u[] __initconst = { @@ -103,7 +103,7 @@ Signed-off-by: Ralf Baechle BCM47XX_GPIO_LED(7, "amber", "wps", 0, LEDS_GPIO_DEFSTATE_OFF), BCM47XX_GPIO_LED(8, "blue", "wps", 0, LEDS_GPIO_DEFSTATE_OFF), }; -@@ -319,6 +328,16 @@ bcm47xx_leds_linksys_wrt54g_type_0101[] +@@ -319,6 +328,16 @@ bcm47xx_leds_linksys_wrt54g_type_0101[] BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF), }; diff --git a/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch b/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch index 2504f41967..ee69e358ff 100644 --- a/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch +++ b/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch @@ -37,7 +37,7 @@ Signed-off-by: Ralf Baechle --- a/arch/mips/bcm47xx/prom.c +++ b/arch/mips/bcm47xx/prom.c -@@ -51,6 +51,8 @@ __init void bcm47xx_set_system_type(u16 +@@ -51,6 +51,8 @@ __init void bcm47xx_set_system_type(u16 chip_id); } diff --git a/target/linux/brcm47xx/patches-3.14/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-3.14/159-cpu_fixes.patch index 70de78c140..12af46c032 100644 --- a/target/linux/brcm47xx/patches-3.14/159-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-3.14/159-cpu_fixes.patch @@ -351,7 +351,7 @@ } --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -1277,6 +1277,9 @@ static void build_r4000_tlb_refill_handl +@@ -1280,6 +1280,9 @@ static void build_r4000_tlb_refill_handl /* No need for uasm_i_nop */ } @@ -361,7 +361,7 @@ #ifdef CONFIG_64BIT build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ #else -@@ -1835,6 +1838,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1840,6 +1843,9 @@ build_r4000_tlbchange_handler_head(u32 * { struct work_registers wr = build_get_work_registers(p); diff --git a/target/linux/brcm47xx/patches-3.14/310-no_highpage.patch b/target/linux/brcm47xx/patches-3.14/310-no_highpage.patch index d71c39deb1..57b0bb865f 100644 --- a/target/linux/brcm47xx/patches-3.14/310-no_highpage.patch +++ b/target/linux/brcm47xx/patches-3.14/310-no_highpage.patch @@ -8,7 +8,7 @@ extern void build_clear_page(void); extern void build_copy_page(void); -@@ -105,13 +106,16 @@ static inline void clear_user_page(void +@@ -105,13 +106,16 @@ static inline void clear_user_page(void flush_data_cache_page((unsigned long)addr); } diff --git a/target/linux/brcm47xx/patches-3.14/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch b/target/linux/brcm47xx/patches-3.14/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch index 5a8aad414f..6f7cdb6ef2 100644 --- a/target/linux/brcm47xx/patches-3.14/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch +++ b/target/linux/brcm47xx/patches-3.14/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch @@ -19,11 +19,9 @@ Any objections? drivers/mtd/bcm47xxpart.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c -index dfd57a0..948f535 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c -@@ -95,8 +95,12 @@ static int bcm47xxpart_parse(struct mtd_info *master, +@@ -95,8 +95,12 @@ static int bcm47xxpart_parse(struct mtd_ int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; bool found_nvram = false; @@ -38,6 +36,3 @@ index dfd57a0..948f535 100644 /* Alloc */ parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS, --- -1.8.4.5 - diff --git a/target/linux/brcm47xx/patches-3.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch b/target/linux/brcm47xx/patches-3.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch index 7a602b79b5..79bd878d76 100644 --- a/target/linux/brcm47xx/patches-3.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch +++ b/target/linux/brcm47xx/patches-3.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch @@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki drivers/bcma/driver_chipcommon_sflash.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -diff --git a/drivers/bcma/driver_chipcommon_sflash.c b/drivers/bcma/driver_chipcommon_sflash.c -index 7e11ef4..25d9e17 100644 --- a/drivers/bcma/driver_chipcommon_sflash.c +++ b/drivers/bcma/driver_chipcommon_sflash.c @@ -9,6 +9,7 @@ @@ -23,7 +21,7 @@ index 7e11ef4..25d9e17 100644 static struct resource bcma_sflash_resource = { .name = "bcma_sflash", -@@ -41,6 +42,13 @@ static const struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = { +@@ -41,6 +42,13 @@ static const struct bcma_sflash_tbl_e bc { NULL }, }; @@ -37,7 +35,7 @@ index 7e11ef4..25d9e17 100644 static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = { { "SST25WF512", 1, 0x1000, 16, }, { "SST25VF512", 0x48, 0x1000, 16, }, -@@ -84,6 +92,23 @@ static void bcma_sflash_cmd(struct bcma_drv_cc *cc, u32 opcode) +@@ -84,6 +92,23 @@ static void bcma_sflash_cmd(struct bcma_ bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n"); } @@ -61,7 +59,7 @@ index 7e11ef4..25d9e17 100644 /* Initialize serial flash access */ int bcma_sflash_init(struct bcma_drv_cc *cc) { -@@ -114,6 +139,10 @@ int bcma_sflash_init(struct bcma_drv_cc *cc) +@@ -114,6 +139,10 @@ int bcma_sflash_init(struct bcma_drv_cc case 0x13: return -ENOTSUPP; default: @@ -72,6 +70,3 @@ index 7e11ef4..25d9e17 100644 for (e = bcma_sflash_st_tbl; e->name; e++) { if (e->id == id) break; --- -1.8.4.5 - diff --git a/target/linux/brcm47xx/patches-3.14/920-cache-wround.patch b/target/linux/brcm47xx/patches-3.14/920-cache-wround.patch index 51c233a6d2..159363a53f 100644 --- a/target/linux/brcm47xx/patches-3.14/920-cache-wround.patch +++ b/target/linux/brcm47xx/patches-3.14/920-cache-wround.patch @@ -44,7 +44,7 @@ UASM_i_LA_mostly(p, ptr, pgdc); #endif uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */ -@@ -1277,12 +1280,12 @@ static void build_r4000_tlb_refill_handl +@@ -1280,12 +1283,12 @@ static void build_r4000_tlb_refill_handl /* No need for uasm_i_nop */ } @@ -60,7 +60,7 @@ build_get_pgde32(&p, K0, K1); /* get pgd in K1 */ #endif -@@ -1294,6 +1297,9 @@ static void build_r4000_tlb_refill_handl +@@ -1297,6 +1300,9 @@ static void build_r4000_tlb_refill_handl build_update_entries(&p, K0, K1); build_tlb_write_entry(&p, &l, &r, tlb_random); uasm_l_leave(&l, p); @@ -70,7 +70,7 @@ uasm_i_eret(&p); /* return from trap */ } #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT -@@ -1838,12 +1844,12 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1843,12 +1849,12 @@ build_r4000_tlbchange_handler_head(u32 * { struct work_registers wr = build_get_work_registers(p); @@ -86,7 +86,7 @@ build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */ #endif -@@ -1882,6 +1888,9 @@ build_r4000_tlbchange_handler_tail(u32 * +@@ -1887,6 +1893,9 @@ build_r4000_tlbchange_handler_tail(u32 * build_tlb_write_entry(p, l, r, tlb_indexed); uasm_l_leave(l, *p); build_restore_work_registers(p); -- cgit v1.2.3