diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-09-11 22:36:05 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-09-11 22:36:05 +0000 |
| commit | 450aebcdceb0bee01f3f031c78ee13240b3b89b8 (patch) | |
| tree | d8d6b546f71ea168323f8ea3039e8b69d6a8a832 | |
| parent | 1d05e2962fbd543c11a2d3a32637b21fb34ec22a (diff) | |
| download | upstream-450aebcdceb0bee01f3f031c78ee13240b3b89b8.tar.gz upstream-450aebcdceb0bee01f3f031c78ee13240b3b89b8.tar.bz2 upstream-450aebcdceb0bee01f3f031c78ee13240b3b89b8.zip | |
bcm53xx: reorder some arch patches
This moves arch patches affecting many DTS files. Thanks to this change
we can put some ready-to-mainline patches at 300-319 and simplify
backporting process.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 46889
8 files changed, 18 insertions, 18 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch index f99460aa46..802188db17 100644 --- a/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch +++ b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch @@ -15,8 +15,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -@@ -25,6 +25,23 @@ - 0x88000000 0x18000000>; +@@ -24,6 +24,23 @@ + reg = <0x00000000 0x08000000>; }; + clocks { diff --git a/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch b/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch index 586d7387ab..871598f2e0 100644 --- a/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch +++ b/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch @@ -14,8 +14,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -25,6 +25,26 @@ - 0x88000000 0x18000000>; +@@ -24,6 +24,26 @@ + reg = <0x00000000 0x08000000>; }; + axi@18000000 { @@ -43,8 +43,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> num-chipselects = <1>; --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -@@ -25,6 +25,17 @@ - 0x88000000 0x08000000>; +@@ -24,6 +24,17 @@ + reg = <0x00000000 0x08000000>; }; + axi@18000000 { diff --git a/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch b/target/linux/bcm53xx/patches-3.18/330-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch index 86025c10eb..86025c10eb 100644 --- a/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch +++ b/target/linux/bcm53xx/patches-3.18/330-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch diff --git a/target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch b/target/linux/bcm53xx/patches-3.18/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch index c5e6d32d5a..026ef8d564 100644 --- a/target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch +++ b/target/linux/bcm53xx/patches-3.18/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch @@ -26,7 +26,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + 0x88000000 0x18000000>; }; - spi { + axi@18000000 { --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts @@ -21,7 +21,8 @@ @@ -38,7 +38,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + 0x88000000 0x08000000>; }; - leds { + axi@18000000 { --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts @@ -21,7 +21,8 @@ @@ -134,7 +134,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + 0x88000000 0x18000000>; }; - leds { + clocks { --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts @@ -21,7 +21,8 @@ diff --git a/target/linux/bcm53xx/patches-4.1/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch b/target/linux/bcm53xx/patches-4.1/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch index f99460aa46..802188db17 100644 --- a/target/linux/bcm53xx/patches-4.1/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch +++ b/target/linux/bcm53xx/patches-4.1/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch @@ -15,8 +15,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -@@ -25,6 +25,23 @@ - 0x88000000 0x18000000>; +@@ -24,6 +24,23 @@ + reg = <0x00000000 0x08000000>; }; + clocks { diff --git a/target/linux/bcm53xx/patches-4.1/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch b/target/linux/bcm53xx/patches-4.1/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch index 586d7387ab..871598f2e0 100644 --- a/target/linux/bcm53xx/patches-4.1/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch +++ b/target/linux/bcm53xx/patches-4.1/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch @@ -14,8 +14,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -25,6 +25,26 @@ - 0x88000000 0x18000000>; +@@ -24,6 +24,26 @@ + reg = <0x00000000 0x08000000>; }; + axi@18000000 { @@ -43,8 +43,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> num-chipselects = <1>; --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -@@ -25,6 +25,17 @@ - 0x88000000 0x08000000>; +@@ -24,6 +24,17 @@ + reg = <0x00000000 0x08000000>; }; + axi@18000000 { diff --git a/target/linux/bcm53xx/patches-4.1/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch b/target/linux/bcm53xx/patches-4.1/330-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch index 86025c10eb..86025c10eb 100644 --- a/target/linux/bcm53xx/patches-4.1/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch +++ b/target/linux/bcm53xx/patches-4.1/330-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch diff --git a/target/linux/bcm53xx/patches-4.1/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch b/target/linux/bcm53xx/patches-4.1/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch index c5e6d32d5a..026ef8d564 100644 --- a/target/linux/bcm53xx/patches-4.1/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch +++ b/target/linux/bcm53xx/patches-4.1/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch @@ -26,7 +26,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + 0x88000000 0x18000000>; }; - spi { + axi@18000000 { --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts @@ -21,7 +21,8 @@ @@ -38,7 +38,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + 0x88000000 0x08000000>; }; - leds { + axi@18000000 { --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts @@ -21,7 +21,8 @@ @@ -134,7 +134,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + 0x88000000 0x18000000>; }; - leds { + clocks { --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts @@ -21,7 +21,8 @@ |