From 2289e5825253464712260555f3954d45148a6633 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 30 Jun 2014 13:34:43 +0000 Subject: [PATCH] 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 [jogo: drop unneded parts since merge, fixup to apply to current head] Signed-off-by: Jonas Gorski SVN-Revision: 41424 --- .../patches-3.10/400-bcm963xx_flashmap.patch | 2 +- ...S-BCM63XX-add-inventel-Livebox-support.patch | 17 ++++++++++------- .../patches-3.14/400-bcm963xx_flashmap.patch | 2 +- ...S-BCM63XX-add-inventel-Livebox-support.patch | 17 ++++++++++------- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/target/linux/brcm63xx/patches-3.10/400-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-3.10/400-bcm963xx_flashmap.patch index 1594a063aa3..0bbb4e5289c 100644 --- a/target/linux/brcm63xx/patches-3.10/400-bcm963xx_flashmap.patch +++ b/target/linux/brcm63xx/patches-3.10/400-bcm963xx_flashmap.patch @@ -40,7 +40,7 @@ Signed-off-by: Axel Gembe + } 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); + } + } + } diff --git a/target/linux/brcm63xx/patches-3.10/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch b/target/linux/brcm63xx/patches-3.10/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch index 1d8b6010586..72a67abcabc 100644 --- a/target/linux/brcm63xx/patches-3.10/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch +++ b/target/linux/brcm63xx/patches-3.10/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch @@ -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 + diff --git a/target/linux/brcm63xx/patches-3.14/400-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-3.14/400-bcm963xx_flashmap.patch index 1594a063aa3..0bbb4e5289c 100644 --- a/target/linux/brcm63xx/patches-3.14/400-bcm963xx_flashmap.patch +++ b/target/linux/brcm63xx/patches-3.14/400-bcm963xx_flashmap.patch @@ -40,7 +40,7 @@ Signed-off-by: Axel Gembe + } 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); + } + } + } 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 1d8b6010586..72a67abcabc 100644 --- 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 @@ -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 + -- 2.30.2