aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dickinson <crazycshore@gmail.com>2012-01-11 13:47:48 +0000
committerDaniel Dickinson <crazycshore@gmail.com>2012-01-11 13:47:48 +0000
commit034b7f0ef555c6e5842003f3c06770aa2023a756 (patch)
tree5c908d51b4fece30a1e93fc187ed1b1df786a087
parent67f62cf5cfecd91550aa35fd22dda2ad15ff0eba (diff)
downloadupstream-034b7f0ef555c6e5842003f3c06770aa2023a756.tar.gz
upstream-034b7f0ef555c6e5842003f3c06770aa2023a756.tar.bz2
upstream-034b7f0ef555c6e5842003f3c06770aa2023a756.zip
Remove invalid LED GPIO from GW6200 board definition. GPIO 35 isn't intended to control ethernet LED (the led behaviour is a side effect) and using the gpio as an led causes kernel panics.
SVN-Revision: 29712
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/447-board_gw6200_gw6000.patch9
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/448-board-MAGIC.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch8
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/456-board_DWV-S0_fixes.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.0/447-board_gw6200_gw6000.patch9
-rw-r--r--target/linux/brcm63xx/patches-3.1/447-board_gw6200_gw6000.patch9
13 files changed, 25 insertions, 40 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.39/447-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-2.6.39/447-board_gw6200_gw6000.patch
index c06fda942c..08d4021417 100644
--- a/target/linux/brcm63xx/patches-2.6.39/447-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/447-board_gw6200_gw6000.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -432,6 +432,117 @@ static struct board_info __initdata boar
+@@ -432,6 +432,112 @@ static struct board_info __initdata boar
},
};
@@ -53,11 +53,6 @@
+ .gpio = 7,
+ .active_low = 1,
+ },
-+ {
-+ .name = "ethernet",
-+ .gpio = 35,
-+ .active_low = 1,
-+ },
+ },
+ .buttons = {
+ {
@@ -118,7 +113,7 @@
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.expected_cpu_id = 0x6348,
-@@ -1540,6 +1651,8 @@ static const struct board_info __initdat
+@@ -1540,6 +1646,8 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,
diff --git a/target/linux/brcm63xx/patches-2.6.39/448-board-MAGIC.patch b/target/linux/brcm63xx/patches-2.6.39/448-board-MAGIC.patch
index 47e7db1417..1db6933dfb 100644
--- a/target/linux/brcm63xx/patches-2.6.39/448-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/448-board-MAGIC.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -751,6 +751,76 @@ static struct board_info __initdata boar
+@@ -746,6 +746,76 @@ static struct board_info __initdata boar
},
};
@@ -77,7 +77,7 @@
#endif
/*
-@@ -1661,6 +1731,7 @@ static const struct board_info __initdat
+@@ -1656,6 +1726,7 @@ static const struct board_info __initdat
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,
diff --git a/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch b/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch
index 964f46c767..9fe0c29166 100644
--- a/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1704,6 +1704,81 @@ static struct board_info __initdata boar
+@@ -1699,6 +1699,81 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@@ -82,7 +82,7 @@
#endif
/*
-@@ -1746,6 +1821,7 @@ static const struct board_info __initdat
+@@ -1741,6 +1816,7 @@ static const struct board_info __initdat
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
diff --git a/target/linux/brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch
index ed5a33b628..39f2eab019 100644
--- a/target/linux/brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch
@@ -44,7 +44,7 @@
#endif
/*
-@@ -1789,6 +1826,7 @@ static const struct board_info __initdat
+@@ -1784,6 +1821,7 @@ static const struct board_info __initdat
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
diff --git a/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch b/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch
index db8d352960..deae36689e 100644
--- a/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1816,6 +1816,72 @@ static struct board_info __initdata boar
+@@ -1811,6 +1811,72 @@ static struct board_info __initdata boar
},
},
};
@@ -73,7 +73,7 @@
#endif
/*
-@@ -1860,6 +1926,7 @@ static const struct board_info __initdat
+@@ -1855,6 +1921,7 @@ static const struct board_info __initdat
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,
diff --git a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
index dc1ba793de..b674aa181e 100644
--- a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -858,6 +858,63 @@ static struct board_info __initdata boar
+@@ -853,6 +853,63 @@ static struct board_info __initdata boar
},
};
@@ -64,7 +64,7 @@
#endif
/*
-@@ -1911,6 +1968,7 @@ static const struct board_info __initdat
+@@ -1906,6 +1963,7 @@ static const struct board_info __initdat
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
@@ -72,7 +72,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2053,6 +2111,22 @@ void __init board_prom_init(void)
+@@ -2048,6 +2106,22 @@ void __init board_prom_init(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;
boot_addr = (u8 *)KSEG1ADDR(val);
@@ -95,7 +95,7 @@
/* dump cfe version */
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2253,6 +2327,13 @@ int __init board_register_devices(void)
+@@ -2248,6 +2322,13 @@ int __init board_register_devices(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;
diff --git a/target/linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch b/target/linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch
index a9e49eb969..5164ee6473 100644
--- a/target/linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch
@@ -63,7 +63,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1969,6 +2025,7 @@ static const struct board_info __initdat
+@@ -1964,6 +2020,7 @@ static const struct board_info __initdat
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,
diff --git a/target/linux/brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch
index cdb931ff6e..dc00e43bda 100644
--- a/target/linux/brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch
@@ -50,7 +50,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2026,6 +2069,7 @@ static const struct board_info __initdat
+@@ -2021,6 +2064,7 @@ static const struct board_info __initdat
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
diff --git a/target/linux/brcm63xx/patches-2.6.39/456-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-2.6.39/456-board_DWV-S0_fixes.patch
index 9937d6739c..4c21d5d196 100644
--- a/target/linux/brcm63xx/patches-2.6.39/456-board_DWV-S0_fixes.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/456-board_DWV-S0_fixes.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1332,6 +1332,8 @@ static struct board_info __initdata boar
+@@ -1327,6 +1327,8 @@ static struct board_info __initdata boar
.name = "DWV-S0",
.expected_cpu_id = 0x6358,
@@ -9,7 +9,7 @@
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
-@@ -1347,6 +1349,7 @@ static struct board_info __initdata boar
+@@ -1342,6 +1344,7 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,
diff --git a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
index 9c4606e258..a6e03d5561 100644
--- a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2133,6 +2133,17 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2128,6 +2128,17 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848,
.boardflags_hi = 0x0000,
};
@@ -18,7 +18,7 @@
#endif
/*
-@@ -2402,8 +2413,9 @@ int __init board_register_devices(void)
+@@ -2397,8 +2408,9 @@ int __init board_register_devices(void)
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
diff --git a/target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch
index 8f26d8bc0a..478019d99e 100644
--- a/target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2113,7 +2113,7 @@ static void __init nb4_nvram_fixup(void)
+@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void)
* bcm4318 WLAN work
*/
#ifdef CONFIG_SSB_PCIHOST
@@ -9,7 +9,7 @@
.revision = 0x02,
.board_rev = 0x17,
.country_code = 0x0,
-@@ -2133,6 +2133,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848,
.boardflags_hi = 0x0000,
};
diff --git a/target/linux/brcm63xx/patches-3.0/447-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.0/447-board_gw6200_gw6000.patch
index c06fda942c..08d4021417 100644
--- a/target/linux/brcm63xx/patches-3.0/447-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.0/447-board_gw6200_gw6000.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -432,6 +432,117 @@ static struct board_info __initdata boar
+@@ -432,6 +432,112 @@ static struct board_info __initdata boar
},
};
@@ -53,11 +53,6 @@
+ .gpio = 7,
+ .active_low = 1,
+ },
-+ {
-+ .name = "ethernet",
-+ .gpio = 35,
-+ .active_low = 1,
-+ },
+ },
+ .buttons = {
+ {
@@ -118,7 +113,7 @@
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.expected_cpu_id = 0x6348,
-@@ -1540,6 +1651,8 @@ static const struct board_info __initdat
+@@ -1540,6 +1646,8 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,
diff --git a/target/linux/brcm63xx/patches-3.1/447-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.1/447-board_gw6200_gw6000.patch
index c06fda942c..08d4021417 100644
--- a/target/linux/brcm63xx/patches-3.1/447-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.1/447-board_gw6200_gw6000.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -432,6 +432,117 @@ static struct board_info __initdata boar
+@@ -432,6 +432,112 @@ static struct board_info __initdata boar
},
};
@@ -53,11 +53,6 @@
+ .gpio = 7,
+ .active_low = 1,
+ },
-+ {
-+ .name = "ethernet",
-+ .gpio = 35,
-+ .active_low = 1,
-+ },
+ },
+ .buttons = {
+ {
@@ -118,7 +113,7 @@
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.expected_cpu_id = 0x6348,
-@@ -1540,6 +1651,8 @@ static const struct board_info __initdat
+@@ -1540,6 +1646,8 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,