* [PATCH v2 2/6] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts
2020-07-22 19:09 [PATCH v2 1/6] dt-bindings: arm: rockchip: Update ROCKPi 4 with 4A binding Jagan Teki
@ 2020-07-22 19:09 ` Jagan Teki
2020-07-22 19:09 ` [PATCH v2 3/6] dt-bindings: arm: rockchip: Add ROCKPi 4B binding Jagan Teki
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Jagan Teki @ 2020-07-22 19:09 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring
Cc: devicetree, linux-kernel, linux-rockchip, Jagan Teki,
Suniel Mahesh, Michael Trimarchi, linux-amarula,
linux-arm-kernel
ROCKPi 4 has 3 variants of hardware platforms called
RockPI 4A, 4B, and 4C.
- ROCKPi 4A has no Wif/BT.
- ROCKPi 4B has AP6256 Wifi/BT, PoE.
- ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled
GPIO pin change compared to 4B, 4C
So move common nodes, properties into dtsi file and include
on respective variant dts files.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- update commit message
- add radxa,rockpi4a
arch/arm64/boot/dts/rockchip/Makefile | 2 +-
.../{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 3 ---
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 13 +++++++++++++
3 files changed, 14 insertions(+), 4 deletions(-)
rename arch/arm64/boot/dts/rockchip/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (99%)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 2ab77206699b..1250c62205a4 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -35,7 +35,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
similarity index 99%
rename from arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
rename to arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index 60f98a3e19d8..e163f438f836 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -11,9 +11,6 @@
#include "rk3399-opp.dtsi"
/ {
- model = "Radxa ROCK Pi 4";
- compatible = "radxa,rockpi4", "rockchip,rk3399";
-
chosen {
stdout-path = "serial2:1500000n8";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
new file mode 100644
index 000000000000..89f2af5e111d
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
+ * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
+ */
+
+/dts-v1/;
+#include "rk3399-rock-pi-4.dtsi"
+
+/ {
+ model = "Radxa ROCK Pi 4A";
+ compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399";
+};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 3/6] dt-bindings: arm: rockchip: Add ROCKPi 4B binding
2020-07-22 19:09 [PATCH v2 1/6] dt-bindings: arm: rockchip: Update ROCKPi 4 with 4A binding Jagan Teki
2020-07-22 19:09 ` [PATCH v2 2/6] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts Jagan Teki
@ 2020-07-22 19:09 ` Jagan Teki
2020-07-22 23:13 ` Heiko Stuebner
2020-07-22 19:09 ` [PATCH v2 4/6] arm64: dts: rockchip: Add Radxa ROCK Pi 4B support Jagan Teki
` (3 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Jagan Teki @ 2020-07-22 19:09 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring
Cc: devicetree, linux-kernel, linux-rockchip, Jagan Teki,
Suniel Mahesh, Michael Trimarchi, linux-amarula,
linux-arm-kernel
Add dt-bindings for ROCKPi 4B which is similar to 4A with
additional AP6256 Wifi/BT, PoE.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- new patch
Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 36057c9e4b83..7250adb43d24 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -448,6 +448,12 @@ properties:
- const: radxa,rockpi4a
- const: rockchip,rk3399
+ - description: Radxa ROCK Pi 4B
+ items:
+ - const: radxa,rockpi4
+ - const: radxa,rockpi4b
+ - const: rockchip,rk3399
+
- description: Radxa ROCK Pi N8
items:
- const: radxa,rockpi-n8
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2 3/6] dt-bindings: arm: rockchip: Add ROCKPi 4B binding
2020-07-22 19:09 ` [PATCH v2 3/6] dt-bindings: arm: rockchip: Add ROCKPi 4B binding Jagan Teki
@ 2020-07-22 23:13 ` Heiko Stuebner
2020-07-23 6:34 ` Jagan Teki
0 siblings, 1 reply; 10+ messages in thread
From: Heiko Stuebner @ 2020-07-22 23:13 UTC (permalink / raw)
To: Jagan Teki
Cc: devicetree, linux-kernel, linux-rockchip, Rob Herring,
Suniel Mahesh, Michael Trimarchi, linux-amarula,
linux-arm-kernel
Hi Jagan,
Am Mittwoch, 22. Juli 2020, 21:09:46 CEST schrieb Jagan Teki:
> Add dt-bindings for ROCKPi 4B which is similar to 4A with
> additional AP6256 Wifi/BT, PoE.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v2:
> - new patch
>
> Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> index 36057c9e4b83..7250adb43d24 100644
> --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> @@ -448,6 +448,12 @@ properties:
> - const: radxa,rockpi4a
> - const: rockchip,rk3399
>
> + - description: Radxa ROCK Pi 4B
> + items:
> + - const: radxa,rockpi4
> + - const: radxa,rockpi4b
> + - const: rockchip,rk3399
> +
Please do all RockPi4 variants into one entry, so we want something like:
- description: Radxa ROCK Pi 4
items:
- enum:
- radxa,rockpi4a
- radxa,rockpi4b
- radxa,rockpi4c
- const: radxa,rockpi4
- const: rockchip,rk3399
And as the {a,b,c} variant is the most specific it also should be the
first entry, not the second.
Heiko
> - description: Radxa ROCK Pi N8
> items:
> - const: radxa,rockpi-n8
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 3/6] dt-bindings: arm: rockchip: Add ROCKPi 4B binding
2020-07-22 23:13 ` Heiko Stuebner
@ 2020-07-23 6:34 ` Jagan Teki
2020-07-23 8:27 ` Heiko Stübner
0 siblings, 1 reply; 10+ messages in thread
From: Jagan Teki @ 2020-07-23 6:34 UTC (permalink / raw)
To: Heiko Stuebner
Cc: devicetree, linux-kernel, open list:ARM/Rockchip SoC...,
Rob Herring, Suniel Mahesh, Michael Trimarchi, linux-amarula,
linux-arm-kernel
Hi Heiko,
On Thu, Jul 23, 2020 at 4:43 AM Heiko Stuebner <heiko@sntech.de> wrote:
>
> Hi Jagan,
>
> Am Mittwoch, 22. Juli 2020, 21:09:46 CEST schrieb Jagan Teki:
> > Add dt-bindings for ROCKPi 4B which is similar to 4A with
> > additional AP6256 Wifi/BT, PoE.
> >
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > ---
> > Changes for v2:
> > - new patch
> >
> > Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > index 36057c9e4b83..7250adb43d24 100644
> > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > @@ -448,6 +448,12 @@ properties:
> > - const: radxa,rockpi4a
> > - const: rockchip,rk3399
> >
> > + - description: Radxa ROCK Pi 4B
> > + items:
> > + - const: radxa,rockpi4
> > + - const: radxa,rockpi4b
> > + - const: rockchip,rk3399
> > +
>
> Please do all RockPi4 variants into one entry, so we want something like:
>
> - description: Radxa ROCK Pi 4
What if the description has something like below.
- description: Radxa ROCK Pi 4A/B/C
Jagan.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 3/6] dt-bindings: arm: rockchip: Add ROCKPi 4B binding
2020-07-23 6:34 ` Jagan Teki
@ 2020-07-23 8:27 ` Heiko Stübner
0 siblings, 0 replies; 10+ messages in thread
From: Heiko Stübner @ 2020-07-23 8:27 UTC (permalink / raw)
To: Jagan Teki
Cc: devicetree, linux-kernel, open list:ARM/Rockchip SoC...,
Rob Herring, Suniel Mahesh, Michael Trimarchi, linux-amarula,
linux-arm-kernel
Am Donnerstag, 23. Juli 2020, 08:34:12 CEST schrieb Jagan Teki:
> Hi Heiko,
>
> On Thu, Jul 23, 2020 at 4:43 AM Heiko Stuebner <heiko@sntech.de> wrote:
> >
> > Hi Jagan,
> >
> > Am Mittwoch, 22. Juli 2020, 21:09:46 CEST schrieb Jagan Teki:
> > > Add dt-bindings for ROCKPi 4B which is similar to 4A with
> > > additional AP6256 Wifi/BT, PoE.
> > >
> > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > > ---
> > > Changes for v2:
> > > - new patch
> > >
> > > Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
> > > 1 file changed, 6 insertions(+)
> > >
> > > diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > index 36057c9e4b83..7250adb43d24 100644
> > > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > @@ -448,6 +448,12 @@ properties:
> > > - const: radxa,rockpi4a
> > > - const: rockchip,rk3399
> > >
> > > + - description: Radxa ROCK Pi 4B
> > > + items:
> > > + - const: radxa,rockpi4
> > > + - const: radxa,rockpi4b
> > > + - const: rockchip,rk3399
> > > +
> >
> > Please do all RockPi4 variants into one entry, so we want something like:
> >
> > - description: Radxa ROCK Pi 4
>
> What if the description has something like below.
>
> - description: Radxa ROCK Pi 4A/B/C
That's also ok :-)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 4/6] arm64: dts: rockchip: Add Radxa ROCK Pi 4B support
2020-07-22 19:09 [PATCH v2 1/6] dt-bindings: arm: rockchip: Update ROCKPi 4 with 4A binding Jagan Teki
2020-07-22 19:09 ` [PATCH v2 2/6] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts Jagan Teki
2020-07-22 19:09 ` [PATCH v2 3/6] dt-bindings: arm: rockchip: Add ROCKPi 4B binding Jagan Teki
@ 2020-07-22 19:09 ` Jagan Teki
2020-07-22 19:09 ` [PATCH v2 5/6] dt-bindings: arm: rockchip: Add ROCKPi 4C binding Jagan Teki
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Jagan Teki @ 2020-07-22 19:09 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring
Cc: devicetree, linux-kernel, linux-rockchip, Jagan Teki,
Suniel Mahesh, Michael Trimarchi, linux-amarula,
linux-arm-kernel
RockPI 4B has AP6256 Wifi/BT, so enable them in 4B dts
instead of enable in common dtsi.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- add radxa,rockpi4b
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 23 ----------
.../boot/dts/rockchip/rk3399-rock-pi-4b.dts | 42 +++++++++++++++++++
3 files changed, 43 insertions(+), 23 deletions(-)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 1250c62205a4..e7b11e8fd9b6 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -36,6 +36,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index e163f438f836..678a336010bf 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -584,17 +584,6 @@ &sdio0 {
pinctrl-names = "default";
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
sd-uhs-sdr104;
- status = "okay";
-
- brcmf: wifi@1 {
- compatible = "brcm,bcm4329-fmac";
- reg = <1>;
- interrupt-parent = <&gpio0>;
- interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
- interrupt-names = "host-wake";
- pinctrl-names = "default";
- pinctrl-0 = <&wifi_host_wake_l>;
- };
};
&sdmmc {
@@ -663,18 +652,6 @@ u2phy1_host: host-port {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
- status = "okay";
-
- bluetooth {
- compatible = "brcm,bcm43438-bt";
- clocks = <&rk808 1>;
- clock-names = "ext_clock";
- device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
- host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
- shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
- };
};
&uart2 {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
new file mode 100644
index 000000000000..f0055ce2fda0
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
+ * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
+ */
+
+/dts-v1/;
+#include "rk3399-rock-pi-4.dtsi"
+
+/ {
+ model = "Radxa ROCK Pi 4B";
+ compatible = "radxa,rockpi4b", "radxa,rockpi4", "rockchip,rk3399";
+};
+
+&sdio0 {
+ status = "okay";
+
+ brcmf: wifi@1 {
+ compatible = "brcm,bcm4329-fmac";
+ reg = <1>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
+ interrupt-names = "host-wake";
+ pinctrl-names = "default";
+ pinctrl-0 = <&wifi_host_wake_l>;
+ };
+};
+
+&uart0 {
+ status = "okay";
+
+ bluetooth {
+ compatible = "brcm,bcm43438-bt";
+ clocks = <&rk808 1>;
+ clock-names = "ext_clock";
+ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
+ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
+ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
+ };
+};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 5/6] dt-bindings: arm: rockchip: Add ROCKPi 4C binding
2020-07-22 19:09 [PATCH v2 1/6] dt-bindings: arm: rockchip: Update ROCKPi 4 with 4A binding Jagan Teki
` (2 preceding siblings ...)
2020-07-22 19:09 ` [PATCH v2 4/6] arm64: dts: rockchip: Add Radxa ROCK Pi 4B support Jagan Teki
@ 2020-07-22 19:09 ` Jagan Teki
2020-07-22 19:09 ` [PATCH v2 6/6] arm64: dts: rockchip: Add Radxa ROCK Pi 4C support Jagan Teki
2020-07-23 20:22 ` [PATCH v2 1/6] dt-bindings: arm: rockchip: Update ROCKPi 4 with 4A binding Rob Herring
5 siblings, 0 replies; 10+ messages in thread
From: Jagan Teki @ 2020-07-22 19:09 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring
Cc: devicetree, linux-kernel, linux-rockchip, Jagan Teki,
Suniel Mahesh, Michael Trimarchi, linux-amarula,
linux-arm-kernel
Add dt-bindings for ROCKPi 4C which is similar to 4B with
additional mDP and HDMI port replaced with Micro HDMI port.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- new patch
Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 7250adb43d24..1faf1ce92dba 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -454,6 +454,12 @@ properties:
- const: radxa,rockpi4b
- const: rockchip,rk3399
+ - description: Radxa ROCK Pi 4C
+ items:
+ - const: radxa,rockpi4
+ - const: radxa,rockpi4c
+ - const: rockchip,rk3399
+
- description: Radxa ROCK Pi N8
items:
- const: radxa,rockpi-n8
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 6/6] arm64: dts: rockchip: Add Radxa ROCK Pi 4C support
2020-07-22 19:09 [PATCH v2 1/6] dt-bindings: arm: rockchip: Update ROCKPi 4 with 4A binding Jagan Teki
` (3 preceding siblings ...)
2020-07-22 19:09 ` [PATCH v2 5/6] dt-bindings: arm: rockchip: Add ROCKPi 4C binding Jagan Teki
@ 2020-07-22 19:09 ` Jagan Teki
2020-07-23 20:22 ` [PATCH v2 1/6] dt-bindings: arm: rockchip: Update ROCKPi 4 with 4A binding Rob Herring
5 siblings, 0 replies; 10+ messages in thread
From: Jagan Teki @ 2020-07-22 19:09 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring
Cc: devicetree, linux-kernel, linux-rockchip, Jagan Teki,
Suniel Mahesh, Michael Trimarchi, linux-amarula,
linux-arm-kernel
Rock PI 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled
GPIO pin change compared to 4B, 4C.
So, add or enable difference nodes/properties in 4C dts
by including common dtsi.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- add radxa,rockpi4c
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3399-rock-pi-4c.dts | 51 +++++++++++++++++++
2 files changed, 52 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index e7b11e8fd9b6..48cc045e6928 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -37,6 +37,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
new file mode 100644
index 000000000000..4c7ebb1c5d2d
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd
+ * Copyright (c) 2019 Radxa Limited
+ * Copyright (c) 2019 Amarula Solutions(India)
+ */
+
+/dts-v1/;
+#include "rk3399-rock-pi-4.dtsi"
+
+/ {
+ model = "Radxa ROCK Pi 4C";
+ compatible = "radxa,rockpi4c", "radxa,rockpi4", "rockchip,rk3399";
+};
+
+&sdio0 {
+ status = "okay";
+
+ brcmf: wifi@1 {
+ compatible = "brcm,bcm4329-fmac";
+ reg = <1>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
+ interrupt-names = "host-wake";
+ pinctrl-names = "default";
+ pinctrl-0 = <&wifi_host_wake_l>;
+ };
+};
+
+&uart0 {
+ status = "okay";
+
+ bluetooth {
+ compatible = "brcm,bcm43438-bt";
+ clocks = <&rk808 1>;
+ clock-names = "ext_clock";
+ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
+ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
+ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
+ };
+};
+
+&vcc5v0_host {
+ gpio = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>;
+};
+
+&vcc5v0_host_en {
+ rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
+};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2 1/6] dt-bindings: arm: rockchip: Update ROCKPi 4 with 4A binding
2020-07-22 19:09 [PATCH v2 1/6] dt-bindings: arm: rockchip: Update ROCKPi 4 with 4A binding Jagan Teki
` (4 preceding siblings ...)
2020-07-22 19:09 ` [PATCH v2 6/6] arm64: dts: rockchip: Add Radxa ROCK Pi 4C support Jagan Teki
@ 2020-07-23 20:22 ` Rob Herring
5 siblings, 0 replies; 10+ messages in thread
From: Rob Herring @ 2020-07-23 20:22 UTC (permalink / raw)
To: Jagan Teki
Cc: devicetree, Heiko Stuebner, linux-kernel, linux-rockchip,
Suniel Mahesh, Michael Trimarchi, linux-amarula,
linux-arm-kernel
On Thu, Jul 23, 2020 at 12:39:44AM +0530, Jagan Teki wrote:
> ROCKPi 4 has 3 variants of hardware platforms called
> ROCKPi 4A, 4B, and 4C.
>
> - ROCKPi 4A has no Wif/BT.
> - ROCKPi 4B has AP6256 Wifi/BT, PoE.
> - ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled
> GPIO pin change compared to 4B, 4C
>
> So, update the existing ROCKPi 4 with ROCKPi 4A binding.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v2:
> - new patch
>
> Documentation/devicetree/bindings/arm/rockchip.yaml | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> index 41f919de1ad4..36057c9e4b83 100644
> --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> @@ -442,9 +442,10 @@ properties:
> - const: radxa,rock
> - const: rockchip,rk3188
>
> - - description: Radxa ROCK Pi 4
> + - description: Radxa ROCK Pi 4A
> items:
> - const: radxa,rockpi4
> + - const: radxa,rockpi4a
> - const: rockchip,rk3399
That's not what I suggested. And this is just wrong as the order is most
specific to least specific.
This is what I suggest:
items:
- enum:
- radxa,rockpi4 # ROCK Pi 4A
- radxa,rockpi4b
- radxa,rockpi4c
- const: rockchip,rk3399
>
> - description: Radxa ROCK Pi N8
> --
> 2.25.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread