From 9bec9b86af6ecbd08e6df718b3778be08a93f576 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 5 Dec 2014 16:46:55 +0000 Subject: [PATCH] bcm53xx: backport BCM5301X patches from arm-soc.git next/dt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki SVN-Revision: 43530 --- ...5301X-Add-buttons-for-Netgear-R6250.patch} | 19 ++-- ...CM5301X-Add-DT-for-Netgear-R6300-V2.patch} | 31 ++---- ...301X-Add-DT-for-Buffalo-WZR-1750DHP.patch} | 29 ++--- ...RM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch} | 44 ++------ ...301X-Add-DT-for-Buffalo-WZR-600DHP2.patch} | 31 ++---- ...-Switch-DT-files-to-gpio-keys-polled.patch | 87 +++++++++++++++ ...nable-ChipCommon-UART-serial-console.patch | 103 ++++++++++++++++++ ...5301X-Add-buttons-for-Netgear-R6250.patch} | 19 ++-- ...CM5301X-Add-DT-for-Netgear-R6300-V2.patch} | 31 ++---- ...301X-Add-DT-for-Buffalo-WZR-1750DHP.patch} | 29 ++--- ...RM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch} | 44 ++------ ...301X-Add-DT-for-Buffalo-WZR-600DHP2.patch} | 31 ++---- ...-Switch-DT-files-to-gpio-keys-polled.patch | 87 +++++++++++++++ ...nable-ChipCommon-UART-serial-console.patch | 103 ++++++++++++++++++ 14 files changed, 492 insertions(+), 196 deletions(-) rename target/linux/bcm53xx/patches-3.14/{301-ARM-BCM5301X-Add-buttons-support-for-Netgear-R6250.patch => 047-ARM-BCM5301X-Add-buttons-for-Netgear-R6250.patch} (72%) rename target/linux/bcm53xx/patches-3.14/{302-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch => 048-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch} (79%) rename target/linux/bcm53xx/patches-3.14/{303-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch => 049-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch} (78%) rename target/linux/bcm53xx/patches-3.14/{304-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch => 050-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch} (74%) rename target/linux/bcm53xx/patches-3.14/{305-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch => 051-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch} (74%) create mode 100644 target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch create mode 100644 target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch rename target/linux/bcm53xx/patches-3.18/{301-ARM-BCM5301X-Add-buttons-support-for-Netgear-R6250.patch => 047-ARM-BCM5301X-Add-buttons-for-Netgear-R6250.patch} (72%) rename target/linux/bcm53xx/patches-3.18/{302-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch => 048-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch} (80%) rename target/linux/bcm53xx/patches-3.18/{303-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch => 049-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch} (78%) rename target/linux/bcm53xx/patches-3.18/{304-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch => 050-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch} (74%) rename target/linux/bcm53xx/patches-3.18/{305-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch => 051-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch} (74%) create mode 100644 target/linux/bcm53xx/patches-3.18/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch create mode 100644 target/linux/bcm53xx/patches-3.18/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch diff --git a/target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-Add-buttons-support-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.14/047-ARM-BCM5301X-Add-buttons-for-Netgear-R6250.patch similarity index 72% rename from target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-Add-buttons-support-for-Netgear-R6250.patch rename to target/linux/bcm53xx/patches-3.14/047-ARM-BCM5301X-Add-buttons-for-Netgear-R6250.patch index 9595129e53d..82aa11c5c48 100644 --- a/target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-Add-buttons-support-for-Netgear-R6250.patch +++ b/target/linux/bcm53xx/patches-3.14/047-ARM-BCM5301X-Add-buttons-for-Netgear-R6250.patch @@ -1,20 +1,20 @@ -From e1b44fc2e3cf76be1213bde07fc37c47eff39158 Mon Sep 17 00:00:00 2001 +From f6f8234439737171e571a41264280e844a429699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 2 Oct 2014 13:49:13 +0200 -Subject: [PATCH] ARM: BCM5301X: Add buttons support for Netgear R6250 +Date: Sun, 30 Nov 2014 18:28:29 +0100 +Subject: [PATCH] ARM: BCM5301X: Add buttons for Netgear R6250 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -We use "gpio-keys-polled" for now, as ChipCommon/GPIO interrupts are -not implemented yet. - Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 25 +++++++++++++++++++++++++ arch/arm/boot/dts/bcm5301x.dtsi | 1 + 2 files changed, 26 insertions(+) +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +index 58d999d..4ed7de1 100644 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts @@ -66,4 +66,29 @@ @@ -23,7 +23,7 @@ Signed-off-by: Rafał Miłecki }; + + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; @@ -47,6 +47,8 @@ Signed-off-by: Rafał Miłecki + }; + }; }; +diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi +index b7c4e9e..78aec62 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -9,6 +9,7 @@ @@ -57,3 +59,6 @@ Signed-off-by: Rafał Miłecki #include #include #include "skeleton.dtsi" +-- +1.8.4.5 + diff --git a/target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch b/target/linux/bcm53xx/patches-3.14/048-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch similarity index 79% rename from target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch rename to target/linux/bcm53xx/patches-3.14/048-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch index e3660765e5a..a9e049a731b 100644 --- a/target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch +++ b/target/linux/bcm53xx/patches-3.14/048-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch @@ -1,16 +1,17 @@ -From 788069f86c7fc1ce54661651e695943fb47a5188 Mon Sep 17 00:00:00 2001 +From 302a5ef29d497449280422576a1b55c72fc0ba4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 2 Oct 2014 21:02:33 +0200 +Date: Thu, 4 Dec 2014 10:22:02 +0100 Subject: [PATCH] ARM: BCM5301X: Add DT for Netgear R6300 V2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- - arch/arm/boot/dts/Makefile | 4 ++- - arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 35 ++++++++++++++++++++++++++ - 2 files changed, 38 insertions(+), 1 deletion(-) + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 84 ++++++++++++++++++++++++++ + 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts --- a/arch/arm/boot/dts/Makefile @@ -28,12 +29,12 @@ Signed-off-by: Rafał Miłecki berlin2cd-google-chromecast.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -@@ -0,0 +1,94 @@ +@@ -0,0 +1,84 @@ +/* -+ * Broadcom BCM470X / BCM5301X arm platform code. ++ * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R6300 V2 + * -+ * Copyright © 2014 Rafał Miłecki ++ * Copyright (C) 2014 Rafał Miłecki + * + * Licensed under the GNU/GPL. See COPYING for details. + */ @@ -47,23 +48,13 @@ Signed-off-by: Rafał Miłecki + model = "Netgear R6300 V2 (BCM4708)"; + + chosen { -+ bootargs = "console=ttyS0,115200 earlyprintk"; ++ bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + -+ chipcommonA { -+ uart0: serial@0300 { -+ status = "okay"; -+ }; -+ -+ uart1: serial@0400 { -+ status = "okay"; -+ }; -+ }; -+ + leds { + compatible = "gpio-leds"; + @@ -99,7 +90,7 @@ Signed-off-by: Rafał Miłecki + }; + + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; diff --git a/target/linux/bcm53xx/patches-3.14/303-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-3.14/049-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch similarity index 78% rename from target/linux/bcm53xx/patches-3.14/303-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch rename to target/linux/bcm53xx/patches-3.14/049-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch index a24ea11c1f4..01d85aa0301 100644 --- a/target/linux/bcm53xx/patches-3.14/303-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch +++ b/target/linux/bcm53xx/patches-3.14/049-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch @@ -1,16 +1,17 @@ -From b7620da56595c5505e4a10b8779cec0362b59db2 Mon Sep 17 00:00:00 2001 +From e336a14d2a2aa4431a8acc9eb3305b37f26fb696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 9 Oct 2014 18:04:28 +0200 +Date: Thu, 4 Dec 2014 10:22:58 +0100 Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 74 +++++++++++++++++++++++ - 2 files changed, 75 insertions(+) + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 64 +++++++++++++++++++++++ + 2 files changed, 65 insertions(+) create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts --- a/arch/arm/boot/dts/Makefile @@ -25,12 +26,12 @@ Signed-off-by: Rafał Miłecki dtb-$(CONFIG_ARCH_BERLIN) += \ --- /dev/null +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -0,0 +1,74 @@ +@@ -0,0 +1,64 @@ +/* -+ * Broadcom BCM470X / BCM5301X arm platform code. ++ * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-1750DHP + * -+ * Copyright © 2014 Rafał Miłecki ++ * Copyright (C) 2014 Rafał Miłecki + * + * Licensed under the GNU/GPL. See COPYING for details. + */ @@ -44,25 +45,15 @@ Signed-off-by: Rafał Miłecki + model = "Buffalo WZR-1750DHP (BCM4708)"; + + chosen { -+ bootargs = "console=ttyS0,115200 earlyprintk"; ++ bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + -+ chipcommonA { -+ uart0: serial@0300 { -+ status = "okay"; -+ }; -+ -+ uart1: serial@0400 { -+ status = "okay"; -+ }; -+ }; -+ + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; diff --git a/target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch b/target/linux/bcm53xx/patches-3.14/050-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch similarity index 74% rename from target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch rename to target/linux/bcm53xx/patches-3.14/050-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch index 2dfe3b1a4a0..edcabcd994a 100644 --- a/target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch +++ b/target/linux/bcm53xx/patches-3.14/050-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch @@ -1,18 +1,18 @@ -From 89fe6f9b7875f74e7d63a90ae3a51d84d3cf9369 Mon Sep 17 00:00:00 2001 +From ae2ed35a40007bf737da452df7081a453bf89ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 9 Oct 2014 18:16:26 +0200 +Date: Thu, 4 Dec 2014 10:23:33 +0100 Subject: [PATCH] ARM: BCM5301X: Add DT for Asus RT-N18U MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- arch/arm/boot/dts/Makefile | 3 +- - arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 88 +++++++++++++++++++++++++++++ - arch/arm/boot/dts/bcm47081.dtsi | 26 +++++++++ - arch/arm/mach-bcm/bcm_5301x.c | 1 + - 4 files changed, 117 insertions(+), 1 deletion(-) + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 78 +++++++++++++++++++++++++++++ + arch/arm/boot/dts/bcm47081.dtsi | 26 ++++++++++ + 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts create mode 100644 arch/arm/boot/dts/bcm47081.dtsi @@ -30,12 +30,12 @@ Signed-off-by: Rafał Miłecki berlin2cd-google-chromecast.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -@@ -0,0 +1,88 @@ +@@ -0,0 +1,78 @@ +/* -+ * Broadcom BCM470X / BCM5301X arm platform code. ++ * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-N18U + * -+ * Copyright © 2014 Rafał Miłecki ++ * Copyright (C) 2014 Rafał Miłecki + * + * Licensed under the GNU/GPL. See COPYING for details. + */ @@ -45,27 +45,17 @@ Signed-off-by: Rafał Miłecki +#include "bcm47081.dtsi" + +/ { -+ compatible = "asus,rt-n18u", "brcm,bcm47081"; ++ compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708"; + model = "Asus RT-N18U (BCM47081)"; + + chosen { -+ bootargs = "console=ttyS0,115200 earlyprintk"; ++ bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + -+ chipcommonA { -+ uart0: serial@0300 { -+ status = "okay"; -+ }; -+ -+ uart1: serial@0400 { -+ status = "okay"; -+ }; -+ }; -+ + leds { + compatible = "gpio-leds"; + @@ -101,7 +91,7 @@ Signed-off-by: Rafał Miłecki + }; + + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; @@ -148,13 +138,3 @@ Signed-off-by: Rafał Miłecki + }; + }; +}; ---- a/arch/arm/mach-bcm/bcm_5301x.c -+++ b/arch/arm/mach-bcm/bcm_5301x.c -@@ -81,6 +81,7 @@ static void bcm5301x_restart(enum reboot - - static const char __initconst *bcm5301x_dt_compat[] = { - "brcm,bcm4708", -+ "brcm,bcm47081", - NULL, - }; - diff --git a/target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch b/target/linux/bcm53xx/patches-3.14/051-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch similarity index 74% rename from target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch rename to target/linux/bcm53xx/patches-3.14/051-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch index c2ea67f510c..da5274f8076 100644 --- a/target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch +++ b/target/linux/bcm53xx/patches-3.14/051-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch @@ -1,16 +1,17 @@ -From 4812cd75bc85a9f7050e2b58c1cf17e3bd4dc7f8 Mon Sep 17 00:00:00 2001 +From dd7733da69f198f576d7f52f6bc5a860fe24930d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 15 Oct 2014 09:01:50 +0200 +Date: Thu, 4 Dec 2014 10:24:02 +0100 Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- arch/arm/boot/dts/Makefile | 3 +- - arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 67 ++++++++++++++++++++++ - 2 files changed, 69 insertions(+), 1 deletion(-) + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 57 ++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts --- a/arch/arm/boot/dts/Makefile @@ -27,12 +28,12 @@ Signed-off-by: Rafał Miłecki berlin2cd-google-chromecast.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -@@ -0,0 +1,67 @@ +@@ -0,0 +1,57 @@ +/* -+ * Broadcom BCM470X / BCM5301X arm platform code. ++ * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-600DHP2 + * -+ * Copyright © 2014 Rafał Miłecki ++ * Copyright (C) 2014 Rafał Miłecki + * + * Licensed under the GNU/GPL. See COPYING for details. + */ @@ -42,29 +43,19 @@ Signed-off-by: Rafał Miłecki +#include "bcm47081.dtsi" + +/ { -+ compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081"; ++ compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081", "brcm,bcm4708"; + model = "Buffalo WZR-600DHP2 (BCM47081)"; + + chosen { -+ bootargs = "console=ttyS0,115200 earlyprintk"; ++ bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + -+ chipcommonA { -+ uart0: serial@0300 { -+ status = "okay"; -+ }; -+ -+ uart1: serial@0400 { -+ status = "okay"; -+ }; -+ }; -+ + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; 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/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch new file mode 100644 index 00000000000..ca7582d1681 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch @@ -0,0 +1,87 @@ +From 983e3532c2de15df70aaf80b8906be2d0734dc37 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 5 Dec 2014 12:16:12 +0100 +Subject: [PATCH] ARM: BCM5301X: Switch DT files to "gpio-keys-polled" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We don't support GPIO interrupts yet, so use this as a workaround. + +Signed-off-by: Rafał Miłecki +--- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 2 +- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 2 +- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 2 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 2 +- + 5 files changed, 5 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 5fc0fae..583720e 100644 +--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts ++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +@@ -24,7 +24,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +index 05e80b1..70a1093 100644 +--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +@@ -68,7 +68,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +index 12fc2a0..ac299a2 100644 +--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +@@ -58,7 +58,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +index fb76378..934b244 100644 +--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts ++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +@@ -58,7 +58,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +index bbb414f..d2aefef 100644 +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +@@ -24,7 +24,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +-- +1.8.4.5 + 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/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch new file mode 100644 index 00000000000..7d90697c6c9 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch @@ -0,0 +1,103 @@ +From 6c223da976a9225ba9fae8d6f891a8fffaae6092 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 5 Dec 2014 17:38:40 +0100 +Subject: [PATCH] ARM: BCM5301X: Enable ChipCommon UART (serial console) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Rafał Miłecki +--- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 10 ++++++++++ + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 10 ++++++++++ + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 10 ++++++++++ + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 10 ++++++++++ + 4 files changed, 40 insertions(+) + +diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +index 583720e..d472c36 100644 +--- 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>; + }; + ++ chipcommonA { ++ uart0: serial@0300 { ++ status = "okay"; ++ }; ++ ++ uart1: serial@0400 { ++ status = "okay"; ++ }; ++ }; ++ + gpio-keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +index ac299a2..257d6da 100644 +--- 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>; + }; + ++ chipcommonA { ++ uart0: serial@0300 { ++ status = "okay"; ++ }; ++ ++ uart1: serial@0400 { ++ status = "okay"; ++ }; ++ }; ++ + leds { + compatible = "gpio-leds"; + +diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +index 934b244..cad0e85 100644 +--- 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>; + }; + ++ chipcommonA { ++ uart0: serial@0300 { ++ status = "okay"; ++ }; ++ ++ uart1: serial@0400 { ++ status = "okay"; ++ }; ++ }; ++ + leds { + compatible = "gpio-leds"; + +diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +index d2aefef..f3a0326 100644 +--- 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>; + }; + ++ chipcommonA { ++ uart0: serial@0300 { ++ status = "okay"; ++ }; ++ ++ uart1: serial@0400 { ++ status = "okay"; ++ }; ++ }; ++ + gpio-keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; +-- +1.8.4.5 + diff --git a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-buttons-support-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.18/047-ARM-BCM5301X-Add-buttons-for-Netgear-R6250.patch similarity index 72% rename from target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-buttons-support-for-Netgear-R6250.patch rename to target/linux/bcm53xx/patches-3.18/047-ARM-BCM5301X-Add-buttons-for-Netgear-R6250.patch index 9595129e53d..82aa11c5c48 100644 --- a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-buttons-support-for-Netgear-R6250.patch +++ b/target/linux/bcm53xx/patches-3.18/047-ARM-BCM5301X-Add-buttons-for-Netgear-R6250.patch @@ -1,20 +1,20 @@ -From e1b44fc2e3cf76be1213bde07fc37c47eff39158 Mon Sep 17 00:00:00 2001 +From f6f8234439737171e571a41264280e844a429699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 2 Oct 2014 13:49:13 +0200 -Subject: [PATCH] ARM: BCM5301X: Add buttons support for Netgear R6250 +Date: Sun, 30 Nov 2014 18:28:29 +0100 +Subject: [PATCH] ARM: BCM5301X: Add buttons for Netgear R6250 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -We use "gpio-keys-polled" for now, as ChipCommon/GPIO interrupts are -not implemented yet. - Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 25 +++++++++++++++++++++++++ arch/arm/boot/dts/bcm5301x.dtsi | 1 + 2 files changed, 26 insertions(+) +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +index 58d999d..4ed7de1 100644 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts @@ -66,4 +66,29 @@ @@ -23,7 +23,7 @@ Signed-off-by: Rafał Miłecki }; + + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; @@ -47,6 +47,8 @@ Signed-off-by: Rafał Miłecki + }; + }; }; +diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi +index b7c4e9e..78aec62 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -9,6 +9,7 @@ @@ -57,3 +59,6 @@ Signed-off-by: Rafał Miłecki #include #include #include "skeleton.dtsi" +-- +1.8.4.5 + diff --git a/target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch b/target/linux/bcm53xx/patches-3.18/048-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch similarity index 80% rename from target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch rename to target/linux/bcm53xx/patches-3.18/048-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch index dcb197c61bb..48a4c7c3b6c 100644 --- a/target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch +++ b/target/linux/bcm53xx/patches-3.18/048-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch @@ -1,16 +1,17 @@ -From 788069f86c7fc1ce54661651e695943fb47a5188 Mon Sep 17 00:00:00 2001 +From 302a5ef29d497449280422576a1b55c72fc0ba4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 2 Oct 2014 21:02:33 +0200 +Date: Thu, 4 Dec 2014 10:22:02 +0100 Subject: [PATCH] ARM: BCM5301X: Add DT for Netgear R6300 V2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- - arch/arm/boot/dts/Makefile | 4 ++- - arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 35 ++++++++++++++++++++++++++ - 2 files changed, 38 insertions(+), 1 deletion(-) + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 84 ++++++++++++++++++++++++++ + 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts --- a/arch/arm/boot/dts/Makefile @@ -28,12 +29,12 @@ Signed-off-by: Rafał Miłecki bcm21664-garnet.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -@@ -0,0 +1,94 @@ +@@ -0,0 +1,84 @@ +/* -+ * Broadcom BCM470X / BCM5301X arm platform code. ++ * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R6300 V2 + * -+ * Copyright © 2014 Rafał Miłecki ++ * Copyright (C) 2014 Rafał Miłecki + * + * Licensed under the GNU/GPL. See COPYING for details. + */ @@ -47,23 +48,13 @@ Signed-off-by: Rafał Miłecki + model = "Netgear R6300 V2 (BCM4708)"; + + chosen { -+ bootargs = "console=ttyS0,115200 earlyprintk"; ++ bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + -+ chipcommonA { -+ uart0: serial@0300 { -+ status = "okay"; -+ }; -+ -+ uart1: serial@0400 { -+ status = "okay"; -+ }; -+ }; -+ + leds { + compatible = "gpio-leds"; + @@ -99,7 +90,7 @@ Signed-off-by: Rafał Miłecki + }; + + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; diff --git a/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-3.18/049-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch similarity index 78% rename from target/linux/bcm53xx/patches-3.18/303-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch rename to target/linux/bcm53xx/patches-3.18/049-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch index 42ffe15be40..d7114f51ab1 100644 --- a/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch +++ b/target/linux/bcm53xx/patches-3.18/049-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch @@ -1,16 +1,17 @@ -From b7620da56595c5505e4a10b8779cec0362b59db2 Mon Sep 17 00:00:00 2001 +From e336a14d2a2aa4431a8acc9eb3305b37f26fb696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 9 Oct 2014 18:04:28 +0200 +Date: Thu, 4 Dec 2014 10:22:58 +0100 Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 74 +++++++++++++++++++++++ - 2 files changed, 75 insertions(+) + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 64 +++++++++++++++++++++++ + 2 files changed, 65 insertions(+) create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts --- a/arch/arm/boot/dts/Makefile @@ -25,12 +26,12 @@ Signed-off-by: Rafał Miłecki dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -0,0 +1,74 @@ +@@ -0,0 +1,64 @@ +/* -+ * Broadcom BCM470X / BCM5301X arm platform code. ++ * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-1750DHP + * -+ * Copyright © 2014 Rafał Miłecki ++ * Copyright (C) 2014 Rafał Miłecki + * + * Licensed under the GNU/GPL. See COPYING for details. + */ @@ -44,25 +45,15 @@ Signed-off-by: Rafał Miłecki + model = "Buffalo WZR-1750DHP (BCM4708)"; + + chosen { -+ bootargs = "console=ttyS0,115200 earlyprintk"; ++ bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + -+ chipcommonA { -+ uart0: serial@0300 { -+ status = "okay"; -+ }; -+ -+ uart1: serial@0400 { -+ status = "okay"; -+ }; -+ }; -+ + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; diff --git a/target/linux/bcm53xx/patches-3.18/304-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch b/target/linux/bcm53xx/patches-3.18/050-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch similarity index 74% rename from target/linux/bcm53xx/patches-3.18/304-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch rename to target/linux/bcm53xx/patches-3.18/050-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch index d40c69e8d0d..93d5a2c2872 100644 --- a/target/linux/bcm53xx/patches-3.18/304-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch +++ b/target/linux/bcm53xx/patches-3.18/050-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch @@ -1,18 +1,18 @@ -From 89fe6f9b7875f74e7d63a90ae3a51d84d3cf9369 Mon Sep 17 00:00:00 2001 +From ae2ed35a40007bf737da452df7081a453bf89ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 9 Oct 2014 18:16:26 +0200 +Date: Thu, 4 Dec 2014 10:23:33 +0100 Subject: [PATCH] ARM: BCM5301X: Add DT for Asus RT-N18U MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- arch/arm/boot/dts/Makefile | 3 +- - arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 88 +++++++++++++++++++++++++++++ - arch/arm/boot/dts/bcm47081.dtsi | 26 +++++++++ - arch/arm/mach-bcm/bcm_5301x.c | 1 + - 4 files changed, 117 insertions(+), 1 deletion(-) + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 78 +++++++++++++++++++++++++++++ + arch/arm/boot/dts/bcm47081.dtsi | 26 ++++++++++ + 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts create mode 100644 arch/arm/boot/dts/bcm47081.dtsi @@ -30,12 +30,12 @@ Signed-off-by: Rafał Miłecki bcm21664-garnet.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -@@ -0,0 +1,88 @@ +@@ -0,0 +1,78 @@ +/* -+ * Broadcom BCM470X / BCM5301X arm platform code. ++ * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-N18U + * -+ * Copyright © 2014 Rafał Miłecki ++ * Copyright (C) 2014 Rafał Miłecki + * + * Licensed under the GNU/GPL. See COPYING for details. + */ @@ -45,27 +45,17 @@ Signed-off-by: Rafał Miłecki +#include "bcm47081.dtsi" + +/ { -+ compatible = "asus,rt-n18u", "brcm,bcm47081"; ++ compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708"; + model = "Asus RT-N18U (BCM47081)"; + + chosen { -+ bootargs = "console=ttyS0,115200 earlyprintk"; ++ bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + -+ chipcommonA { -+ uart0: serial@0300 { -+ status = "okay"; -+ }; -+ -+ uart1: serial@0400 { -+ status = "okay"; -+ }; -+ }; -+ + leds { + compatible = "gpio-leds"; + @@ -101,7 +91,7 @@ Signed-off-by: Rafał Miłecki + }; + + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; @@ -148,13 +138,3 @@ Signed-off-by: Rafał Miłecki + }; + }; +}; ---- a/arch/arm/mach-bcm/bcm_5301x.c -+++ b/arch/arm/mach-bcm/bcm_5301x.c -@@ -75,6 +75,7 @@ static void bcm5301x_restart(enum reboot - - static const char __initconst *bcm5301x_dt_compat[] = { - "brcm,bcm4708", -+ "brcm,bcm47081", - NULL, - }; - diff --git a/target/linux/bcm53xx/patches-3.18/305-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch b/target/linux/bcm53xx/patches-3.18/051-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch similarity index 74% rename from target/linux/bcm53xx/patches-3.18/305-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch rename to target/linux/bcm53xx/patches-3.18/051-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch index 2303f7a777a..d1551133c46 100644 --- a/target/linux/bcm53xx/patches-3.18/305-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch +++ b/target/linux/bcm53xx/patches-3.18/051-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch @@ -1,16 +1,17 @@ -From 4812cd75bc85a9f7050e2b58c1cf17e3bd4dc7f8 Mon Sep 17 00:00:00 2001 +From dd7733da69f198f576d7f52f6bc5a860fe24930d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 15 Oct 2014 09:01:50 +0200 +Date: Thu, 4 Dec 2014 10:24:02 +0100 Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki +Signed-off-by: Hauke Mehrtens --- arch/arm/boot/dts/Makefile | 3 +- - arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 67 ++++++++++++++++++++++ - 2 files changed, 69 insertions(+), 1 deletion(-) + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 57 ++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts --- a/arch/arm/boot/dts/Makefile @@ -27,12 +28,12 @@ Signed-off-by: Rafał Miłecki bcm21664-garnet.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -@@ -0,0 +1,67 @@ +@@ -0,0 +1,57 @@ +/* -+ * Broadcom BCM470X / BCM5301X arm platform code. ++ * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-600DHP2 + * -+ * Copyright © 2014 Rafał Miłecki ++ * Copyright (C) 2014 Rafał Miłecki + * + * Licensed under the GNU/GPL. See COPYING for details. + */ @@ -42,29 +43,19 @@ Signed-off-by: Rafał Miłecki +#include "bcm47081.dtsi" + +/ { -+ compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081"; ++ compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081", "brcm,bcm4708"; + model = "Buffalo WZR-600DHP2 (BCM47081)"; + + chosen { -+ bootargs = "console=ttyS0,115200 earlyprintk"; ++ bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + -+ chipcommonA { -+ uart0: serial@0300 { -+ status = "okay"; -+ }; -+ -+ uart1: serial@0400 { -+ status = "okay"; -+ }; -+ }; -+ + gpio-keys { -+ compatible = "gpio-keys-polled"; ++ compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; 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/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch new file mode 100644 index 00000000000..ca7582d1681 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/304-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch @@ -0,0 +1,87 @@ +From 983e3532c2de15df70aaf80b8906be2d0734dc37 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 5 Dec 2014 12:16:12 +0100 +Subject: [PATCH] ARM: BCM5301X: Switch DT files to "gpio-keys-polled" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We don't support GPIO interrupts yet, so use this as a workaround. + +Signed-off-by: Rafał Miłecki +--- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 2 +- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 2 +- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 2 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 2 +- + 5 files changed, 5 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 5fc0fae..583720e 100644 +--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts ++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +@@ -24,7 +24,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +index 05e80b1..70a1093 100644 +--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +@@ -68,7 +68,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +index 12fc2a0..ac299a2 100644 +--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +@@ -58,7 +58,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +index fb76378..934b244 100644 +--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts ++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +@@ -58,7 +58,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +index bbb414f..d2aefef 100644 +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +@@ -24,7 +24,7 @@ + }; + + gpio-keys { +- compatible = "gpio-keys"; ++ compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; +-- +1.8.4.5 + 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/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch new file mode 100644 index 00000000000..7d90697c6c9 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch @@ -0,0 +1,103 @@ +From 6c223da976a9225ba9fae8d6f891a8fffaae6092 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 5 Dec 2014 17:38:40 +0100 +Subject: [PATCH] ARM: BCM5301X: Enable ChipCommon UART (serial console) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Rafał Miłecki +--- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 10 ++++++++++ + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 10 ++++++++++ + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 10 ++++++++++ + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 10 ++++++++++ + 4 files changed, 40 insertions(+) + +diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +index 583720e..d472c36 100644 +--- 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>; + }; + ++ chipcommonA { ++ uart0: serial@0300 { ++ status = "okay"; ++ }; ++ ++ uart1: serial@0400 { ++ status = "okay"; ++ }; ++ }; ++ + gpio-keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +index ac299a2..257d6da 100644 +--- 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>; + }; + ++ chipcommonA { ++ uart0: serial@0300 { ++ status = "okay"; ++ }; ++ ++ uart1: serial@0400 { ++ status = "okay"; ++ }; ++ }; ++ + leds { + compatible = "gpio-leds"; + +diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +index 934b244..cad0e85 100644 +--- 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>; + }; + ++ chipcommonA { ++ uart0: serial@0300 { ++ status = "okay"; ++ }; ++ ++ uart1: serial@0400 { ++ status = "okay"; ++ }; ++ }; ++ + leds { + compatible = "gpio-leds"; + +diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +index d2aefef..f3a0326 100644 +--- 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>; + }; + ++ chipcommonA { ++ uart0: serial@0300 { ++ status = "okay"; ++ }; ++ ++ uart1: serial@0400 { ++ status = "okay"; ++ }; ++ }; ++ + gpio-keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; +-- +1.8.4.5 + -- 2.30.2