summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-26 13:53:00 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-26 13:53:00 +0000
commit540c634db702d5c6007ee44f148b0e66ea095c06 (patch)
treeb13079fb55fc42e3965fa8abc88802bc54410bb3 /target
parenta18e55e2d0eec2d9047d90a09f00b9651df1996a (diff)
[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
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm63xx/patches-2.6.37/440-board-D4PW.patch40
-rw-r--r--target/linux/brcm63xx/patches-2.6.37/441-board-NB4.patch6
-rw-r--r--target/linux/brcm63xx/patches-2.6.37/442-board-96338W2_E7T.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.37/443-board-CPVA642.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.37/444-board_dsl_274xb_rev_c.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.37/445-board_spw500v.patch6
-rw-r--r--target/linux/brcm63xx/patches-2.6.37/446-board-D4PW_correction.patch70
7 files changed, 34 insertions, 98 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.37/440-board-D4PW.patch b/target/linux/brcm63xx/patches-2.6.37/440-board-D4PW.patch
index 3b3a1641db..07f6159930 100644
--- a/target/linux/brcm63xx/patches-2.6.37/440-board-D4PW.patch
+++ b/target/linux/brcm63xx/patches-2.6.37/440-board-D4PW.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-2.6.37/441-board-NB4.patch b/target/linux/brcm63xx/patches-2.6.37/441-board-NB4.patch
index 2f4cd818da..2fb7ff2726 100644
--- a/target/linux/brcm63xx/patches-2.6.37/441-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-2.6.37/441-board-NB4.patch
@@ -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);
}
diff --git a/target/linux/brcm63xx/patches-2.6.37/442-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-2.6.37/442-board-96338W2_E7T.patch
index 70f6f4be6e..66ced55fa7 100644
--- a/target/linux/brcm63xx/patches-2.6.37/442-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-2.6.37/442-board-96338W2_E7T.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-2.6.37/443-board-CPVA642.patch b/target/linux/brcm63xx/patches-2.6.37/443-board-CPVA642.patch
index c6e8403221..0ace02d7b1 100644
--- a/target/linux/brcm63xx/patches-2.6.37/443-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-2.6.37/443-board-CPVA642.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-2.6.37/444-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-2.6.37/444-board_dsl_274xb_rev_c.patch
index ae24b48e74..5bafc77d36 100644
--- a/target/linux/brcm63xx/patches-2.6.37/444-board_dsl_274xb_rev_c.patch
+++ b/target/linux/brcm63xx/patches-2.6.37/444-board_dsl_274xb_rev_c.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-2.6.37/445-board_spw500v.patch b/target/linux/brcm63xx/patches-2.6.37/445-board_spw500v.patch
index 7501626d6f..e2215f2d02 100644
--- a/target/linux/brcm63xx/patches-2.6.37/445-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-2.6.37/445-board_spw500v.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-2.6.37/446-board-D4PW_correction.patch b/target/linux/brcm63xx/patches-2.6.37/446-board-D4PW_correction.patch
deleted file mode 100644
index 2eb7070ddb..0000000000
--- a/target/linux/brcm63xx/patches-2.6.37/446-board-D4PW_correction.patch
+++ /dev/null
@@ -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 = {