Author: jogo Date: 2014-06-30 15:34:43 +0200 (Mon, 30 Jun 2014) New Revision: 41424
Modified: trunk/target/linux/brcm63xx/patches-3.10/400-bcm963xx_flashmap.patch trunk/target/linux/brcm63xx/patches-3.10/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch trunk/target/linux/brcm63xx/patches-3.14/400-bcm963xx_flashmap.patch trunk/target/linux/brcm63xx/patches-3.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch Log: brcm63xx: fix Livebox 1 support The Livebox 1 support is currently broken. Fixed with this patch Fixes: - Redboot partitioning broken: fixed - Replaced custom ephy reset with platform code - USB code breaks the building process: fixed - Led colors - Removed unneded EHCI code since bcm6348 only has OHCI Signed-off-by: Daniel Gonzalez <[email protected]> [jogo: drop unneded parts since merge, fixup to apply to current head] Signed-off-by: Jonas Gorski <[email protected]> Modified: trunk/target/linux/brcm63xx/patches-3.10/400-bcm963xx_flashmap.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.10/400-bcm963xx_flashmap.patch 2014-06-30 13:34:38 UTC (rev 41423) +++ trunk/target/linux/brcm63xx/patches-3.10/400-bcm963xx_flashmap.patch 2014-06-30 13:34:43 UTC (rev 41424) @@ -40,7 +40,7 @@ + } else { + for (i = 0; i < numslots; i++) { + if (!strncmp(buf[i].name, "RedBoot", 8)) { -+ fis_origin = ((buf[i].flash_base & (master->size << 1)) - 1); ++ fis_origin = (buf[i].flash_base & (master->size << 1) - 1); + } + } + } Modified: trunk/target/linux/brcm63xx/patches-3.10/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.10/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch 2014-06-30 13:34:38 UTC (rev 41423) +++ trunk/target/linux/brcm63xx/patches-3.10/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch 2014-06-30 13:34:43 UTC (rev 41424) @@ -57,7 +57,7 @@ #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 @@ + + .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 @@ + + .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 @@ + }, + + }, ++ ++ .ephy_reset_gpio = 6, ++ .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, +}; +#endif + Modified: trunk/target/linux/brcm63xx/patches-3.14/400-bcm963xx_flashmap.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/400-bcm963xx_flashmap.patch 2014-06-30 13:34:38 UTC (rev 41423) +++ trunk/target/linux/brcm63xx/patches-3.14/400-bcm963xx_flashmap.patch 2014-06-30 13:34:43 UTC (rev 41424) @@ -40,7 +40,7 @@ + } else { + for (i = 0; i < numslots; i++) { + if (!strncmp(buf[i].name, "RedBoot", 8)) { -+ fis_origin = ((buf[i].flash_base & (master->size << 1)) - 1); ++ fis_origin = (buf[i].flash_base & (master->size << 1) - 1); + } + } + } Modified: trunk/target/linux/brcm63xx/patches-3.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch 2014-06-30 13:34:38 UTC (rev 41423) +++ trunk/target/linux/brcm63xx/patches-3.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch 2014-06-30 13:34:43 UTC (rev 41424) @@ -57,7 +57,7 @@ #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 @@ + + .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 @@ + + .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 @@ + }, + + }, ++ ++ .ephy_reset_gpio = 6, ++ .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, +}; +#endif + _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
