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
This commit is contained in:
parent
67f62cf5cf
commit
034b7f0ef5
13 changed files with 25 additions and 40 deletions
|
@ -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
|
||||||
@@ -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,
|
+ .gpio = 7,
|
||||||
+ .active_low = 1,
|
+ .active_low = 1,
|
||||||
+ },
|
+ },
|
||||||
+ {
|
|
||||||
+ .name = "ethernet",
|
|
||||||
+ .gpio = 35,
|
|
||||||
+ .active_low = 1,
|
|
||||||
+ },
|
|
||||||
+ },
|
+ },
|
||||||
+ .buttons = {
|
+ .buttons = {
|
||||||
+ {
|
+ {
|
||||||
|
@ -118,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,
|
||||||
@@ -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
|
#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
|
||||||
@@ -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
|
#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_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
|
||||||
@@ -1704,6 +1704,81 @@ static struct board_info __initdata boar
|
@@ -1699,6 +1699,81 @@ 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),
|
||||||
};
|
};
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
#endif
|
#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_ser_r2,
|
||||||
&board_nb4_fxc_r1,
|
&board_nb4_fxc_r1,
|
||||||
&board_nb4_fxc_r2,
|
&board_nb4_fxc_r2,
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -1789,6 +1826,7 @@ static const struct board_info __initdat
|
@@ -1784,6 +1821,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
|
||||||
@@ -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
|
#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_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
|
||||||
@@ -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
|
#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_96348_D4PW,
|
||||||
&board_spw500v,
|
&board_spw500v,
|
||||||
&board_96348sv,
|
&board_96348sv,
|
||||||
|
@ -72,7 +72,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_BCM63XX_CPU_6358
|
#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 = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||||
val &= MPI_CSBASE_BASE_MASK;
|
val &= MPI_CSBASE_BASE_MASK;
|
||||||
boot_addr = (u8 *)KSEG1ADDR(val);
|
boot_addr = (u8 *)KSEG1ADDR(val);
|
||||||
|
@ -95,7 +95,7 @@
|
||||||
|
|
||||||
/* dump cfe version */
|
/* dump cfe version */
|
||||||
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
|
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 = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||||
val &= MPI_CSBASE_BASE_MASK;
|
val &= MPI_CSBASE_BASE_MASK;
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,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,
|
||||||
@@ -1969,6 +2025,7 @@ static const struct board_info __initdat
|
@@ -1964,6 +2020,7 @@ static const struct board_info __initdat
|
||||||
&board_spw500v,
|
&board_spw500v,
|
||||||
&board_96348sv,
|
&board_96348sv,
|
||||||
&board_V2500V_BB,
|
&board_V2500V_BB,
|
||||||
|
|
|
@ -50,7 +50,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,
|
||||||
@@ -2026,6 +2069,7 @@ static const struct board_info __initdat
|
@@ -2021,6 +2064,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
|
||||||
@@ -1332,6 +1332,8 @@ static struct board_info __initdata boar
|
@@ -1327,6 +1327,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,
|
||||||
@@ -1347,6 +1349,7 @@ static struct board_info __initdata boar
|
@@ -1342,6 +1344,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
|
||||||
@@ -2133,6 +2133,17 @@ static struct ssb_sprom bcm63xx_sprom =
|
@@ -2128,6 +2128,17 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||||
.boardflags_lo = 0x2848,
|
.boardflags_lo = 0x2848,
|
||||||
.boardflags_hi = 0x0000,
|
.boardflags_hi = 0x0000,
|
||||||
};
|
};
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
#endif
|
#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)) {
|
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
|
||||||
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||||
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||||
|
|
|
@ -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
|
||||||
@@ -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
|
* bcm4318 WLAN work
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_SSB_PCIHOST
|
#ifdef CONFIG_SSB_PCIHOST
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
.revision = 0x02,
|
.revision = 0x02,
|
||||||
.board_rev = 0x17,
|
.board_rev = 0x17,
|
||||||
.country_code = 0x0,
|
.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_lo = 0x2848,
|
||||||
.boardflags_hi = 0x0000,
|
.boardflags_hi = 0x0000,
|
||||||
};
|
};
|
||||||
|
|
|
@ -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
|
||||||
@@ -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,
|
+ .gpio = 7,
|
||||||
+ .active_low = 1,
|
+ .active_low = 1,
|
||||||
+ },
|
+ },
|
||||||
+ {
|
|
||||||
+ .name = "ethernet",
|
|
||||||
+ .gpio = 35,
|
|
||||||
+ .active_low = 1,
|
|
||||||
+ },
|
|
||||||
+ },
|
+ },
|
||||||
+ .buttons = {
|
+ .buttons = {
|
||||||
+ {
|
+ {
|
||||||
|
@ -118,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,
|
||||||
@@ -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
|
#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
|
||||||
@@ -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,
|
+ .gpio = 7,
|
||||||
+ .active_low = 1,
|
+ .active_low = 1,
|
||||||
+ },
|
+ },
|
||||||
+ {
|
|
||||||
+ .name = "ethernet",
|
|
||||||
+ .gpio = 35,
|
|
||||||
+ .active_low = 1,
|
|
||||||
+ },
|
|
||||||
+ },
|
+ },
|
||||||
+ .buttons = {
|
+ .buttons = {
|
||||||
+ {
|
+ {
|
||||||
|
@ -118,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,
|
||||||
@@ -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
|
#ifdef CONFIG_BCM63XX_CPU_6348
|
||||||
&board_96348r,
|
&board_96348r,
|
||||||
&board_96348gw,
|
&board_96348gw,
|
||||||
|
|
Loading…
Reference in a new issue