From 62d1a08936c37f1bcd2d33ceac2290ec5b653299 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 20 Jan 2015 06:58:03 +0000 Subject: [PATCH] bcm53xx: rename patches modifying DTS files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Ths will allow us to use early 3xx numbers for patches designed for sending mainline. Signed-off-by: Rafał Miłecki SVN-Revision: 44057 --- ...cify-RAM-on-devices-by-including-HIG.patch | 21 ++++--------------- ...Switch-DT-files-to-gpio-keys-polled.patch} | 10 ++++----- ...able-ChipCommon-UART-serial-console.patch} | 16 +++++++------- ...cify-RAM-on-devices-by-including-HIG.patch | 21 ++++--------------- ...Switch-DT-files-to-gpio-keys-polled.patch} | 10 ++++----- ...able-ChipCommon-UART-serial-console.patch} | 16 +++++++------- 6 files changed, 34 insertions(+), 60 deletions(-) rename target/linux/bcm53xx/patches-3.14/{304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch => 350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch} (95%) rename target/linux/bcm53xx/patches-3.14/{305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch => 351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch} (89%) rename target/linux/bcm53xx/patches-3.18/{304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch => 350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch} (95%) rename target/linux/bcm53xx/patches-3.18/{305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch => 351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch} (89%) 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 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 similarity index 95% rename from target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch rename to 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 --- 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 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 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 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 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 similarity index 89% rename from target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch rename to 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 --- 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 #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 --- 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 --- 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 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 similarity index 95% rename from target/linux/bcm53xx/patches-3.18/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch rename to 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 --- 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 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 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 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 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 similarity index 89% rename from target/linux/bcm53xx/patches-3.18/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch rename to 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 --- 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 #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 --- 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 --- 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 { -- 2.30.2