diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-03-22 01:56:47 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-03-22 01:56:47 +0000 |
| commit | a4523c8e1d03a61057e9c9d6e9d83e5c0a33c60f (patch) | |
| tree | 77c6145168bbe0ef7ffd2455a18fda91ffe14995 | |
| parent | 4f44df6fd8f2c404fd5b1534257a7a8c85eb96f5 (diff) | |
| download | upstream-a4523c8e1d03a61057e9c9d6e9d83e5c0a33c60f.tar.gz upstream-a4523c8e1d03a61057e9c9d6e9d83e5c0a33c60f.tar.bz2 upstream-a4523c8e1d03a61057e9c9d6e9d83e5c0a33c60f.zip | |
bcm53xx: refresh patches
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 44931
5 files changed, 6 insertions, 6 deletions
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 890b7cffc8..1e42df6c30 100644 --- 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 a3d17aa473..9b0a508f2c 100644 --- 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 ffe46ec949..2964a26faa 100644 --- 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 9f7e1fe91f..4367b8b901 100644 --- 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 a09dbebe43..6b3c40a7cb 100644 --- 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) { |