* [PATCH 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2
2014-11-30 17:28 [PATCH 1/5] ARM: BCM5301X: Add buttons for Netgear R6250 Rafał Miłecki
@ 2014-11-30 17:28 ` Rafał Miłecki
2014-12-02 23:15 ` Hauke Mehrtens
2014-12-04 9:22 ` [PATCH V2 " Rafał Miłecki
2014-11-30 17:28 ` [PATCH 3/5] ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP Rafał Miłecki
` (2 subsequent siblings)
3 siblings, 2 replies; 19+ messages in thread
From: Rafał Miłecki @ 2014-11-30 17:28 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 35f3e12..22bb87f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
new file mode 100644
index 0000000..e18b636
--- /dev/null
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@ -0,0 +1,84 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Netgear R6300 V2
+ *
+ * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * 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>;
+ };
+ };
+};
--
1.8.4.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2
2014-11-30 17:28 ` [PATCH 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2 Rafał Miłecki
@ 2014-12-02 23:15 ` Hauke Mehrtens
2014-12-03 5:59 ` Rafał Miłecki
2014-12-04 9:22 ` [PATCH V2 " Rafał Miłecki
1 sibling, 1 reply; 19+ messages in thread
From: Hauke Mehrtens @ 2014-12-02 23:15 UTC (permalink / raw)
To: linux-arm-kernel
On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
> ---
> 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
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 35f3e12..22bb87f 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -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.
> dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
> dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
> bcm911360k.dtb \
> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> new file mode 100644
> index 0000000..e18b636
> --- /dev/null
> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> @@ -0,0 +1,84 @@
> +/*
> + * Broadcom BCM470X / BCM5301X ARM platform code.
> + * DTS for Netgear R6300 V2
> + *
> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
Is this ? needed here?
> + *
> + * 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>;
> + };
> + };
> +};
>
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2
2014-12-02 23:15 ` Hauke Mehrtens
@ 2014-12-03 5:59 ` Rafał Miłecki
2014-12-03 8:40 ` Hauke Mehrtens
0 siblings, 1 reply; 19+ messages in thread
From: Rafał Miłecki @ 2014-12-03 5:59 UTC (permalink / raw)
To: linux-arm-kernel
On 3 December 2014 at 00:15, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
>> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
>> ---
>> 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
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 35f3e12..22bb87f 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -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.
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.
>> dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
>> dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
>> bcm911360k.dtb \
>> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
>> new file mode 100644
>> index 0000000..e18b636
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
>> @@ -0,0 +1,84 @@
>> +/*
>> + * Broadcom BCM470X / BCM5301X ARM platform code.
>> + * DTS for Netgear R6300 V2
>> + *
>> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
>
> 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?
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2
2014-12-03 5:59 ` Rafał Miłecki
@ 2014-12-03 8:40 ` Hauke Mehrtens
2014-12-03 10:25 ` Arnd Bergmann
0 siblings, 1 reply; 19+ messages in thread
From: Hauke Mehrtens @ 2014-12-03 8:40 UTC (permalink / raw)
To: linux-arm-kernel
On 12/03/2014 06:59 AM, Rafa? Mi?ecki wrote:
> On 3 December 2014 at 00:15, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
>>> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
>>> ---
>>> 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
>>>
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index 35f3e12..22bb87f 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -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.
>
> 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.
>>> dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
>>> dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
>>> bcm911360k.dtb \
>>> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
>>> new file mode 100644
>>> index 0000000..e18b636
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
>>> @@ -0,0 +1,84 @@
>>> +/*
>>> + * Broadcom BCM470X / BCM5301X ARM platform code.
>>> + * DTS for Netgear R6300 V2
>>> + *
>>> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
>>
>> 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?
>
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2
2014-12-03 8:40 ` Hauke Mehrtens
@ 2014-12-03 10:25 ` Arnd Bergmann
0 siblings, 0 replies; 19+ messages in thread
From: Arnd Bergmann @ 2014-12-03 10:25 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 03 December 2014 09:40:40 Hauke Mehrtens wrote:
> On 12/03/2014 06:59 AM, Rafa? Mi?ecki wrote:
> > On 3 December 2014 at 00:15, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> >> On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
> >>> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
> >>> ---
> >>> 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
> >>>
> >>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> >>> index 35f3e12..22bb87f 100644
> >>> --- a/arch/arm/boot/dts/Makefile
> >>> +++ b/arch/arm/boot/dts/Makefile
> >>> @@ -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.
> >
> > 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.
> >>> dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
> >>> dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
> >>> bcm911360k.dtb \
> >>> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> >>> new file mode 100644
> >>> index 0000000..e18b636
> >>> --- /dev/null
> >>> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> >>> @@ -0,0 +1,84 @@
> >>> +/*
> >>> + * Broadcom BCM470X / BCM5301X ARM platform code.
> >>> + * DTS for Netgear R6300 V2
> >>> + *
> >>> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> >>
> >> 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?
> >
> 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH V2 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2
2014-11-30 17:28 ` [PATCH 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2 Rafał Miłecki
2014-12-02 23:15 ` Hauke Mehrtens
@ 2014-12-04 9:22 ` Rafał Miłecki
1 sibling, 0 replies; 19+ messages in thread
From: Rafał Miłecki @ 2014-12-04 9:22 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 35f3e12..22bb87f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
new file mode 100644
index 0000000..12fc2a01
--- /dev/null
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@ -0,0 +1,84 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Netgear R6300 V2
+ *
+ * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * 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>;
+ };
+ };
+};
--
1.8.4.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 3/5] ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP
2014-11-30 17:28 [PATCH 1/5] ARM: BCM5301X: Add buttons for Netgear R6250 Rafał Miłecki
2014-11-30 17:28 ` [PATCH 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2 Rafał Miłecki
@ 2014-11-30 17:28 ` Rafał Miłecki
2014-12-04 9:22 ` [PATCH V2 " Rafał Miłecki
2014-11-30 17:28 ` [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U Rafał Miłecki
2014-11-30 17:28 ` [PATCH 5/5] ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2 Rafał Miłecki
3 siblings, 1 reply; 19+ messages in thread
From: Rafał Miłecki @ 2014-11-30 17:28 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 22bb87f..18a21d9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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
diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
new file mode 100644
index 0000000..6ad8779
--- /dev/null
+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
@@ -0,0 +1,64 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Buffalo WZR-1750DHP
+ *
+ * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+/dts-v1/;
+
+#include "bcm4708.dtsi"
+
+/ {
+ compatible = "buffalo,wzr-1750dhp", "brcm,bcm4708";
+ model = "Buffalo WZR-1750DHP (BCM4708)";
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ };
+
+ memory {
+ reg = <0x00000000 0x08000000>;
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <200>;
+
+ restart {
+ label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ };
+
+ aoss {
+ label = "AOSS";
+ linux,code = <KEY_WPS_BUTTON>;
+ gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
+ };
+
+ /* Commit mode set by switch? */
+ mode {
+ label = "Mode";
+ linux,code = <KEY_SETUP>;
+ gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+ };
+
+ /* Switch: AP mode */
+ sw_ap {
+ label = "AP";
+ linux,code = <BTN_0>;
+ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ };
+
+ eject {
+ label = "USB eject";
+ linux,code = <KEY_EJECTCD>;
+ gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
--
1.8.4.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH V2 3/5] ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP
2014-11-30 17:28 ` [PATCH 3/5] ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP Rafał Miłecki
@ 2014-12-04 9:22 ` Rafał Miłecki
0 siblings, 0 replies; 19+ messages in thread
From: Rafał Miłecki @ 2014-12-04 9:22 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 22bb87f..18a21d9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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
diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
new file mode 100644
index 0000000..5fc0fae
--- /dev/null
+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
@@ -0,0 +1,64 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Buffalo WZR-1750DHP
+ *
+ * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+/dts-v1/;
+
+#include "bcm4708.dtsi"
+
+/ {
+ compatible = "buffalo,wzr-1750dhp", "brcm,bcm4708";
+ model = "Buffalo WZR-1750DHP (BCM4708)";
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ };
+
+ memory {
+ reg = <0x00000000 0x08000000>;
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <200>;
+
+ restart {
+ label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ };
+
+ aoss {
+ label = "AOSS";
+ linux,code = <KEY_WPS_BUTTON>;
+ gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
+ };
+
+ /* Commit mode set by switch? */
+ mode {
+ label = "Mode";
+ linux,code = <KEY_SETUP>;
+ gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+ };
+
+ /* Switch: AP mode */
+ sw_ap {
+ label = "AP";
+ linux,code = <BTN_0>;
+ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ };
+
+ eject {
+ label = "USB eject";
+ linux,code = <KEY_EJECTCD>;
+ gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
--
1.8.4.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U
2014-11-30 17:28 [PATCH 1/5] ARM: BCM5301X: Add buttons for Netgear R6250 Rafał Miłecki
2014-11-30 17:28 ` [PATCH 2/5] ARM: BCM5301X: Add DT for Netgear R6300 V2 Rafał Miłecki
2014-11-30 17:28 ` [PATCH 3/5] ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP Rafał Miłecki
@ 2014-11-30 17:28 ` Rafał Miłecki
2014-12-02 23:19 ` Hauke Mehrtens
2014-12-04 9:23 ` [PATCH V2 " Rafał Miłecki
2014-11-30 17:28 ` [PATCH 5/5] ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2 Rafał Miłecki
3 siblings, 2 replies; 19+ messages in thread
From: Rafał Miłecki @ 2014-11-30 17:28 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 18a21d9..db51a31 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
new file mode 100644
index 0000000..c40ad39
--- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
@@ -0,0 +1,78 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Asus RT-N18U
+ *
+ * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+/dts-v1/;
+
+#include "bcm47081.dtsi"
+
+/ {
+ compatible = "asus,rt-n18u", "brcm,bcm47081";
+ 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>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/bcm47081.dtsi b/arch/arm/boot/dts/bcm47081.dtsi
new file mode 100644
index 0000000..f720012
--- /dev/null
+++ b/arch/arm/boot/dts/bcm47081.dtsi
@@ -0,0 +1,26 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for BCM47081 SoC.
+ *
+ * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * 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>;
+ };
+ };
+};
diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c
index e9bcbdb..eb487e1 100644
--- a/arch/arm/mach-bcm/bcm_5301x.c
+++ b/arch/arm/mach-bcm/bcm_5301x.c
@@ -45,6 +45,7 @@ static void __init bcm5301x_init_early(void)
static const char __initconst *bcm5301x_dt_compat[] = {
"brcm,bcm4708",
+ "brcm,bcm47081",
NULL,
};
--
1.8.4.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U
2014-11-30 17:28 ` [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U Rafał Miłecki
@ 2014-12-02 23:19 ` Hauke Mehrtens
2014-12-03 5:40 ` Rafał Miłecki
2014-12-04 9:23 ` [PATCH V2 " Rafał Miłecki
1 sibling, 1 reply; 19+ messages in thread
From: Hauke Mehrtens @ 2014-12-02 23:19 UTC (permalink / raw)
To: linux-arm-kernel
On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
> ---
> 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
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 18a21d9..db51a31 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -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 \
> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> new file mode 100644
> index 0000000..c40ad39
> --- /dev/null
> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> @@ -0,0 +1,78 @@
> +/*
> + * Broadcom BCM470X / BCM5301X ARM platform code.
> + * DTS for Asus RT-N18U
> + *
> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> + *
> + * 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.
> + 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>;
> + };
> + };
> +};
> diff --git a/arch/arm/boot/dts/bcm47081.dtsi b/arch/arm/boot/dts/bcm47081.dtsi
> new file mode 100644
> index 0000000..f720012
> --- /dev/null
> +++ b/arch/arm/boot/dts/bcm47081.dtsi
This is ok.
> @@ -0,0 +1,26 @@
> +/*
> + * Broadcom BCM470X / BCM5301X ARM platform code.
> + * DTS for BCM47081 SoC.
> + *
> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> + *
> + * 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>;
> + };
> + };
> +};
> diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c
> index e9bcbdb..eb487e1 100644
> --- a/arch/arm/mach-bcm/bcm_5301x.c
> +++ b/arch/arm/mach-bcm/bcm_5301x.c
> @@ -45,6 +45,7 @@ static void __init bcm5301x_init_early(void)
>
> static const char __initconst *bcm5301x_dt_compat[] = {
> "brcm,bcm4708",
> + "brcm,bcm47081",
> NULL,
> };
>
>
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U
2014-12-02 23:19 ` Hauke Mehrtens
@ 2014-12-03 5:40 ` Rafał Miłecki
2014-12-03 6:01 ` Rafał Miłecki
` (2 more replies)
0 siblings, 3 replies; 19+ messages in thread
From: Rafał Miłecki @ 2014-12-03 5:40 UTC (permalink / raw)
To: linux-arm-kernel
On 3 December 2014 at 00:19, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
>> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
>> ---
>> 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
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 18a21d9..db51a31 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -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 \
>> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
>> new file mode 100644
>> index 0000000..c40ad39
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
>> @@ -0,0 +1,78 @@
>> +/*
>> + * Broadcom BCM470X / BCM5301X ARM platform code.
>> + * DTS for Asus RT-N18U
>> + *
>> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
>> + *
>> + * 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.
I don't get it. How should I detect there is no second CPU?
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U
2014-12-03 5:40 ` Rafał Miłecki
@ 2014-12-03 6:01 ` Rafał Miłecki
2014-12-03 7:50 ` Uwe Kleine-König
2014-12-03 8:34 ` Hauke Mehrtens
2014-12-04 9:12 ` Rafał Miłecki
2 siblings, 1 reply; 19+ messages in thread
From: Rafał Miłecki @ 2014-12-03 6:01 UTC (permalink / raw)
To: linux-arm-kernel
On 3 December 2014 at 06:40, Rafa? Mi?ecki <zajec5@gmail.com> wrote:
> On 3 December 2014 at 00:19, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
>>> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
>>> ---
>>> 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
>>>
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index 18a21d9..db51a31 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -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 \
>>> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
>>> new file mode 100644
>>> index 0000000..c40ad39
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
>>> @@ -0,0 +1,78 @@
>>> +/*
>>> + * Broadcom BCM470X / BCM5301X ARM platform code.
>>> + * DTS for Asus RT-N18U
>>> + *
>>> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
>>> + *
>>> + * 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.
>
> 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.
--
Rafa?
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U
2014-12-03 6:01 ` Rafał Miłecki
@ 2014-12-03 7:50 ` Uwe Kleine-König
0 siblings, 0 replies; 19+ messages in thread
From: Uwe Kleine-König @ 2014-12-03 7:50 UTC (permalink / raw)
To: linux-arm-kernel
Hello Rafa?,
On Wed, Dec 03, 2014 at 07:01:42AM +0100, Rafa? Mi?ecki wrote:
> On 3 December 2014 at 06:40, Rafa? Mi?ecki <zajec5@gmail.com> wrote:
> > On 3 December 2014 at 00:19, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> >> On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
> >>> + 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.
> >
> > 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.
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
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U
2014-12-03 5:40 ` Rafał Miłecki
2014-12-03 6:01 ` Rafał Miłecki
@ 2014-12-03 8:34 ` Hauke Mehrtens
2014-12-04 9:12 ` Rafał Miłecki
2 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-12-03 8:34 UTC (permalink / raw)
To: linux-arm-kernel
On 12/03/2014 06:40 AM, Rafa? Mi?ecki wrote:
> On 3 December 2014 at 00:19, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
>>> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
>>> ---
>>> 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
>>>
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index 18a21d9..db51a31 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -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 \
>>> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
>>> new file mode 100644
>>> index 0000000..c40ad39
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
>>> @@ -0,0 +1,78 @@
>>> +/*
>>> + * Broadcom BCM470X / BCM5301X ARM platform code.
>>> + * DTS for Asus RT-N18U
>>> + *
>>> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
>>> + *
>>> + * 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.
>
> 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
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U
2014-12-03 5:40 ` Rafał Miłecki
2014-12-03 6:01 ` Rafał Miłecki
2014-12-03 8:34 ` Hauke Mehrtens
@ 2014-12-04 9:12 ` Rafał Miłecki
2 siblings, 0 replies; 19+ messages in thread
From: Rafał Miłecki @ 2014-12-04 9:12 UTC (permalink / raw)
To: linux-arm-kernel
On 3 December 2014 at 06:40, Rafa? Mi?ecki <zajec5@gmail.com> wrote:
> On 3 December 2014 at 00:19, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> On 11/30/2014 06:28 PM, Rafa? Mi?ecki wrote:
>>> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
>>> ---
>>> 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
>>>
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index 18a21d9..db51a31 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -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 \
>>> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
>>> new file mode 100644
>>> index 0000000..c40ad39
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
>>> @@ -0,0 +1,78 @@
>>> +/*
>>> + * Broadcom BCM470X / BCM5301X ARM platform code.
>>> + * DTS for Asus RT-N18U
>>> + *
>>> + * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
>>> + *
>>> + * 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.
>
> 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!
--
Rafa?
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH V2 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U
2014-11-30 17:28 ` [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U Rafał Miłecki
2014-12-02 23:19 ` Hauke Mehrtens
@ 2014-12-04 9:23 ` Rafał Miłecki
1 sibling, 0 replies; 19+ messages in thread
From: Rafał Miłecki @ 2014-12-04 9:23 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 18a21d9..db51a31 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
new file mode 100644
index 0000000..fb76378
--- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
@@ -0,0 +1,78 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Asus RT-N18U
+ *
+ * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+/dts-v1/;
+
+#include "bcm47081.dtsi"
+
+/ {
+ compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
+ 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>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/bcm47081.dtsi b/arch/arm/boot/dts/bcm47081.dtsi
new file mode 100644
index 0000000..f720012
--- /dev/null
+++ b/arch/arm/boot/dts/bcm47081.dtsi
@@ -0,0 +1,26 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for BCM47081 SoC.
+ *
+ * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * 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>;
+ };
+ };
+};
--
1.8.4.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 5/5] ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2
2014-11-30 17:28 [PATCH 1/5] ARM: BCM5301X: Add buttons for Netgear R6250 Rafał Miłecki
` (2 preceding siblings ...)
2014-11-30 17:28 ` [PATCH 4/5] ARM: BCM5301X: Add DT for Asus RT-N18U Rafał Miłecki
@ 2014-11-30 17:28 ` Rafał Miłecki
2014-12-04 9:24 ` [PATCH V2 " Rafał Miłecki
3 siblings, 1 reply; 19+ messages in thread
From: Rafał Miłecki @ 2014-11-30 17:28 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index db51a31..9400e94 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
new file mode 100644
index 0000000..1e64d11
--- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
@@ -0,0 +1,57 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Buffalo WZR-600DHP2
+ *
+ * Copyright ? 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+/dts-v1/;
+
+#include "bcm47081.dtsi"
+
+/ {
+ compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081";
+ model = "Buffalo WZR-600DHP2 (BCM47081)";
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ };
+
+ memory {
+ reg = <0x00000000 0x08000000>;
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <200>;
+
+ aoss {
+ label = "AOSS";
+ linux,code = <KEY_WPS_BUTTON>;
+ gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
+ };
+
+ restart {
+ label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ };
+
+ /* Switch device mode? */
+ mode {
+ label = "Mode";
+ linux,code = <KEY_SETUP>;
+ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ };
+
+ eject {
+ label = "USB eject";
+ linux,code = <KEY_EJECTCD>;
+ gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
--
1.8.4.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH V2 5/5] ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2
2014-11-30 17:28 ` [PATCH 5/5] ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2 Rafał Miłecki
@ 2014-12-04 9:24 ` Rafał Miłecki
0 siblings, 0 replies; 19+ messages in thread
From: Rafał Miłecki @ 2014-12-04 9:24 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index db51a31..9400e94 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
new file mode 100644
index 0000000..bbb414f
--- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
@@ -0,0 +1,57 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Buffalo WZR-600DHP2
+ *
+ * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+/dts-v1/;
+
+#include "bcm47081.dtsi"
+
+/ {
+ compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081", "brcm,bcm4708";
+ model = "Buffalo WZR-600DHP2 (BCM47081)";
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ };
+
+ memory {
+ reg = <0x00000000 0x08000000>;
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <200>;
+
+ aoss {
+ label = "AOSS";
+ linux,code = <KEY_WPS_BUTTON>;
+ gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
+ };
+
+ restart {
+ label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ };
+
+ /* Switch device mode? */
+ mode {
+ label = "Mode";
+ linux,code = <KEY_SETUP>;
+ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ };
+
+ eject {
+ label = "USB eject";
+ linux,code = <KEY_EJECTCD>;
+ gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
--
1.8.4.5
^ permalink raw reply related [flat|nested] 19+ messages in thread