bcm53xx: refresh patches

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 44931

diff --git a/target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch b/target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch
index 890b7cffc8c5f1025f6521f296da18bd384b76de..1e42df6c3048055567c8b28f578df0d450e48314 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch
+++ b/target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch
@@ -20,7 +20,7 @@ diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
 index 2aaef7b..ca6c949 100644
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -1113,7 +1113,7 @@ config ATH79_WDT
+@@ -1101,7 +1101,7 @@ config ATH79_WDT
  
  config BCM47XX_WDT
        tristate "Broadcom BCM47xx Watchdog Timer"

diff --git a/target/linux/bcm53xx/patches-3.18/110-firmware-backport-NVRAM-driver.patch b/target/linux/bcm53xx/patches-3.18/110-firmware-backport-NVRAM-driver.patch
index a3d17aa473c0b3a9f3bf4e84bdc5fbb287fffe6b..9b0a508f2c2c2597aef203c985925271920ac9e6 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/110-firmware-backport-NVRAM-driver.patch
+++ b/target/linux/bcm53xx/patches-3.18/110-firmware-backport-NVRAM-driver.patch
@@ -92,7 +92,7 @@ diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadc
 index 34c7bc8..943707f 100644
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
  #include <linux/interrupt.h>
  #include <linux/dma-mapping.h>
  #include <linux/platform_data/b53.h>

diff --git a/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch b/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch
index ffe46ec949c35d43ff37e96c57af9a4e9446f788..2964a26faa016064a815e34160e4b4ba31e7d689 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch
+++ b/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch
@@ -15,7 +15,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/pci/probe.c
 +++ b/drivers/pci/probe.c
-@@ -2097,7 +2097,10 @@ struct pci_bus *pci_scan_root_bus(struct
+@@ -2100,7 +2100,10 @@ struct pci_bus *pci_scan_root_bus(struct
        if (!found)
                pci_bus_update_busn_res_end(b, max);
  

diff --git a/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
index 9f7e1fe91f269b92f8625aa5fc9dd4c7a95ed92b..4367b8b9015893fca19e1e8eef8bbb7709139b64 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
+++ b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
@@ -14,7 +14,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/arch/arm/mach-bcm/bcm_5301x.c
 +++ b/arch/arm/mach-bcm/bcm_5301x.c
-@@ -79,7 +79,10 @@ static const char __initconst *bcm5301x_
+@@ -49,7 +49,10 @@ static const char __initconst *bcm5301x_
  };
  
  DT_MACHINE_START(BCM5301X, "BCM5301X")
@@ -25,4 +25,4 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +                        L310_AUX_CTRL_EARLY_BRESP,
        .l2c_aux_mask   = ~0,
        .init_early     = bcm5301x_init_early,
-       .restart        = bcm5301x_restart,
+       .dt_compat      = bcm5301x_dt_compat,

diff --git a/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch b/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch
index a09dbebe43422a7806541182b38027bac5288f4e..6b3c40a7cb021f420de86b97a96f9d02da0fde8d 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch
+++ b/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch
@@ -61,7 +61,7 @@ index 0000000..2d7e388
 +};
 --- a/arch/arm/mach-bcm/bcm_5301x.c
 +++ b/arch/arm/mach-bcm/bcm_5301x.c
-@@ -35,15 +35,16 @@ static struct bcma_bus *bcm5301x_get_bcm
+@@ -18,15 +18,16 @@ static bool first_fault = true;
  static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,
                                 struct pt_regs *regs)
  {