mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 09:12:25 +02:00
[brcm63xx] fold 446-board-D4PW_correction.patch in 440-board-D4PW.patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27014 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
a18e55e2d0
commit
540c634db7
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -489,6 +489,49 @@ static struct board_info __initdata boar
|
||||
@@ -489,6 +489,55 @@ static struct board_info __initdata boar
|
||||
}
|
||||
},
|
||||
};
|
||||
@ -9,48 +9,54 @@
|
||||
+ .name = "D-4P-W",
|
||||
+ .expected_cpu_id = 0x6348,
|
||||
+
|
||||
+ .has_enet0 = 1,
|
||||
+ .has_enet1 = 1,
|
||||
+ .has_pci = 1,
|
||||
+ .has_uart0 = 1,
|
||||
+
|
||||
+ .enet0 = {
|
||||
+ .has_phy = 1,
|
||||
+ .use_internal_phy = 1,
|
||||
+ },
|
||||
+ .enet1 = {
|
||||
+ .force_speed_100 = 1,
|
||||
+ .force_duplex_full = 1,
|
||||
+ },
|
||||
+
|
||||
+ .has_ohci0 = 1,
|
||||
+ .has_ehci0 = 1,
|
||||
+
|
||||
+ .leds = {
|
||||
+ {
|
||||
+ .name = "ppp",
|
||||
+ .name = "power:green",
|
||||
+ .gpio = 0,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "status",
|
||||
+ .gpio = 3,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "internet:green",
|
||||
+ .gpio = 4,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "ppp-fail",
|
||||
+ .name = "internet:red",
|
||||
+ .gpio = 5,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ },
|
||||
+
|
||||
+ .buttons = {
|
||||
+ {
|
||||
+ .name = "power",
|
||||
+ .gpio = 0,
|
||||
+ .desc = "reset",
|
||||
+ .gpio = 7,
|
||||
+ .active_low = 1,
|
||||
+ .default_trigger = "default-on",
|
||||
+
|
||||
+ .type = EV_KEY,
|
||||
+ .code = KEY_RESTART,
|
||||
+ .threshold = 3,
|
||||
+ },
|
||||
+ },
|
||||
+
|
||||
+};
|
||||
+
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -753,6 +796,7 @@ static const struct board_info __initdat
|
||||
@@ -753,6 +802,7 @@ static const struct board_info __initdat
|
||||
&board_DV201AMR,
|
||||
&board_96348gw_a,
|
||||
&board_rta1025w_16,
|
||||
|
@ -23,7 +23,7 @@
|
||||
static struct bcm963xx_nvram nvram;
|
||||
static unsigned int mac_addr_used;
|
||||
static struct board_info board;
|
||||
@@ -774,6 +783,502 @@ static struct board_info __initdata boar
|
||||
@@ -780,6 +789,502 @@ static struct board_info __initdata boar
|
||||
|
||||
.has_ohci0 = 1,
|
||||
};
|
||||
@ -526,7 +526,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -804,9 +1309,30 @@ static const struct board_info __initdat
|
||||
@@ -810,9 +1315,30 @@ static const struct board_info __initdat
|
||||
&board_96358vw2,
|
||||
&board_AGPFS0,
|
||||
&board_DWVS0,
|
||||
@ -557,7 +557,7 @@
|
||||
/*
|
||||
* Register a sane SPROMv2 to make the on-board
|
||||
* bcm4318 WLAN work
|
||||
@@ -953,6 +1479,9 @@ void __init board_prom_init(void)
|
||||
@@ -959,6 +1485,9 @@ void __init board_prom_init(void)
|
||||
boardid_fixup(boot_addr);
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1288,6 +1320,7 @@ static const struct board_info __initdat
|
||||
@@ -1294,6 +1326,7 @@ static const struct board_info __initdat
|
||||
#ifdef CONFIG_BCM63XX_CPU_6338
|
||||
&board_96338gw,
|
||||
&board_96338w,
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -679,6 +679,98 @@ static struct board_info __initdata boar
|
||||
@@ -685,6 +685,98 @@ static struct board_info __initdata boar
|
||||
},
|
||||
};
|
||||
|
||||
@ -99,7 +99,7 @@
|
||||
static struct board_info __initdata board_AGPFS0 = {
|
||||
.name = "AGPF-S0",
|
||||
.expected_cpu_id = 0x6358,
|
||||
@@ -1341,6 +1433,7 @@ static const struct board_info __initdat
|
||||
@@ -1347,6 +1439,7 @@ static const struct board_info __initdat
|
||||
&board_96358vw,
|
||||
&board_96358vw2,
|
||||
&board_AGPFS0,
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -908,6 +908,59 @@ static struct board_info __initdata boar
|
||||
@@ -914,6 +914,59 @@ static struct board_info __initdata boar
|
||||
.has_ohci0 = 1,
|
||||
};
|
||||
|
||||
@ -60,7 +60,7 @@
|
||||
struct spi_gpio_platform_data nb4_spi_gpio_data = {
|
||||
.sck = NB4_SPI_GPIO_CLK,
|
||||
.mosi = NB4_SPI_GPIO_MOSI,
|
||||
@@ -1435,6 +1488,7 @@ static const struct board_info __initdat
|
||||
@@ -1441,6 +1494,7 @@ static const struct board_info __initdat
|
||||
&board_AGPFS0,
|
||||
&board_CPVA642,
|
||||
&board_DWVS0,
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -573,6 +573,67 @@ static struct board_info __initdata boar
|
||||
|
||||
@@ -579,6 +579,67 @@ static struct board_info __initdata boar
|
||||
},
|
||||
};
|
||||
|
||||
+static struct board_info __initdata board_spw500v = {
|
||||
@ -68,7 +68,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1480,6 +1541,7 @@ static const struct board_info __initdat
|
||||
@@ -1486,6 +1547,7 @@ static const struct board_info __initdat
|
||||
&board_96348gw_a,
|
||||
&board_rta1025w_16,
|
||||
&board_96348_D4PW,
|
||||
|
@ -1,70 +0,0 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -535,42 +535,48 @@ static struct board_info __initdata boar
|
||||
.name = "D-4P-W",
|
||||
.expected_cpu_id = 0x6348,
|
||||
|
||||
- .has_enet0 = 1,
|
||||
- .has_enet1 = 1,
|
||||
+ .has_enet1 = 1,
|
||||
.has_pci = 1,
|
||||
-
|
||||
- .enet0 = {
|
||||
- .has_phy = 1,
|
||||
- .use_internal_phy = 1,
|
||||
- },
|
||||
+ .has_uart0 = 1,
|
||||
+
|
||||
.enet1 = {
|
||||
.force_speed_100 = 1,
|
||||
.force_duplex_full = 1,
|
||||
- },
|
||||
-
|
||||
- .has_ohci0 = 1,
|
||||
- .has_ehci0 = 1,
|
||||
+ },
|
||||
|
||||
.leds = {
|
||||
{
|
||||
- .name = "ppp",
|
||||
+ .name = "power:green",
|
||||
+ .gpio = 0,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "status",
|
||||
+ .gpio = 3,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "internet:green",
|
||||
.gpio = 4,
|
||||
.active_low = 1,
|
||||
},
|
||||
{
|
||||
- .name = "ppp-fail",
|
||||
+ .name = "internet:red",
|
||||
.gpio = 5,
|
||||
.active_low = 1,
|
||||
- },
|
||||
+ },
|
||||
+ },
|
||||
+
|
||||
+ .buttons = {
|
||||
{
|
||||
- .name = "power",
|
||||
- .gpio = 0,
|
||||
+ .desc = "reset",
|
||||
+ .gpio = 7,
|
||||
.active_low = 1,
|
||||
- .default_trigger = "default-on",
|
||||
-
|
||||
+ .type = EV_KEY,
|
||||
+ .code = KEY_RESTART,
|
||||
+ .threshold = 3,
|
||||
},
|
||||
},
|
||||
-
|
||||
};
|
||||
|
||||
static struct board_info __initdata board_spw500v = {
|
Loading…
Reference in New Issue
Block a user