bcm53xx: rename patches that were not upstreamed to 3xx

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

SVN-Revision: 43528
v19.07.3_mercusys_ac12_duma
Rafał Miłecki 10 years ago
parent 8033ccc975
commit 8ea3c20b23

@ -60,8 +60,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
static const char __initconst *bcm5301x_dt_compat[] = {
"brcm,bcm4708",
NULL,
@@ -55,5 +85,6 @@ DT_MACHINE_START(BCM5301X, "BCM5301X")
L310_AUX_CTRL_EARLY_BRESP,
@@ -52,5 +82,6 @@ DT_MACHINE_START(BCM5301X, "BCM5301X")
.l2c_aux_val = 0,
.l2c_aux_mask = ~0,
.init_early = bcm5301x_init_early,
+ .restart = bcm5301x_restart,

@ -15,7 +15,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2093,7 +2093,10 @@ struct pci_bus *pci_scan_root_bus(struct
@@ -2097,7 +2097,10 @@ struct pci_bus *pci_scan_root_bus(struct
if (!found)
pci_bus_update_busn_res_end(b, max);

@ -19,7 +19,7 @@ V2: Don't select GPIOLIB. We may still think about making it default at
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -119,6 +119,7 @@ config ARCH_BCM_63XX
@@ -120,6 +120,7 @@ config ARCH_BCM_63XX
config ARCH_BRCMSTB
bool "Broadcom BCM7XXX based boards" if ARCH_MULTI_V7
depends on MMU

@ -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
@@ -49,7 +49,10 @@ static const char __initconst *bcm5301x_
@@ -80,7 +80,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,
.dt_compat = bcm5301x_dt_compat,
.restart = bcm5301x_restart,
Loading…
Cancel
Save