Changeset 33209
- Timestamp:
- 2012-08-18T16:08:35+02:00 (5 years ago)
- Location:
- trunk/target/linux/brcm47xx/patches-3.3
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch
r32845 r33209 10 10 --- /dev/null 11 11 +++ b/arch/mips/bcm47xx/bus.c 12 @@ -0,0 +1,8 2@@12 @@ -0,0 +1,86 @@ 13 13 +/* 14 14 + * BCM947xx nvram variable access … … 24 24 +#include <bus.h> 25 25 + 26 +#ifdef CONFIG_BCM47XX_BCMA 26 27 +static int bcm47xx_sflash_bcma_read(struct bcm47xx_sflash *dev, u32 offset, u32 len, u8 *buf) 27 28 +{ … … 58 59 + sflash->size = bcc->sflash.size; 59 60 +} 61 +#endif 60 62 + 63 +#ifdef CONFIG_BCM47XX_SSB 61 64 +static int bcm47xx_sflash_ssb_read(struct bcm47xx_sflash *dev, u32 offset, u32 len, u8 *buf) 62 65 +{ … … 93 96 + sflash->size = scc->sflash.size; 94 97 +} 98 +#endif 95 99 --- a/arch/mips/bcm47xx/setup.c 96 100 +++ b/arch/mips/bcm47xx/setup.c -
trunk/target/linux/brcm47xx/patches-3.3/027-mtd-bcm47xx-add-serial-flash-driver.patch
r31573 r33209 1 --- a/arch/mips/include/asm/mach-bcm47xx/bus.h2 +++ b/arch/mips/include/asm/mach-bcm47xx/bus.h3 @@ -11,6 +11,7 @@4 5 #include <linux/ssb/ssb.h>6 #include <linux/bcma/bcma.h>7 +#include <linux/mtd/mtd.h>8 #include <bcm47xx.h>9 10 struct bcm47xx_sflash {11 @@ -28,6 +29,8 @@ struct bcm47xx_sflash {12 u32 blocksize; /* Block size */13 u32 numblocks; /* Number of blocks */14 u32 size; /* Total size in bytes */15 +16 + struct mtd_info *mtd;17 };18 19 void bcm47xx_sflash_struct_bcma_init(struct bcm47xx_sflash *sflash, struct bcma_drv_cc *bcc);20 1 --- a/drivers/mtd/maps/Kconfig 21 2 +++ b/drivers/mtd/maps/Kconfig -
trunk/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch
r32845 r33209 19 19 * This program is free software; you can redistribute it and/or modify it 20 20 * under the terms of the GNU General Public License as published by the 21 @@ - 80,3 +81,9 @@ void bcm47xx_sflash_struct_ssb_init(stru22 sflash->numblocks = scc->sflash.numblocks;23 sflash->size = scc->sflash.size;21 @@ -46,6 +47,12 @@ void bcm47xx_sflash_struct_bcma_init(str 22 sflash->numblocks = bcc->sflash.numblocks; 23 sflash->size = bcc->sflash.size; 24 24 } 25 25 + … … 29 29 + nflash->bcc = bcc; 30 30 +} 31 #endif 32 33 #ifdef CONFIG_BCM47XX_SSB 31 34 --- a/arch/mips/bcm47xx/nvram.c 32 35 +++ b/arch/mips/bcm47xx/nvram.c … … 47 50 static char nvram_buf[NVRAM_SPACE]; 48 51 49 @@ -1 39,6 +141,51 @@ static int early_nvram_init_sflash(void)50 return 0;51 }52 52 @@ -160,6 +162,51 @@ static void early_nvram_init_ssb(void) 53 #endif 54 55 #ifdef CONFIG_BCM47XX_BCMA 53 56 +static int early_nvram_init_nflash(void) 54 57 +{ … … 96 99 +} 97 100 + 98 #ifdef CONFIG_BCM47XX_SSB 99 static void early_nvram_init_ssb(void) 101 static void early_nvram_init_bcma(void) 100 102 { 103 int err; 101 104 @@ -173,6 +220,11 @@ static void early_nvram_init_bcma(void) 102 105 if (err < 0) … … 121 124 * This program is free software; you can redistribute it and/or modify it 122 125 * under the terms of the GNU General Public License as published by the 123 @@ - 46,6 +47,7 @@ enum bcm47xx_bus_type bcm47xx_bus_type;124 EXPORT_SYMBOL(bcm47xx_bus_type);125 126 struct bcm47xx_sflash bcm47xx_sflash;126 @@ -234,6 +235,21 @@ static int bcm47xx_get_sprom_bcma(struct 127 } 128 } 129 127 130 +struct bcm47xx_nflash bcm47xx_nflash; 128 129 static struct resource bcm47xx_pflash_resource = { 130 .name = "bcm47xx_pflash", 131 @@ -73,6 +75,19 @@ static struct platform_device bcm47xx_sf 132 .num_resources = 1, 133 }; 134 131 + 135 132 +static struct resource bcm47xx_nflash_resource = { 136 133 + .name = "bcm47xx_nflash", … … 146 143 +}; 147 144 + 148 static void bcm47xx_machine_restart(char *command)145 static void __init bcm47xx_register_bcma(void) 149 146 { 150 printk(KERN_ALERT "Please stand by while rebooting the system...\n");151 @@ -248,6 +26 3,9 @@ static void __init bcm47xx_register_bcma147 int err; 148 @@ -248,6 +264,9 @@ static void __init bcm47xx_register_bcma 152 149 153 150 if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_SFLASH) … … 159 156 bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); 160 157 } 161 @@ -264,6 +28 2,9 @@ static int __init bcm47xx_register_flash158 @@ -264,6 +283,9 @@ static int __init bcm47xx_register_flash 162 159 case BCMA_SFLASH: 163 160 bcm47xx_sflash_dev.dev.platform_data = &bcm47xx_sflash; … … 179 176 * This program is free software; you can redistribute it and/or modify it 180 177 * under the terms of the GNU General Public License as published by the 181 @@ -13,6 +14,7 @@ 178 @@ -12,6 +13,7 @@ 179 #include <linux/ssb/ssb.h> 182 180 #include <linux/bcma/bcma.h> 183 #include <linux/mtd/mtd.h>184 181 #include <bcm47xx.h> 185 182 +#include <linux/mtd/nand.h> … … 187 184 struct bcm47xx_sflash { 188 185 enum bcm47xx_bus_type sflash_type; 189 @@ -29,11 +31,24 @@ struct bcm47xx_sflash { 190 u32 blocksize; /* Block size */ 191 u32 numblocks; /* Number of blocks */ 192 u32 size; /* Total size in bytes */ 193 - 194 - struct mtd_info *mtd; 195 }; 196 197 void bcm47xx_sflash_struct_bcma_init(struct bcm47xx_sflash *sflash, struct bcma_drv_cc *bcc); 186 @@ -34,3 +36,18 @@ void bcm47xx_sflash_struct_bcma_init(str 198 187 void bcm47xx_sflash_struct_ssb_init(struct bcm47xx_sflash *sflash, struct ssb_chipcommon *scc); 199 188 … … 446 435 + tristate "bcm47xx nand flash support" 447 436 + default y 448 + depends on BCM47XX 437 + depends on BCM47XX && BCMA_NFLASH 449 438 + select MTD_PARTITIONS 450 439 + help -
trunk/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
r32845 r33209 25 25 #include <asm/reboot.h> 26 26 #include <asm/time.h> 27 @@ -1 66,6 +168,31 @@ static int bcm47xx_get_invariants(struct27 @@ -152,6 +154,31 @@ static int bcm47xx_get_invariants(struct 28 28 return 0; 29 29 } … … 57 57 { 58 58 int err; 59 @@ -1 98,6 +225,10 @@ static void __init bcm47xx_register_ssb(59 @@ -184,6 +211,10 @@ static void __init bcm47xx_register_ssb( 60 60 memcpy(&mcore->serial_ports[1], &port, sizeof(port)); 61 61 } -
trunk/target/linux/brcm47xx/patches-3.3/400-arch-bcm47xx.patch
r31790 r33209 34 34 --- a/arch/mips/bcm47xx/setup.c 35 35 +++ b/arch/mips/bcm47xx/setup.c 36 @@ -3 79,3 +379,20 @@ static int __init bcm47xx_register_flash36 @@ -380,3 +380,20 @@ static int __init bcm47xx_register_flash 37 37 return -1; 38 38 } -
trunk/target/linux/brcm47xx/patches-3.3/502-bcm47xx-rewrite-gpio-handling.patch
r33208 r33209 273 273 --- a/arch/mips/bcm47xx/setup.c 274 274 +++ b/arch/mips/bcm47xx/setup.c 275 @@ -34 4,6 +344,8 @@ void __init plat_mem_setup(void)275 @@ -345,6 +345,8 @@ void __init plat_mem_setup(void) 276 276 _machine_restart = bcm47xx_machine_restart; 277 277 _machine_halt = bcm47xx_machine_halt; -
trunk/target/linux/brcm47xx/patches-3.3/980-wnr834b_no_cardbus_invariant.patch
r31772 r33209 1 1 --- a/arch/mips/bcm47xx/setup.c 2 2 +++ b/arch/mips/bcm47xx/setup.c 3 @@ -1 65,6 +165,10 @@ static int bcm47xx_get_invariants(struct3 @@ -151,6 +151,10 @@ static int bcm47xx_get_invariants(struct 4 4 if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) 5 5 iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);
Note: See TracChangeset
for help on using the changeset viewer.