aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-01-20 06:58:03 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-01-20 06:58:03 +0000
commit9758327d836fb5fc8fdd3f26e59360ef55dbe098 (patch)
tree96ff607c1adf2afe131fe8cb86fc6baea3df87f2
parent29207748b926c8e2abf248475ac000331c9f9dd1 (diff)
downloadupstream-9758327d836fb5fc8fdd3f26e59360ef55dbe098.tar.gz
upstream-9758327d836fb5fc8fdd3f26e59360ef55dbe098.tar.bz2
upstream-9758327d836fb5fc8fdd3f26e59360ef55dbe098.zip
bcm53xx: rename patches modifying DTS files
Ths will allow us to use early 3xx numbers for patches designed for sending mainline. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 44057
-rw-r--r--target/linux/bcm53xx/patches-3.14/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch21
-rw-r--r--target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch (renamed from target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch)10
-rw-r--r--target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch (renamed from target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch)16
-rw-r--r--target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch21
-rw-r--r--target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch (renamed from target/linux/bcm53xx/patches-3.18/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch)10
-rw-r--r--target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch (renamed from target/linux/bcm53xx/patches-3.18/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch)16
6 files changed, 34 insertions, 60 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch b/target/linux/bcm53xx/patches-3.14/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
index 6bbf65b195..b460d7f978 100644
--- a/target/linux/bcm53xx/patches-3.14/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
+++ b/target/linux/bcm53xx/patches-3.14/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
@@ -15,8 +15,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
-diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-index 52f1752..d772f54 100644
--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
@@ -20,7 +20,8 @@
@@ -28,9 +26,7 @@ index 52f1752..d772f54 100644
+ 0x88000000 0x18000000>;
};
- chipcommonA {
-diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-index 70a1093..aaafa4a 100644
+ gpio-keys {
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@ -20,7 +20,8 @@
@@ -43,8 +39,6 @@ index 70a1093..aaafa4a 100644
};
chipcommonA {
-diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-index 257d6da..d52dce9 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@ -20,7 +20,8 @@
@@ -56,9 +50,7 @@ index 257d6da..d52dce9 100644
+ 0x88000000 0x08000000>;
};
- chipcommonA {
-diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-index a010fec..819e2c4 100644
+ leds {
--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
@@ -20,7 +20,8 @@
@@ -70,9 +62,7 @@ index a010fec..819e2c4 100644
+ 0x88000000 0x08000000>;
};
- chipcommonA {
-diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-index 0b4bf00..aa2a5e9 100644
+ leds {
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
@@ -20,7 +20,8 @@
@@ -84,7 +74,4 @@ index 0b4bf00..aa2a5e9 100644
+ 0x88000000 0x08000000>;
};
- chipcommonA {
---
-1.8.4.5
-
+ gpio-keys {
diff --git a/target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch b/target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
index b107fe378c..8139ee6761 100644
--- a/target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
+++ b/target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
@@ -19,7 +19,7 @@ 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
-@@ -24,7 +24,7 @@
+@@ -92,7 +92,7 @@
};
gpio-keys {
@@ -30,7 +30,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
poll-interval = <200>;
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
};
gpio-keys {
@@ -41,7 +41,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
poll-interval = <200>;
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-@@ -58,7 +58,7 @@
+@@ -59,7 +59,7 @@
};
gpio-keys {
@@ -52,7 +52,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
poll-interval = <200>;
--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-@@ -58,7 +58,7 @@
+@@ -59,7 +59,7 @@
};
gpio-keys {
@@ -63,7 +63,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
poll-interval = <200>;
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -24,7 +24,7 @@
+@@ -92,7 +92,7 @@
};
gpio-keys {
diff --git a/target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch b/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
index c81e20ff4a..225a4ec9f8 100644
--- a/target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
+++ b/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
@@ -16,8 +16,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
-@@ -23,6 +23,16 @@
- reg = <0x00000000 0x08000000>;
+@@ -91,6 +91,16 @@
+ };
};
+ chipcommonA {
@@ -35,8 +35,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
#address-cells = <1>;
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-@@ -23,6 +23,16 @@
- reg = <0x00000000 0x08000000>;
+@@ -24,6 +24,16 @@
+ 0x88000000 0x08000000>;
};
+ chipcommonA {
@@ -54,8 +54,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-@@ -23,6 +23,16 @@
- reg = <0x00000000 0x08000000>;
+@@ -24,6 +24,16 @@
+ 0x88000000 0x08000000>;
};
+ chipcommonA {
@@ -73,8 +73,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -23,6 +23,16 @@
- reg = <0x00000000 0x08000000>;
+@@ -91,6 +91,16 @@
+ };
};
+ chipcommonA {
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/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
index 6bbf65b195..b460d7f978 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/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
@@ -15,8 +15,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
-diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-index 52f1752..d772f54 100644
--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
@@ -20,7 +20,8 @@
@@ -28,9 +26,7 @@ index 52f1752..d772f54 100644
+ 0x88000000 0x18000000>;
};
- chipcommonA {
-diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-index 70a1093..aaafa4a 100644
+ gpio-keys {
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@ -20,7 +20,8 @@
@@ -43,8 +39,6 @@ index 70a1093..aaafa4a 100644
};
chipcommonA {
-diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-index 257d6da..d52dce9 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@ -20,7 +20,8 @@
@@ -56,9 +50,7 @@ index 257d6da..d52dce9 100644
+ 0x88000000 0x08000000>;
};
- chipcommonA {
-diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-index a010fec..819e2c4 100644
+ leds {
--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
@@ -20,7 +20,8 @@
@@ -70,9 +62,7 @@ index a010fec..819e2c4 100644
+ 0x88000000 0x08000000>;
};
- chipcommonA {
-diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-index 0b4bf00..aa2a5e9 100644
+ leds {
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
@@ -20,7 +20,8 @@
@@ -84,7 +74,4 @@ index 0b4bf00..aa2a5e9 100644
+ 0x88000000 0x08000000>;
};
- chipcommonA {
---
-1.8.4.5
-
+ gpio-keys {
diff --git a/target/linux/bcm53xx/patches-3.18/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch b/target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
index b107fe378c..8139ee6761 100644
--- a/target/linux/bcm53xx/patches-3.18/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
+++ b/target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
@@ -19,7 +19,7 @@ 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
-@@ -24,7 +24,7 @@
+@@ -92,7 +92,7 @@
};
gpio-keys {
@@ -30,7 +30,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
poll-interval = <200>;
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
};
gpio-keys {
@@ -41,7 +41,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
poll-interval = <200>;
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-@@ -58,7 +58,7 @@
+@@ -59,7 +59,7 @@
};
gpio-keys {
@@ -52,7 +52,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
poll-interval = <200>;
--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-@@ -58,7 +58,7 @@
+@@ -59,7 +59,7 @@
};
gpio-keys {
@@ -63,7 +63,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
poll-interval = <200>;
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -24,7 +24,7 @@
+@@ -92,7 +92,7 @@
};
gpio-keys {
diff --git a/target/linux/bcm53xx/patches-3.18/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch b/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
index c81e20ff4a..225a4ec9f8 100644
--- a/target/linux/bcm53xx/patches-3.18/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
+++ b/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
@@ -16,8 +16,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
-@@ -23,6 +23,16 @@
- reg = <0x00000000 0x08000000>;
+@@ -91,6 +91,16 @@
+ };
};
+ chipcommonA {
@@ -35,8 +35,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
#address-cells = <1>;
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-@@ -23,6 +23,16 @@
- reg = <0x00000000 0x08000000>;
+@@ -24,6 +24,16 @@
+ 0x88000000 0x08000000>;
};
+ chipcommonA {
@@ -54,8 +54,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-@@ -23,6 +23,16 @@
- reg = <0x00000000 0x08000000>;
+@@ -24,6 +24,16 @@
+ 0x88000000 0x08000000>;
};
+ chipcommonA {
@@ -73,8 +73,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -23,6 +23,16 @@
- reg = <0x00000000 0x08000000>;
+@@ -91,6 +91,16 @@
+ };
};
+ chipcommonA {