brcm63xx: fix image generation

[openwrt.git] / target / linux / brcm63xx / patches-3.14 / 513-MIPS-BCM63XX-add-inventel-Livebox-support.patch

diff --git a/target/linux/brcm63xx/patches-3.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch b/target/linux/brcm63xx/patches-3.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch
index 1d8b601..2f7bf49 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch
+++ b/target/linux/brcm63xx/patches-3.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch
@@ -14,7 +14,7 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
 
 --- a/arch/mips/bcm63xx/boards/Kconfig
 +++ b/arch/mips/bcm63xx/boards/Kconfig
-@@ -7,4 +7,10 @@ config BOARD_BCM963XX
+@@ -12,4 +12,10 @@ config BOARD_BCM963XX
        default y
         help
  
@@ -33,7 +33,7 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
 +obj-$(CONFIG_BOARD_LIVEBOX)           += board_livebox.o
 --- a/arch/mips/bcm63xx/boards/board_common.c
 +++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -96,7 +96,7 @@ void __init board_prom_init(void)
+@@ -61,7 +61,7 @@ void __init board_prom_init(void)
        if (fw_arg3 == CFE_EPTSEAL)
                board_bcm963xx_init();
        else
@@ -44,8 +44,8 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
  static int (*board_get_mac_address)(u8 mac[ETH_ALEN]);
 --- a/arch/mips/bcm63xx/boards/board_common.h
 +++ b/arch/mips/bcm63xx/boards/board_common.h
-@@ -12,4 +12,10 @@ void board_bcm963xx_init(void);
- static inline void board_bcm963xx_init(void) { }
+@@ -24,4 +24,10 @@ static inline void board_of_device_prese
+ }
  #endif
  
 +#if defined(CONFIG_BOARD_LIVEBOX)
@@ -57,7 +57,7 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
  #endif /* __BOARD_COMMON_H */
 --- /dev/null
 +++ b/arch/mips/bcm63xx/boards/board_livebox.c
-@@ -0,0 +1,197 @@
+@@ -0,0 +1,200 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -118,7 +118,7 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
 +
 +      .has_dsp                        = 0, /*TODO some Liveboxes have dsp*/
 +      .dsp = {
-+              .gpio_rst               = 6, /*FIXME eth1 shares gpio6 with dsp?*/
++              .gpio_rst               = 6,
 +              .gpio_int               = 35,
 +              .cs                     = 2,
 +              .ext_irq                = 2,
@@ -126,25 +126,25 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
 +
 +      .leds = {
 +              {
-+                      .name           = "Livebox-blue-5g::adsl-fail",
++                      .name           = "Livebox-blue-5g:red:adsl-fail",
 +                      .gpio           = 0,
 +                      .active_low     = 0,
 +                      .default_trigger = "default-on",
 +              },
 +              {
-+                      .name           = "Livebox-blue-5g::adsl",
++                      .name           = "Livebox-blue-5g:red:adsl",
 +                      .gpio           = 1,
 +              },
 +              {
-+                      .name           = "Livebox-blue-5g::traffic",
++                      .name           = "Livebox-blue-5g:red:traffic",
 +                      .gpio           = 2,
 +              },
 +              {
-+                      .name           = "Livebox-blue-5g::phone",
++                      .name           = "Livebox-blue-5g:red:phone",
 +                      .gpio           = 3,
 +              },
 +              {
-+                      .name           = "Livebox-blue-5g::wifi",
++                      .name           = "Livebox-blue-5g:red:wifi",
 +                      .gpio           = 4,
 +              },
 +      },
@@ -168,6 +168,9 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
 +              },
 +
 +      },
++
++      .ephy_reset_gpio                = 6,
++      .ephy_reset_gpio_flags          = GPIOF_INIT_HIGH,
 +};
 +#endif
 +