ARM: BCM5301X: Add buttons for Netgear R6250
Subsystems (6)
Rafał Miłecki
maintainerPATCH 1/5 ARM: BCM5301X: Add buttons for Netgear R6250
--- arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 25 +++++++++++++++++++++++++ arch/arm/boot/dts/bcm5301x.dtsi | 1 + 2 files changed, 26 insertions(+)
arch/arm/boot/dts/bcm4708-netgear-r6250.dts +25 -0
@@ -66,4 +66,29 @@ linux,default-trigger = "default-off"; }; }; + + gpio-keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; + + wps { + label = "WPS"; + linux,code = <KEY_WPS_BUTTON>; + gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>; + }; + + rfkill { + label = "WiFi"; + linux,code = <KEY_RFKILL>; + gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>; + }; + + restart { + label = "Reset"; + linux,code = <KEY_RESTART>; + gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>; + }; + }; };
arch/arm/boot/dts/bcm5301x.dtsi +1 -0
@@ -9,6 +9,7 @@ */ #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include "skeleton.dtsi"
Signature · 1 line
1.8.4.5
Rafał Miłecki
maintainerPATCH 2/5 ARM: BCM5301X: Add DT for Netgear R6300 V2
--- 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
arch/arm/boot/dts/Makefile +3 -1
@@ -55,7 +55,9 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb +dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4708-netgear-r6250.dtb \ + bcm4708-netgear-r6300-v2.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +84 -0
84 lines not on this page · raw message
Signature · 1 line
1.8.4.5
Hauke Mehrtens
maintainerPATCH 2/5 ARM: BCM5301X: Add DT for Netgear R6300 V2
Quoted 12 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>--- 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.dtsarch/arm/boot/dts/Makefile +0
-0
arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb · line 60
Quoted 7 lines
arch/arm/boot/dts/Makefile +3
-1@@ -55,7 +55,9 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb +dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4708-netgear-r6250.dtb \ + bcm4708-netgear-r6300-v2.dtb
This part does not apply cleanly on top of v3.18-rc1.
Quoted 9 lines
arch/arm/boot/dts/Makefile +0
-0dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +0
-0
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts line 5
Quoted 5 lines
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +5
-0@@ -0,0 +1,84 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R6300 V2 + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]>
Is this ? needed here?
Quoted 80 lines
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +79
-0+ * + * Licensed under the GNU/GPL. See COPYING for details. + */ + +/dts-v1/; + +#include "bcm4708.dtsi" + +/ { + compatible = "netgear,r6300v2", "brcm,bcm4708"; + model = "Netgear R6300 V2 (BCM4708)"; + + chosen { + bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + + leds { + compatible = "gpio-leds"; + + logo { + label = "bcm53xx:white:logo"; + gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-on"; + }; + + power0 { + label = "bcm53xx:green:power"; + gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-off"; + }; + + power1 { + label = "bcm53xx:amber:power"; + gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-on"; + }; + + usb { + label = "bcm53xx:blue:usb"; + gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-off"; + }; + + wireless { + label = "bcm53xx:blue:wireless"; + gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-off"; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; + + wps { + label = "WPS"; + linux,code = <KEY_WPS_BUTTON>; + gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>; + }; + + rfkill { + label = "WiFi"; + linux,code = <KEY_RFKILL>; + gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>; + }; + + restart { + label = "Reset"; + linux,code = <KEY_RESTART>; + gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>; + }; + }; +};
Rafał Miłecki
maintainerPATCH 2/5 ARM: BCM5301X: Add DT for Netgear R6300 V2
Quoted 8 lines · Hauke Mehrtens
Quoted 7 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>--- 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
Quoted 14 lines
arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb · line 60
Quoted 12 lines
arch/arm/boot/dts/Makefile +3
-1@@ -55,7 +55,9 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb +dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4708-netgear-r6250.dtb \ + bcm4708-netgear-r6300-v2.dtbThis part does not apply cleanly on top of v3.18-rc1.
I think we want these changes to be merged merged into the arm-soc.git next/dt, right? So I based my changes on that tree. This way Arnd won't get neither: any conflicts or any unwanted stuff.
Quoted 8 lines
Quoted 8 lines
arch/arm/boot/dts/Makefile +0
-0dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +0
-0
Quoted 8 lines
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts line 5
Quoted 6 lines
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +5
-0@@ -0,0 +1,84 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R6300 V2 + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]>Is this ? needed here?
Do you mean the whole line or the "?" sign? I think we usually have "Copyright" lines in files. I can see using "?" is much less common on the other hand. I think the most common forms are
1) Copyright (C) <year>
2) Copyright <year>
Should I use some of them?
Btw. do you know if this documented anywhere?
Hauke Mehrtens
maintainerPATCH 2/5 ARM: BCM5301X: Add DT for Netgear R6300 V2
Quoted 24 lines · Rafa? Mi?ecki
Quoted 8 lines · Hauke Mehrtens
Quoted 7 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>--- 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.dtsQuoted 14 lines
arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb · line 60
Quoted 12 lines
arch/arm/boot/dts/Makefile +3
-1@@ -55,7 +55,9 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb +dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4708-netgear-r6250.dtb \ + bcm4708-netgear-r6300-v2.dtbThis part does not apply cleanly on top of v3.18-rc1.
Quoted 3 lines
I think we want these changes to be merged merged into the arm-soc.git next/dt, right? So I based my changes on that tree. This way Arnd won't get neither: any conflicts or any unwanted stuff.
Arnd wants the changes based on -rc1, at least the last time. ;-) The merge gets ugly if the changes are based on different versions.
Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/boot/dts/Makefile +0
-0dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +0
-0Quoted 8 lines
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts line 5
Quoted 6 lines
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +5
-0@@ -0,0 +1,84 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R6300 V2 + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]>Is this ? needed here?
Quoted 8 lines
Do you mean the whole line or the "?" sign? I think we usually have "Copyright" lines in files. I can see using "?" is much less common on the other hand. I think the most common forms are
1) Copyright (C) <year>
2) Copyright <year>
Should I use some of them?
Btw. do you know if this documented anywhere?
It was just the "?" sign, it's usage is pretty uncommon and I think it is not an ASCII symbol. I would like if you choose 1 or 2, what exactly does not matter for me.
Hauke
Hauke
Arnd Bergmann
maintainerPATCH 2/5 ARM: BCM5301X: Add DT for Netgear R6300 V2
Quoted 25 lines · On Wednesday 03 December 2014 09:40:40 Hauke Mehrtens wrote:
Quoted 24 lines · Rafa? Mi?ecki
Quoted 22 lines · Hauke Mehrtens
Quoted 12 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>--- 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.dtsarch/arm/boot/dts/Makefile +0
-0arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb · line 60
Quoted 7 lines
arch/arm/boot/dts/Makefile +3
-1@@ -55,7 +55,9 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb +dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4708-netgear-r6250.dtb \ + bcm4708-netgear-r6300-v2.dtbThis part does not apply cleanly on top of v3.18-rc1.
Quoted 6 lines
Quoted 3 lines
I think we want these changes to be merged merged into the arm-soc.git next/dt, right? So I based my changes on that tree. This way Arnd won't get neither: any conflicts or any unwanted stuff.
Arnd wants the changes based on -rc1, at least the last time. The merge gets ugly if the changes are based on different versions.
If you send multiple pull requests for the same release and the same topic branch (e.g. next/dt), you can choose to base on top of -rc1 or a prior branch as you like.
You can also have a cleanup branch based on -rc1 that you send first, and then send other patches based on top of that. This makes sense in particular when you have patches for multiple branches (e.g. next/soc and next/drivers) but also want to restructure your code to make it easier to apply those.
Any patches for next/cleanup should be cosmetic only and rearrange stuff but not do functional changes.
Quoted 25 lines
Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/boot/dts/Makefile +0
-0dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +0
-0Quoted 8 lines
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts line 5
Quoted 6 lines
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +5
-0@@ -0,0 +1,84 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R6300 V2 + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]>Is this ? needed here?
Quoted 8 lines
Do you mean the whole line or the "?" sign? I think we usually have "Copyright" lines in files. I can see using "?" is much less common on the other hand. I think the most common forms are
1) Copyright (C) <year>
2) Copyright <year>
Should I use some of them?
Btw. do you know if this documented anywhere?
Quoted 3 lines
It was just the "?" sign, it's usage is pretty uncommon and I think it is not an ASCII symbol. I would like if you choose 1 or 2, what exactly does not matter for me.
If you work for a large company, ask your legal department, they may have a strong opinion on this matter one way or another. If you don't work for a large company, don't worry about it.
Arnd
Rafał Miłecki
maintainerPATCH v2 2/5 ARM: BCM5301X: Add DT for Netgear R6300 V2
In reply to Rafał Miłecki---
V2: Use (C) instad of UTF ?
--- 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
arch/arm/boot/dts/Makefile +3 -1
@@ -55,7 +55,9 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb +dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4708-netgear-r6250.dtb \ + bcm4708-netgear-r6300-v2.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts new file +84 -0
84 lines not on this page · raw message
Signature · 1 line
1.8.4.5
Rafał Miłecki
maintainerPATCH 3/5 ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP
In reply to Rafał Miłecki--- arch/arm/boot/dts/Makefile | 1 + 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
arch/arm/boot/dts/Makefile +1 -0
@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ bcm4708-netgear-r6300-v2.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
1.8.4.5
Rafał Miłecki
maintainerPATCH v2 3/5 ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP
---
V2: Use (C) instad of UTF ?
--- arch/arm/boot/dts/Makefile | 1 + 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
arch/arm/boot/dts/Makefile +1 -0
@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ bcm4708-netgear-r6300-v2.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
1.8.4.5
Rafał Miłecki
maintainerPATCH 4/5 ARM: BCM5301X: Add DT for Asus RT-N18U
In reply to Rafał Miłecki--- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 78 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm47081.dtsi | 26 ++++++++++ arch/arm/mach-bcm/bcm_5301x.c | 1 + 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts create mode 100644 arch/arm/boot/dts/bcm47081.dtsi
arch/arm/boot/dts/Makefile +2 -1
@@ -58,7 +58,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ - bcm4708-netgear-r6300-v2.dtb + bcm4708-netgear-r6300-v2.dtb \ + bcm47081-asus-rt-n18u.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +78 -0
78 lines not on this page · raw message
arch/arm/boot/dts/bcm47081.dtsi new file +26 -0
@@ -0,0 +1,26 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for BCM47081 SoC. + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]> + * + * Licensed under the GNU/GPL. See COPYING for details. + */ + +#include "bcm5301x.dtsi" + +/ { + compatible = "brcm,bcm47081"; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + next-level-cache = <&L2>; + reg = <0x0>; + }; + }; +};
arch/arm/mach-bcm/bcm_5301x.c +1 -0
@@ -45,6 +45,7 @@ static void __init bcm5301x_init_early(void)static const char __initconst *bcm5301x_dt_compat[] = {"brcm,bcm4708" , +"brcm,bcm47081" ,NULL , };
Signature · 1 line
1.8.4.5
Hauke Mehrtens
maintainerPATCH 4/5 ARM: BCM5301X: Add DT for Asus RT-N18U
Quoted 35 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>--- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 78 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm47081.dtsi | 26 ++++++++++ arch/arm/mach-bcm/bcm_5301x.c | 1 + 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts create mode 100644 arch/arm/boot/dts/bcm47081.dtsiarch/arm/boot/dts/Makefile +2
-1@@ -58,7 +58,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ - bcm4708-netgear-r6300-v2.dtb + bcm4708-netgear-r6300-v2.dtb \ + bcm47081-asus-rt-n18u.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +5
-0@@ -0,0 +1,78 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-N18U + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]>
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts line 15
Quoted 10 lines
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +10
-0+ * + * Licensed under the GNU/GPL. See COPYING for details. + */ + +/dts-v1/; + +#include "bcm47081.dtsi" + +/ { + compatible = "asus,rt-n18u", "brcm,bcm47081";
Instead of adding bcm47081 to the core code you can do this:
compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
If we later need some special handling for bcm47081 we can add this but the old dts file will still work. This is more relevant if the dts file is in the boot loader.
arch/arm/boot/dts/bcm47081.dtsi
Quoted 68 lines
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +63
-0+ model = "Asus RT-N18U (BCM47081)"; + + chosen { + bootargs = "console=ttyS0,115200"; + }; + + memory { + reg = <0x00000000 0x08000000>; + }; + + leds { + compatible = "gpio-leds"; + + power { + label = "bcm53xx:blue:power"; + gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-on"; + }; + + usb2 { + label = "bcm53xx:blue:usb2"; + gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-off"; + }; + + wan { + label = "bcm53xx:blue:wan"; + gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-on"; + }; + + lan { + label = "bcm53xx:blue:lan"; + gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-on"; + }; + + usb3 { + label = "bcm53xx:blue:usb3"; + gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-off"; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <200>; + + restart { + label = "Reset"; + linux,code = <KEY_RESTART>; + gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>; + }; + + wps { + label = "WPS"; + linux,code = <KEY_WPS_BUTTON>; + gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>; + }; + }; +};arch/arm/boot/dts/bcm47081.dtsi new file +0
-0
This is ok.
Quoted 40 lines
arch/arm/boot/dts/bcm47081.dtsi new file +26
-0@@ -0,0 +1,26 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for BCM47081 SoC. + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]> + * + * Licensed under the GNU/GPL. See COPYING for details. + */ + +#include "bcm5301x.dtsi" + +/ { + compatible = "brcm,bcm47081"; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + next-level-cache = <&L2>; + reg = <0x0>; + }; + }; +};arch/arm/mach-bcm/bcm_5301x.c +1
-0@@ -45,6 +45,7 @@ static void __init bcm5301x_init_early(void)static const char __initconst *bcm5301x_dt_compat[] = {"brcm,bcm4708" , +"brcm,bcm47081" ,NULL , };
Rafał Miłecki
maintainerPATCH 4/5 ARM: BCM5301X: Add DT for Asus RT-N18U
Quoted 49 lines · Hauke Mehrtens
Quoted 35 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>--- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 78 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm47081.dtsi | 26 ++++++++++ arch/arm/mach-bcm/bcm_5301x.c | 1 + 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts create mode 100644 arch/arm/boot/dts/bcm47081.dtsiarch/arm/boot/dts/Makefile +2
-1@@ -58,7 +58,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ - bcm4708-netgear-r6300-v2.dtb + bcm4708-netgear-r6300-v2.dtb \ + bcm47081-asus-rt-n18u.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +5
-0@@ -0,0 +1,78 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-N18U + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]>arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts line 15
Quoted 10 lines
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +10
-0+ * + * Licensed under the GNU/GPL. See COPYING for details. + */ + +/dts-v1/; + +#include "bcm47081.dtsi" + +/ { + compatible = "asus,rt-n18u", "brcm,bcm47081";Instead of adding bcm47081 to the core code you can do this:
Quoted 5 lines
compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
If we later need some special handling for bcm47081 we can add this but the old dts file will still work. This is more relevant if the dts file is in the boot loader.
I don't get it. How should I detect there is no second CPU?
Rafał Miłecki
maintainerPATCH 4/5 ARM: BCM5301X: Add DT for Asus RT-N18U
Quoted 50 lines · Rafa? Mi?ecki
Quoted 49 lines · Hauke Mehrtens
Quoted 35 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>--- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 78 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm47081.dtsi | 26 ++++++++++ arch/arm/mach-bcm/bcm_5301x.c | 1 + 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts create mode 100644 arch/arm/boot/dts/bcm47081.dtsiarch/arm/boot/dts/Makefile +2
-1@@ -58,7 +58,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ - bcm4708-netgear-r6300-v2.dtb + bcm4708-netgear-r6300-v2.dtb \ + bcm47081-asus-rt-n18u.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +5
-0@@ -0,0 +1,78 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-N18U + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]>arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts line 15
Quoted 10 lines
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +10
-0+ * + * Licensed under the GNU/GPL. See COPYING for details. + */ + +/dts-v1/; + +#include "bcm47081.dtsi" + +/ { + compatible = "asus,rt-n18u", "brcm,bcm47081";Instead of adding bcm47081 to the core code you can do this:
Quoted 7 lines
Quoted 5 lines
compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
If we later need some special handling for bcm47081 we can add this but the old dts file will still work. This is more relevant if the dts file is in the boot loader.
I don't get it. How should I detect there is no second CPU?
Or did you mean using fact that currently we don't boot the second CPU? I don't think we can do that. We should describe the hardware, not drivers/arch capabilities. We shouldn't change DTS after adding support for boooting 2nd CPU core.
Signature · 1 line
Rafa?
PATCH 4/5 ARM: BCM5301X: Add DT for Asus RT-N18U
Hello Rafa?,
Quoted 13 lines · Rafa? Mi?ecki
Quoted 12 lines · Rafa? Mi?ecki
Quoted 10 lines · Hauke Mehrtens
Quoted 1 line · Rafa? Mi?ecki
+ compatible = "asus,rt-n18u", "brcm,bcm47081";
Instead of adding bcm47081 to the core code you can do this:
compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
If we later need some special handling for bcm47081 we can add this but the old dts file will still work. This is more relevant if the dts file is in the boot loader.
Quoted 6 lines
Quoted 1 line
I don't get it. How should I detect there is no second CPU?
Or did you mean using fact that currently we don't boot the second CPU? I don't think we can do that. We should describe the hardware, not
drivers/archcapabilities. We shouldn't change DTS after adding support for boooting 2nd CPU core.
Adding brcm,bcm4708 to the list of compatibles doesn't imply that there is a 2nd cpu. The semantic is:
if (kernel_knows_how_to_handle(asus,rt-n18u)) handle(as=asus,rt-n18u); else if (kernel_knows_how_to_handle(brcm,bcm47081)) handle(as=brcm,bcm47081); else if (kernel_knows_how_to_handle(brcm,bcm4708)) handle(as=brcm,bcm4708);
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Hauke Mehrtens
maintainerPATCH 4/5 ARM: BCM5301X: Add DT for Asus RT-N18U
In reply to Rafał MiłeckiQuoted 50 lines · Rafa? Mi?ecki
Quoted 49 lines · Hauke Mehrtens
Quoted 35 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>--- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 78 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm47081.dtsi | 26 ++++++++++ arch/arm/mach-bcm/bcm_5301x.c | 1 + 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts create mode 100644 arch/arm/boot/dts/bcm47081.dtsiarch/arm/boot/dts/Makefile +2
-1@@ -58,7 +58,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ - bcm4708-netgear-r6300-v2.dtb + bcm4708-netgear-r6300-v2.dtb \ + bcm47081-asus-rt-n18u.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +5
-0@@ -0,0 +1,78 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-N18U + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]>arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts line 15
Quoted 10 lines
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +10
-0+ * + * Licensed under the GNU/GPL. See COPYING for details. + */ + +/dts-v1/; + +#include "bcm47081.dtsi" + +/ { + compatible = "asus,rt-n18u", "brcm,bcm47081";Instead of adding bcm47081 to the core code you can do this:
Quoted 7 lines
Quoted 5 lines
compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
If we later need some special handling for bcm47081 we can add this but the old dts file will still work. This is more relevant if the dts file is in the boot loader.
I don't get it. How should I detect there is no second CPU?
In the SMP code we would check if (num CPUs > 1 ) then boot up other CPUs end;
This num CPUs is fetched from the dts file and it would be checked if that number is equal or smaller than some number in some register which should contain the number of CPUs. We still need the stuff in the bcm47081.dtsi file.
If you add a dts file for a device with a BCM4709 or some other SoC not being BCM4708, you should use a similar compatible string.
Hauke
Rafał Miłecki
maintainerPATCH 4/5 ARM: BCM5301X: Add DT for Asus RT-N18U
In reply to Rafał MiłeckiQuoted 50 lines · Rafa? Mi?ecki
Quoted 49 lines · Hauke Mehrtens
Quoted 35 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>--- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 78 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm47081.dtsi | 26 ++++++++++ arch/arm/mach-bcm/bcm_5301x.c | 1 + 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts create mode 100644 arch/arm/boot/dts/bcm47081.dtsiarch/arm/boot/dts/Makefile +2
-1@@ -58,7 +58,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ - bcm4708-netgear-r6300-v2.dtb + bcm4708-netgear-r6300-v2.dtb \ + bcm47081-asus-rt-n18u.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +5
-0@@ -0,0 +1,78 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-N18U + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]>arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts line 15
Quoted 10 lines
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +10
-0+ * + * Licensed under the GNU/GPL. See COPYING for details. + */ + +/dts-v1/; + +#include "bcm47081.dtsi" + +/ { + compatible = "asus,rt-n18u", "brcm,bcm47081";Instead of adding bcm47081 to the core code you can do this:
Quoted 7 lines
Quoted 5 lines
compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
If we later need some special handling for bcm47081 we can add this but the old dts file will still work. This is more relevant if the dts file is in the boot loader.
I don't get it. How should I detect there is no second CPU?
Aaaah, you meant not adding *core code*, not the DTS file. I didn't notice that in the first place. Now it's clear, thanks!
Signature · 1 line
Rafa?
Rafał Miłecki
maintainerPATCH v2 4/5 ARM: BCM5301X: Add DT for Asus RT-N18U
In reply to Rafał Miłecki---
V2: Use (C) instad of UTF ?
Use "brcm,bcm4708" compatibility after "brcm,bcm47081" --- arch/arm/boot/dts/Makefile | 3 +- 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
arch/arm/boot/dts/Makefile +2 -1
@@ -58,7 +58,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ - bcm4708-netgear-r6300-v2.dtb + bcm4708-netgear-r6300-v2.dtb \ + bcm47081-asus-rt-n18u.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts new file +78 -0
78 lines not on this page · raw message
arch/arm/boot/dts/bcm47081.dtsi new file +26 -0
@@ -0,0 +1,26 @@ +/* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for BCM47081 SoC. + * + * Copyright ? 2014 Rafa? Mi?ecki <[email protected]> + * + * Licensed under the GNU/GPL. See COPYING for details. + */ + +#include "bcm5301x.dtsi" + +/ { + compatible = "brcm,bcm47081"; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + next-level-cache = <&L2>; + reg = <0x0>; + }; + }; +};
Signature · 1 line
1.8.4.5
Rafał Miłecki
maintainerPATCH 5/5 ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2
In reply to Rafał Miłecki--- arch/arm/boot/dts/Makefile | 3 +- 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
arch/arm/boot/dts/Makefile +2 -1
@@ -59,7 +59,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ bcm4708-netgear-r6300-v2.dtb \ - bcm47081-asus-rt-n18u.dtb + bcm47081-asus-rt-n18u.dtb \ + bcm47081-buffalo-wzr-600dhp2.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
1.8.4.5
Rafał Miłecki
maintainerPATCH v2 5/5 ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2
---
V2: Use (C) instad of UTF ?
Use "brcm,bcm4708" compatibility after "brcm,bcm47081" --- arch/arm/boot/dts/Makefile | 3 +- 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
arch/arm/boot/dts/Makefile +2 -1
@@ -59,7 +59,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-netgear-r6250.dtb \ bcm4708-netgear-r6300-v2.dtb \ - bcm47081-asus-rt-n18u.dtb + bcm47081-asus-rt-n18u.dtb \ + bcm47081-buffalo-wzr-600dhp2.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ bcm911360k.dtb \
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
1.8.4.5