bcm63xx: refresh 3.6 patches

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 35477
v19.07.3_mercusys_ac12_duma
Jonas Gorski 12 years ago
parent 08ff976720
commit a15e1a950d

@ -211,7 +211,7 @@ Subject: [PATCH 23/63] ohci: add driver for bcm63xx integrated controller.
--- a/drivers/usb/host/ohci-hcd.c --- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c
@@ -1120,6 +1120,11 @@ MODULE_LICENSE ("GPL"); @@ -1120,6 +1120,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ohci_platform_driver #define OHCI_PLATFORM_DRIVER ohci_platform_driver
#endif #endif
+#ifdef CONFIG_USB_OHCI_BCM63XX +#ifdef CONFIG_USB_OHCI_BCM63XX

@ -229,7 +229,7 @@ Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller.
--- a/drivers/usb/host/ehci-hcd.c --- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c
@@ -1339,6 +1339,11 @@ MODULE_LICENSE ("GPL"); @@ -1339,6 +1339,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_platform_driver #define EHCI_PLATFORM_DRIVER ehci_platform_driver
#endif #endif
+#ifdef CONFIG_USB_EHCI_BCM63XX +#ifdef CONFIG_USB_EHCI_BCM63XX
@ -239,4 +239,4 @@ Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller.
+ +
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
!defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
!defined(XILINX_OF_PLATFORM_DRIVER) !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(EHCI_PLATFORM_DRIVER)

@ -57,7 +57,7 @@
#endif #endif
/* /*
@@ -686,6 +734,7 @@ static const struct board_info __initdat @@ -686,6 +736,7 @@ static const struct board_info __initdat
&board_DV201AMR, &board_DV201AMR,
&board_96348gw_a, &board_96348gw_a,
&board_rta1025w_16, &board_rta1025w_16,

@ -22,7 +22,7 @@
static struct board_info board; static struct board_info board;
/* /*
@@ -709,6 +717,596 @@ static struct board_info __initdata boar @@ -711,6 +719,596 @@ static struct board_info __initdata boar
.has_ohci0 = 1, .has_ohci0 = 1,
}; };
@ -619,7 +619,7 @@
#endif #endif
/* /*
@@ -742,6 +1330,11 @@ static const struct board_info __initdat @@ -744,6 +1342,11 @@ static const struct board_info __initdat
&board_96358vw2, &board_96358vw2,
&board_AGPFS0, &board_AGPFS0,
&board_DWVS0, &board_DWVS0,
@ -631,7 +631,7 @@
#endif #endif
}; };
@@ -796,6 +1389,16 @@ static void __init boardid_fixup(u8 *boo @@ -798,6 +1401,16 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K); struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name(); char *board_name = (char *)bcm63xx_nvram_get_name();

@ -41,7 +41,7 @@
#endif #endif
/* /*
@@ -1309,6 +1341,7 @@ static const struct board_info __initdat @@ -1321,6 +1355,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6338 #ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw, &board_96338gw,
&board_96338w, &board_96338w,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -706,6 +706,98 @@ static struct board_info __initdata boar @@ -710,6 +710,98 @@ static struct board_info __initdata boar
}, },
}; };
@ -99,7 +99,7 @@
static struct board_info __initdata board_AGPFS0 = { static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0", .name = "AGPF-S0",
.expected_cpu_id = 0x6358, .expected_cpu_id = 0x6358,
@@ -1362,6 +1452,7 @@ static const struct board_info __initdat @@ -1376,6 +1468,7 @@ static const struct board_info __initdat
&board_96358vw, &board_96358vw,
&board_96358vw2, &board_96358vw2,
&board_AGPFS0, &board_AGPFS0,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -840,6 +840,61 @@ static struct board_info __initdata boar @@ -846,6 +846,61 @@ static struct board_info __initdata boar
.has_ohci0 = 1, .has_ohci0 = 1,
}; };
@ -62,7 +62,7 @@
struct spi_gpio_platform_data nb4_spi_gpio_data = { struct spi_gpio_platform_data nb4_spi_gpio_data = {
.sck = NB4_SPI_GPIO_CLK, .sck = NB4_SPI_GPIO_CLK,
.mosi = NB4_SPI_GPIO_MOSI, .mosi = NB4_SPI_GPIO_MOSI,
@@ -1454,6 +1507,7 @@ static const struct board_info __initdat @@ -1470,6 +1525,7 @@ static const struct board_info __initdat
&board_AGPFS0, &board_AGPFS0,
&board_CPVA642, &board_CPVA642,
&board_DWVS0, &board_DWVS0,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -600,6 +600,67 @@ static struct board_info __initdata boar @@ -604,6 +604,67 @@ static struct board_info __initdata boar
}, },
}, },
}; };
@ -68,7 +68,7 @@
#endif #endif
/* /*
@@ -1499,6 +1560,7 @@ static const struct board_info __initdat @@ -1517,6 +1578,7 @@ static const struct board_info __initdat
&board_96348gw_a, &board_96348gw_a,
&board_rta1025w_16, &board_rta1025w_16,
&board_96348_D4PW, &board_96348_D4PW,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -469,6 +469,112 @@ static struct board_info __initdata boar @@ -471,6 +471,112 @@ static struct board_info __initdata boar
}, },
}; };
@ -113,7 +113,7 @@
static struct board_info __initdata board_FAST2404 = { static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404", .name = "F@ST2404",
.expected_cpu_id = 0x6348, .expected_cpu_id = 0x6348,
@@ -1553,6 +1659,8 @@ static const struct board_info __initdat @@ -1571,6 +1677,8 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6348 #ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r, &board_96348r,
&board_96348gw, &board_96348gw,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -767,6 +767,78 @@ static struct board_info __initdata boar @@ -771,6 +771,78 @@ static struct board_info __initdata boar
}, },
}, },
}; };
@ -79,7 +79,7 @@
#endif #endif
/* /*
@@ -1669,6 +1739,7 @@ static const struct board_info __initdat @@ -1687,6 +1759,7 @@ static const struct board_info __initdat
&board_rta1025w_16, &board_rta1025w_16,
&board_96348_D4PW, &board_96348_D4PW,
&board_spw500v, &board_spw500v,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1709,6 +1709,82 @@ static struct board_info __initdata boar @@ -1729,6 +1729,82 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices, .spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices), .num_spis = ARRAY_SIZE(nb4_spi_devices),
}; };
@ -83,7 +83,7 @@
#endif #endif
/* /*
@@ -1754,6 +1828,7 @@ static const struct board_info __initdat @@ -1774,6 +1850,7 @@ static const struct board_info __initdat
&board_nb4_ser_r2, &board_nb4_ser_r2,
&board_nb4_fxc_r1, &board_nb4_fxc_r1,
&board_nb4_fxc_r2, &board_nb4_fxc_r2,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -215,6 +215,45 @@ static struct board_info __initdata boar @@ -217,6 +217,45 @@ static struct board_info __initdata boar
}, },
}, },
}; };
@ -46,7 +46,7 @@
#endif #endif
/* /*
@@ -1796,6 +1833,7 @@ static const struct board_info __initdat @@ -1818,6 +1857,7 @@ static const struct board_info __initdat
&board_96338gw, &board_96338gw,
&board_96338w, &board_96338w,
&board_96338w2_e7t, &board_96338w2_e7t,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1820,6 +1820,72 @@ static struct board_info __initdata boar @@ -1844,6 +1844,72 @@ static struct board_info __initdata boar
}, },
}, },
}; };
@ -73,7 +73,7 @@
#endif #endif
/* /*
@@ -1867,6 +1933,7 @@ static const struct board_info __initdat @@ -1891,6 +1957,7 @@ static const struct board_info __initdat
&board_nb4_fxc_r1, &board_nb4_fxc_r1,
&board_nb4_fxc_r2, &board_nb4_fxc_r2,
&board_HW553, &board_HW553,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -874,6 +874,65 @@ static struct board_info __initdata boar @@ -882,6 +882,65 @@ static struct board_info __initdata boar
}, },
}, },
}; };
@ -66,7 +66,7 @@
#endif #endif
/* /*
@@ -1918,6 +1975,7 @@ static const struct board_info __initdat @@ -1942,6 +2001,7 @@ static const struct board_info __initdat
&board_96348_D4PW, &board_96348_D4PW,
&board_spw500v, &board_spw500v,
&board_96348sv, &board_96348sv,
@ -74,7 +74,7 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6358 #ifdef CONFIG_BCM63XX_CPU_6358
@@ -2038,6 +2096,23 @@ void __init board_prom_init(void) @@ -2062,6 +2122,23 @@ void __init board_prom_init(void)
val &= MPI_CSBASE_BASE_MASK; val &= MPI_CSBASE_BASE_MASK;
} }
boot_addr = (u8 *)KSEG1ADDR(val); boot_addr = (u8 *)KSEG1ADDR(val);

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -438,6 +438,64 @@ static struct board_info __initdata boar @@ -442,6 +442,64 @@ static struct board_info __initdata boar
}, },
}; };
@ -65,7 +65,7 @@
static struct board_info __initdata board_96348gw = { static struct board_info __initdata board_96348gw = {
.name = "96348GW", .name = "96348GW",
.expected_cpu_id = 0x6348, .expected_cpu_id = 0x6348,
@@ -1976,6 +2032,7 @@ static const struct board_info __initdat @@ -2002,6 +2060,7 @@ static const struct board_info __initdat
&board_spw500v, &board_spw500v,
&board_96348sv, &board_96348sv,
&board_V2500V_BB, &board_V2500V_BB,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -494,6 +494,51 @@ static struct board_info __initdata boar @@ -500,6 +500,51 @@ static struct board_info __initdata boar
}; };
@ -52,7 +52,7 @@
static struct board_info __initdata board_96348gw = { static struct board_info __initdata board_96348gw = {
.name = "96348GW", .name = "96348GW",
.expected_cpu_id = 0x6348, .expected_cpu_id = 0x6348,
@@ -2033,6 +2076,7 @@ static const struct board_info __initdat @@ -2061,6 +2106,7 @@ static const struct board_info __initdat
&board_96348sv, &board_96348sv,
&board_V2500V_BB, &board_V2500V_BB,
&board_V2110, &board_V2110,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1253,6 +1253,8 @@ static struct board_info __initdata boar @@ -1269,6 +1269,8 @@ static struct board_info __initdata boar
.name = "DWV-S0", .name = "DWV-S0",
.expected_cpu_id = 0x6358, .expected_cpu_id = 0x6358,
@ -9,7 +9,7 @@
.has_enet0 = 1, .has_enet0 = 1,
.has_enet1 = 1, .has_enet1 = 1,
.has_pci = 1, .has_pci = 1,
@@ -1268,6 +1270,7 @@ static struct board_info __initdata boar @@ -1284,6 +1286,7 @@ static struct board_info __initdata boar
}, },
.has_ohci0 = 1, .has_ohci0 = 1,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -537,6 +537,69 @@ static struct board_info __initdata boar @@ -545,6 +545,69 @@ static struct board_info __initdata boar
}, },
}; };
@ -70,7 +70,7 @@
static struct board_info __initdata board_96348gw = { static struct board_info __initdata board_96348gw = {
.name = "96348GW", .name = "96348GW",
.expected_cpu_id = 0x6348, .expected_cpu_id = 0x6348,
@@ -2080,6 +2141,7 @@ static const struct board_info __initdat @@ -2110,6 +2173,7 @@ static const struct board_info __initdat
&board_V2500V_BB, &board_V2500V_BB,
&board_V2110, &board_V2110,
&board_ct536_ct5621, &board_ct536_ct5621,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -800,6 +800,7 @@ static struct board_info __initdata boar @@ -810,6 +810,7 @@ static struct board_info __initdata boar
.name = "RTA1025W_16", .name = "RTA1025W_16",
.expected_cpu_id = 0x6348, .expected_cpu_id = 0x6348,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1092,6 +1092,46 @@ static struct board_info __initdata boar @@ -1108,6 +1108,46 @@ static struct board_info __initdata boar
}, },
}, },
}; };
@ -47,7 +47,7 @@
#endif #endif
/* /*
@@ -2143,6 +2181,7 @@ static const struct board_info __initdat @@ -2175,6 +2215,7 @@ static const struct board_info __initdat
&board_V2110, &board_V2110,
&board_ct536_ct5621, &board_ct536_ct5621,
&board_96348A_122, &board_96348A_122,

@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2148,6 +2148,78 @@ static struct board_info __initdata boar @@ -2182,6 +2182,78 @@ static struct board_info __initdata boar
#endif #endif
/* /*
@ -89,7 +89,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
* all boards * all boards
*/ */
static const struct board_info __initdata *bcm963xx_boards[] = { static const struct board_info __initdata *bcm963xx_boards[] = {
@@ -2199,6 +2271,10 @@ static const struct board_info __initdat @@ -2233,6 +2305,10 @@ static const struct board_info __initdat
&board_HW553, &board_HW553,
&board_spw303v, &board_spw303v,
#endif #endif
@ -100,7 +100,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
}; };
/* /*
@@ -2370,12 +2446,25 @@ void __init board_prom_init(void) @@ -2404,12 +2480,25 @@ void __init board_prom_init(void)
bcm63xx_pci_enabled = 1; bcm63xx_pci_enabled = 1;
if (BCMCPU_IS_6348()) if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G2_PCI; val |= GPIO_MODE_6348_G2_PCI;

@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2217,6 +2217,72 @@ static struct board_info __initdata boar @@ -2251,6 +2251,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1, .has_ohci0 = 1,
.has_ehci0 = 1, .has_ehci0 = 1,
}; };
@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
#endif #endif
/* /*
@@ -2274,6 +2340,7 @@ static const struct board_info __initdat @@ -2308,6 +2374,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,

@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
#endif #endif
/* /*
@@ -2323,6 +2393,7 @@ static struct board_info __initdata boar @@ -2357,6 +2427,7 @@ static struct board_info __initdata boar
static const struct board_info __initdata *bcm963xx_boards[] = { static const struct board_info __initdata *bcm963xx_boards[] = {
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,

@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
#endif #endif
/* /*
@@ -2394,6 +2499,7 @@ static const struct board_info __initdat @@ -2428,6 +2533,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,
&board_963281TAN, &board_963281TAN,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1337,6 +1337,59 @@ static struct board_info __initdata boar @@ -1355,6 +1355,59 @@ static struct board_info __initdata boar
}, },
}; };
@ -60,7 +60,7 @@
#endif #endif
/* /*
@@ -2529,6 +2580,7 @@ static const struct board_info __initdat @@ -2563,6 +2616,7 @@ static const struct board_info __initdat
&board_ct536_ct5621, &board_ct536_ct5621,
&board_96348A_122, &board_96348A_122,
&board_CPVA502plus, &board_CPVA502plus,

@ -14,7 +14,7 @@
static struct board_info board; static struct board_info board;
/* /*
@@ -2264,6 +2271,113 @@ static struct board_info __initdata boar @@ -2298,6 +2305,113 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(nb4_spi_devices), .num_spis = ARRAY_SIZE(nb4_spi_devices),
}; };
@ -128,7 +128,7 @@
static struct board_info __initdata board_HW553 = { static struct board_info __initdata board_HW553 = {
.name = "HW553", .name = "HW553",
.expected_cpu_id = 0x6358, .expected_cpu_id = 0x6358,
@@ -2595,6 +2707,7 @@ static const struct board_info __initdat @@ -2631,6 +2745,7 @@ static const struct board_info __initdat
&board_nb4_ser_r2, &board_nb4_ser_r2,
&board_nb4_fxc_r1, &board_nb4_fxc_r1,
&board_nb4_fxc_r2, &board_nb4_fxc_r2,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2515,6 +2515,73 @@ static struct board_info __initdata boar @@ -2553,6 +2553,73 @@ static struct board_info __initdata boar
}, },
} }
}; };
@ -74,7 +74,7 @@
#endif #endif
/* /*
@@ -2710,6 +2775,7 @@ static const struct board_info __initdat @@ -2748,6 +2815,7 @@ static const struct board_info __initdat
&board_ct6373_1, &board_ct6373_1,
&board_HW553, &board_HW553,
&board_spw303v, &board_spw303v,

@ -17,7 +17,7 @@
#define CT6373_PID_OFFSET 0xff80 #define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64 #define CT6373_74X164_GPIO_BASE 64
@@ -2582,6 +2585,103 @@ static struct board_info __initdata boar @@ -2622,6 +2625,103 @@ static struct board_info __initdata boar
}; };
#endif #endif
@ -121,7 +121,7 @@
/* /*
* known 6368 boards * known 6368 boards
*/ */
@@ -2778,6 +2878,10 @@ static const struct board_info __initdat @@ -2818,6 +2918,10 @@ static const struct board_info __initdat
&board_DVAG3810BN, &board_DVAG3810BN,
#endif #endif
@ -132,7 +132,7 @@
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
@@ -2845,6 +2949,11 @@ static void __init boardid_fixup(u8 *boo @@ -2885,6 +2989,11 @@ static void __init boardid_fixup(u8 *boo
} }
} }

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1013,6 +1013,57 @@ static struct board_info __initdata boar @@ -1023,6 +1023,57 @@ static struct board_info __initdata boar
.has_ehci0 = 1, .has_ehci0 = 1,
}; };
@ -58,7 +58,7 @@
static struct board_info __initdata board_rta1025w_16 = { static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16", .name = "RTA1025W_16",
.expected_cpu_id = 0x6348, .expected_cpu_id = 0x6348,
@@ -2846,6 +2895,7 @@ static const struct board_info __initdat @@ -2886,6 +2937,7 @@ static const struct board_info __initdat
&board_96348gw_10, &board_96348gw_10,
&board_96348gw_11, &board_96348gw_11,
&board_FAST2404, &board_FAST2404,

@ -126,7 +126,7 @@
static struct board_info __initdata board_dsl_274xb_f1 = { static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U", .name = "AW4339U",
.expected_cpu_id = 0x6328, .expected_cpu_id = 0x6328,
@@ -2876,6 +2995,7 @@ static const struct board_info __initdat @@ -2918,6 +3037,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,
&board_963281TAN, &board_963281TAN,

@ -79,7 +79,7 @@
static struct board_info __initdata board_963281TAN = { static struct board_info __initdata board_963281TAN = {
.name = "963281TAN", .name = "963281TAN",
.expected_cpu_id = 0x6328, .expected_cpu_id = 0x6328,
@@ -2994,6 +3066,7 @@ static struct board_info __initdata boar @@ -3036,6 +3108,7 @@ static struct board_info __initdata boar
static const struct board_info __initdata *bcm963xx_boards[] = { static const struct board_info __initdata *bcm963xx_boards[] = {
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,

@ -73,7 +73,7 @@
static struct board_info __initdata board_96328A_1441N1 = { static struct board_info __initdata board_96328A_1441N1 = {
.name = "96328A-1441N1", .name = "96328A-1441N1",
.expected_cpu_id = 0x6328, .expected_cpu_id = 0x6328,
@@ -3066,6 +3132,7 @@ static struct board_info __initdata boar @@ -3108,6 +3174,7 @@ static struct board_info __initdata boar
static const struct board_info __initdata *bcm963xx_boards[] = { static const struct board_info __initdata *bcm963xx_boards[] = {
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1921,6 +1921,99 @@ static struct board_info __initdata boar @@ -1945,6 +1945,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1, .has_ohci0 = 1,
.has_ehci0 = 1, .has_ehci0 = 1,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1378,6 +1378,19 @@ static struct board_info __initdata boar @@ -1390,6 +1390,19 @@ static struct board_info __initdata boar
}, },
.has_ohci0 = 1, .has_ohci0 = 1,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -846,6 +846,17 @@ static struct board_info __initdata boar @@ -850,6 +850,17 @@ static struct board_info __initdata boar
.active_low = 1, .active_low = 1,
}, },
}, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -738,6 +738,55 @@ static struct board_info __initdata boar @@ -742,6 +742,55 @@ static struct board_info __initdata boar
.has_uart0 = 1, .has_uart0 = 1,
}; };
@ -56,7 +56,7 @@
#endif #endif
/* /*
@@ -3263,6 +3310,7 @@ static const struct board_info __initdat @@ -3305,6 +3354,7 @@ static const struct board_info __initdat
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6345 #ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2, &board_96345gw2,

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2923,6 +2923,374 @@ static struct board_info __initdata boar @@ -2965,6 +2965,374 @@ static struct board_info __initdata boar
}, },
}; };
@ -375,7 +375,7 @@
/* T-Home Speedport W 303V Typ B */ /* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = { static struct board_info __initdata board_spw303v = {
.name = "96358-502V", .name = "96358-502V",
@@ -3349,6 +3709,10 @@ static const struct board_info __initdat @@ -3393,6 +3761,10 @@ static const struct board_info __initdat
&board_nb4_fxc_r2, &board_nb4_fxc_r2,
&board_ct6373_1, &board_ct6373_1,
&board_HW553, &board_HW553,
@ -386,7 +386,7 @@
&board_spw303v, &board_spw303v,
&board_DVAG3810BN, &board_DVAG3810BN,
#endif #endif
@@ -3414,13 +3778,37 @@ static void __init boardid_fixup(u8 *boo @@ -3458,13 +3830,37 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K); struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name(); char *board_name = (char *)bcm63xx_nvram_get_name();

@ -1,6 +1,6 @@
--- linux-3.6.11/arch/mips/bcm63xx/boards/board_bcm963xx.c.orig 2013-01-05 21:18:15.153079713 +0100 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ linux-3.6.11/arch/mips/bcm63xx/boards/board_bcm963xx.c 2013-01-05 21:18:27.899285369 +0100 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -583,6 +583,8 @@ @@ -581,6 +581,8 @@ static struct board_info __initdata boar
.has_uart0 = 1, .has_uart0 = 1,
.has_enet0 = 1, .has_enet0 = 1,
.enet0 = { .enet0 = {
@ -9,7 +9,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -626,6 +628,8 @@ @@ -624,6 +626,8 @@ static struct board_info __initdata boar
.has_uart0 = 1, .has_uart0 = 1,
.has_enet0 = 1, .has_enet0 = 1,
.enet0 = { .enet0 = {
@ -18,7 +18,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -857,6 +861,8 @@ @@ -855,6 +859,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1, .use_internal_phy = 1,
}, },
.enet1 = { .enet1 = {
@ -27,7 +27,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -929,6 +935,8 @@ @@ -927,6 +933,8 @@ static struct board_info __initdata boar
}, },
.enet1 = { .enet1 = {
@ -36,7 +36,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -1158,6 +1166,8 @@ @@ -1156,6 +1164,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1, .use_internal_phy = 1,
}, },
.enet1 = { .enet1 = {
@ -45,7 +45,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -1333,6 +1343,8 @@ @@ -1331,6 +1341,8 @@ static struct board_info __initdata boar
}, },
.enet1 = { .enet1 = {
@ -54,7 +54,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -1407,6 +1419,8 @@ @@ -1405,6 +1417,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1, .use_internal_phy = 1,
}, },
.enet1 = { .enet1 = {
@ -63,7 +63,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -1428,6 +1442,8 @@ @@ -1426,6 +1440,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1, .use_internal_phy = 1,
}, },
.enet1 = { .enet1 = {
@ -72,7 +72,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -1447,6 +1463,8 @@ @@ -1445,6 +1461,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1, .use_internal_phy = 1,
}, },
.enet1 = { .enet1 = {
@ -81,7 +81,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -1822,6 +1840,8 @@ @@ -1820,6 +1838,8 @@ static struct board_info __initdata boar
}, },
.enet1 = { .enet1 = {
@ -90,7 +90,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -1874,6 +1894,8 @@ @@ -1872,6 +1892,8 @@ static struct board_info __initdata boar
}, },
.enet1 = { .enet1 = {
@ -99,7 +99,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -2014,6 +2036,8 @@ @@ -2012,6 +2034,8 @@ static struct board_info __initdata boar
}, },
.enet1 = { .enet1 = {
@ -108,7 +108,7 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -2131,6 +2155,8 @@ @@ -2129,6 +2153,8 @@ static struct board_info __initdata boar
}, },
.enet1 = { .enet1 = {

@ -8,7 +8,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h> #include <linux/spi/spi_gpio.h>
#include <linux/spi/74x164.h> #include <linux/spi/74x164.h>
@@ -3732,7 +3733,7 @@ static const struct board_info __initdat @@ -3810,7 +3811,7 @@ static const struct board_info __initdat
* bcm4318 WLAN work * bcm4318 WLAN work
*/ */
#ifdef CONFIG_SSB_PCIHOST #ifdef CONFIG_SSB_PCIHOST
@ -17,7 +17,7 @@
.revision = 0x02, .revision = 0x02,
.board_rev = 0x17, .board_rev = 0x17,
.country_code = 0x0, .country_code = 0x0,
@@ -3752,6 +3753,7 @@ static struct ssb_sprom bcm63xx_sprom = @@ -3830,6 +3831,7 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848, .boardflags_lo = 0x2848,
.boardflags_hi = 0x0000, .boardflags_hi = 0x0000,
}; };

Loading…
Cancel
Save