diff options
Diffstat (limited to 'target/linux/brcm47xx/patches-3.14')
4 files changed, 4 insertions, 26 deletions
diff --git a/target/linux/brcm47xx/patches-3.14/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch b/target/linux/brcm47xx/patches-3.14/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch index e5bdb97b6c..ea15933ea9 100644 --- a/target/linux/brcm47xx/patches-3.14/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch +++ b/target/linux/brcm47xx/patches-3.14/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch @@ -34,7 +34,7 @@ V2: Drop pr_debug for devices we don't need workarounds for. It was too #endif --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c -@@ -282,6 +282,7 @@ static int __init bcm47xx_register_bus_c +@@ -286,6 +286,7 @@ static int __init bcm47xx_register_bus_c } bcm47xx_buttons_register(); bcm47xx_leds_register(); diff --git a/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch b/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch index 777e93bd5a..2504f41967 100644 --- a/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch +++ b/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch @@ -132,7 +132,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +#endif /* defined(CONFIG_BCM47XX_BCMA) && defined(CONFIG_HIGHMEM) */ --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c -@@ -227,6 +227,9 @@ void __init plat_mem_setup(void) +@@ -231,6 +231,9 @@ void __init plat_mem_setup(void) bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA; bcm47xx_register_bcma(); bcm47xx_set_system_type(bcm47xx_bus.bcma.bus.chipinfo.id); diff --git a/target/linux/brcm47xx/patches-3.14/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-3.14/830-huawei_e970_support.patch index ee35eed6ad..5425d049cb 100644 --- a/target/linux/brcm47xx/patches-3.14/830-huawei_e970_support.patch +++ b/target/linux/brcm47xx/patches-3.14/830-huawei_e970_support.patch @@ -8,7 +8,7 @@ #include <asm/bootinfo.h> #include <asm/idle.h> #include <asm/prom.h> -@@ -278,6 +279,33 @@ static struct fixed_phy_status bcm47xx_f +@@ -282,6 +283,33 @@ static struct fixed_phy_status bcm47xx_f .duplex = DUPLEX_FULL, }; @@ -42,7 +42,7 @@ static int __init bcm47xx_register_bus_complete(void) { switch (bcm47xx_bus_type) { -@@ -297,6 +325,7 @@ static int __init bcm47xx_register_bus_c +@@ -301,6 +329,7 @@ static int __init bcm47xx_register_bus_c bcm47xx_workarounds(); fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status); diff --git a/target/linux/brcm47xx/patches-3.14/960-fix-phy-device.patch b/target/linux/brcm47xx/patches-3.14/960-fix-phy-device.patch deleted file mode 100644 index f8d923916d..0000000000 --- a/target/linux/brcm47xx/patches-3.14/960-fix-phy-device.patch +++ /dev/null @@ -1,22 +0,0 @@ -This fixes a problem introduced in this commit: - -commit 87aa9f9c61ad56d505641681812e92ad976f8608 -Author: Florian Fainelli <f.fainelli@gmail.com> -Date: Fri Dec 6 13:01:34 2013 -0800 - - net: phy: consolidate PHY reset in phy_init_hw() - -The fixups are not executed before the switch gets registered but after -the kernel searches for the right switch driver. When the search is -executed it searches for the phy_id 0x00, because it was not fixed. - ---- a/drivers/net/phy/phy_device.c -+++ b/drivers/net/phy/phy_device.c -@@ -353,6 +353,7 @@ int phy_device_register(struct phy_devic - phydev->bus->phy_map[phydev->addr] = phydev; - - /* Run all of the fixups for this PHY */ -+ phy_scan_fixups(phydev); - err = phy_init_hw(phydev); - if (err) { - pr_err("PHY %d failed to initialize\n", phydev->addr); |