From 8ea3c20b23d55fc17e6153044207f11a0f0cd33b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Fri, 5 Dec 2014 16:13:27 +0000
Subject: [PATCH] bcm53xx: rename patches that were not upstreamed to 3xx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43528
---
....patch => 301-ARM-BCM5301X-fix-early-serial-console.patch} | 0
...atch => 302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch} | 0
...RM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch} | 0
.../patches-3.18/131-ARM-BCM5301X-add-restart-support.patch | 4 ++--
.../bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch | 2 +-
....patch => 301-ARM-BCM5301X-fix-early-serial-console.patch} | 0
...atch => 302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch} | 2 +-
...RM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch} | 0
...XCTL.patch => 305-ARM-BCM53XX-set-customized-AUXCTL.patch} | 4 ++--
9 files changed, 6 insertions(+), 6 deletions(-)
rename target/linux/bcm53xx/patches-3.14/{044-ARM-BCM5301X-fix-early-serial-console.patch => 301-ARM-BCM5301X-fix-early-serial-console.patch} (100%)
rename target/linux/bcm53xx/patches-3.14/{045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch => 302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch} (100%)
rename target/linux/bcm53xx/patches-3.14/{048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch => 303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch} (100%)
rename target/linux/bcm53xx/patches-3.18/{044-ARM-BCM5301X-fix-early-serial-console.patch => 301-ARM-BCM5301X-fix-early-serial-console.patch} (100%)
rename target/linux/bcm53xx/patches-3.18/{045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch => 302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch} (95%)
rename target/linux/bcm53xx/patches-3.18/{048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch => 303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch} (100%)
rename target/linux/bcm53xx/patches-3.18/{049-ARM-BCM53XX-set-customized-AUXCTL.patch => 305-ARM-BCM53XX-set-customized-AUXCTL.patch} (89%)
diff --git a/target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-fix-early-serial-console.patch
similarity index 100%
rename from target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch
rename to target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-fix-early-serial-console.patch
diff --git a/target/linux/bcm53xx/patches-3.14/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch b/target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
similarity index 100%
rename from target/linux/bcm53xx/patches-3.14/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
rename to target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
diff --git a/target/linux/bcm53xx/patches-3.14/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.14/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
similarity index 100%
rename from target/linux/bcm53xx/patches-3.14/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
rename to target/linux/bcm53xx/patches-3.14/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
diff --git a/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch b/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch
index 5948f8727e..a977116a53 100644
--- a/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch
+++ b/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch
@@ -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,
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 b2e56f8e40..ffe46ec949 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
-@@ -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);
diff --git a/target/linux/bcm53xx/patches-3.18/044-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-fix-early-serial-console.patch
similarity index 100%
rename from target/linux/bcm53xx/patches-3.18/044-ARM-BCM5301X-fix-early-serial-console.patch
rename to target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-fix-early-serial-console.patch
diff --git a/target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch b/target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
similarity index 95%
rename from target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
rename to target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
index da17347d3e..6b10c8bbf8 100644
--- a/target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
+++ b/target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
@@ -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
diff --git a/target/linux/bcm53xx/patches-3.18/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
similarity index 100%
rename from target/linux/bcm53xx/patches-3.18/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
rename to target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
diff --git a/target/linux/bcm53xx/patches-3.18/049-ARM-BCM53XX-set-customized-AUXCTL.patch b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
similarity index 89%
rename from target/linux/bcm53xx/patches-3.18/049-ARM-BCM53XX-set-customized-AUXCTL.patch
rename to target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
index 4367b8b901..60ebbc75fa 100644
--- a/target/linux/bcm53xx/patches-3.18/049-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
-@@ -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,
--
GitLab