[brcm63xx] fold 446-board-D4PW_correction.patch in 440-board-D4PW.patch

[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-2.6.37 / 440-board-D4PW.patch

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 3b3a1641db0c47bd4d9162f8fc18b84bef7e9f48..07f6159930626560f050f3e9900d471f1b1ab035 100644 (file)
--- 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,