* [PATCH v1 1/3] arm64: dts: rockchip: Move OPP table from ROCK Pi 4 dtsi
2023-07-05 14:10 [PATCH v1 0/3] Add support for Radxa ROCK 4SE Christopher Obbard
@ 2023-07-05 14:10 ` Christopher Obbard
2023-07-05 14:10 ` [PATCH v1 2/3] dt-bindings: arm: rockchip: Add Radxa ROCK 4SE Christopher Obbard
2023-07-05 14:10 ` [PATCH v1 3/3] arm64: dts: " Christopher Obbard
2 siblings, 0 replies; 7+ messages in thread
From: Christopher Obbard @ 2023-07-05 14:10 UTC (permalink / raw)
To: linux-rockchip
Cc: kernel, Christopher Obbard, Conor Dooley, FUKAUMI Naoki,
Heiko Stuebner, Jagan Teki, Krzysztof Kozlowski, Rob Herring,
devicetree, linux-arm-kernel, linux-kernel
The ROCK 4SE uses the RK3399-T variant of the RK3399 SoC, which has some
changes to the OPP tables. Prepare for the bringup of this SoC by moving
the inclusion of existing OPP tables from the common devicetree into
each board-specific devicetree.
Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 1 +
4 files changed, 3 insertions(+), 1 deletion(-)
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 907071d4fe80..ec307ee20c66 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -9,7 +9,6 @@
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pwm/pwm.h>
#include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
/ {
aliases {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
index 89f2af5e111d..931334aa3d62 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
@@ -6,6 +6,7 @@
/dts-v1/;
#include "rk3399-rock-pi-4.dtsi"
+#include "rk3399-opp.dtsi"
/ {
model = "Radxa ROCK Pi 4A";
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
index 0806545922f5..e98a182f8572 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
@@ -6,6 +6,7 @@
/dts-v1/;
#include "rk3399-rock-pi-4.dtsi"
+#include "rk3399-opp.dtsi"
/ {
model = "Radxa ROCK Pi 4B";
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
index 4053ba72618c..d32efab74e94 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
@@ -7,6 +7,7 @@
/dts-v1/;
#include "rk3399-rock-pi-4.dtsi"
+#include "rk3399-opp.dtsi"
/ {
model = "Radxa ROCK Pi 4C";
--
2.40.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v1 2/3] dt-bindings: arm: rockchip: Add Radxa ROCK 4SE
2023-07-05 14:10 [PATCH v1 0/3] Add support for Radxa ROCK 4SE Christopher Obbard
2023-07-05 14:10 ` [PATCH v1 1/3] arm64: dts: rockchip: Move OPP table from ROCK Pi 4 dtsi Christopher Obbard
@ 2023-07-05 14:10 ` Christopher Obbard
2023-07-05 15:52 ` Krzysztof Kozlowski
2023-07-05 14:10 ` [PATCH v1 3/3] arm64: dts: " Christopher Obbard
2 siblings, 1 reply; 7+ messages in thread
From: Christopher Obbard @ 2023-07-05 14:10 UTC (permalink / raw)
To: linux-rockchip
Cc: kernel, Christopher Obbard, Andrew Lunn, Andy Yan, Brian Norris,
Chris Morgan, Chukun Pan, Conor Dooley, Heiko Stuebner,
Jagan Teki, Krzysztof Kozlowski, Rob Herring, Tianling Shen,
devicetree, linux-arm-kernel, linux-kernel
Add devicetree binding entry for the Radxa ROCK 4SE.
Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index ecdb72a519cb..3b7bf86cec02 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -694,6 +694,11 @@ properties:
- const: radxa,rock-4c-plus
- const: rockchip,rk3399
+ - description: Radxa ROCK 4SE
+ items:
+ - const: radxa,rock-4se
+ - const: rockchip,rk3399
+
- description: Radxa ROCK Pi E
items:
- const: radxa,rockpi-e
--
2.40.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v1 2/3] dt-bindings: arm: rockchip: Add Radxa ROCK 4SE
2023-07-05 14:10 ` [PATCH v1 2/3] dt-bindings: arm: rockchip: Add Radxa ROCK 4SE Christopher Obbard
@ 2023-07-05 15:52 ` Krzysztof Kozlowski
0 siblings, 0 replies; 7+ messages in thread
From: Krzysztof Kozlowski @ 2023-07-05 15:52 UTC (permalink / raw)
To: Christopher Obbard, linux-rockchip
Cc: kernel, Andrew Lunn, Andy Yan, Brian Norris, Chris Morgan,
Chukun Pan, Conor Dooley, Heiko Stuebner, Jagan Teki,
Krzysztof Kozlowski, Rob Herring, Tianling Shen, devicetree,
linux-arm-kernel, linux-kernel
On 05/07/2023 16:10, Christopher Obbard wrote:
> Add devicetree binding entry for the Radxa ROCK 4SE.
>
> Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
> ---
>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 3/3] arm64: dts: rockchip: Add Radxa ROCK 4SE
2023-07-05 14:10 [PATCH v1 0/3] Add support for Radxa ROCK 4SE Christopher Obbard
2023-07-05 14:10 ` [PATCH v1 1/3] arm64: dts: rockchip: Move OPP table from ROCK Pi 4 dtsi Christopher Obbard
2023-07-05 14:10 ` [PATCH v1 2/3] dt-bindings: arm: rockchip: Add Radxa ROCK 4SE Christopher Obbard
@ 2023-07-05 14:10 ` Christopher Obbard
2023-07-05 15:53 ` Krzysztof Kozlowski
2 siblings, 1 reply; 7+ messages in thread
From: Christopher Obbard @ 2023-07-05 14:10 UTC (permalink / raw)
To: linux-rockchip
Cc: kernel, Christopher Obbard, Andy Yan, Chris Morgan, Conor Dooley,
Heiko Stuebner, Jagan Teki, Krzysztof Kozlowski, Maya Matuszczyk,
Rob Herring, Sebastian Reichel, Tianling Shen, devicetree,
linux-arm-kernel, linux-kernel
Add board-specific devicetree file for the RK3399T-based Radxa ROCK 4SE
board. This board offers similar peripherals in a similar form-factor to
the existing ROCK Pi 4B but uses the cost-optimised RK3399T processor
(which has different OPP table than the RK3399) and other minimal hardware
changes.
Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3399-rock-4se.dts | 65 +++++++++++++++++++
2 files changed, 66 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index b7fb908eb92d..7ab29cbe71c4 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-4c-plus.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-4se.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a-plus.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts
new file mode 100644
index 000000000000..d0bc91cebba2
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts
@@ -0,0 +1,65 @@
+// 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"
+#include "rk3399-t-opp.dtsi"
+
+/ {
+ model = "Radxa ROCK 4SE";
+ compatible = "radxa,rock-4se", "rockchip,rk3399";
+
+ aliases {
+ mmc2 = &sdio0;
+ };
+};
+
+&pinctrl {
+ usb2 {
+ vcc5v0_host_en: vcc5v0-host-en {
+ rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+};
+
+&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,bcm4345c5";
+ clocks = <&rk808 1>;
+ clock-names = "lpo";
+ 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>;
+ max-speed = <1500000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
+ vbat-supply = <&vcc3v3_sys>;
+ vddio-supply = <&vcc_1v8>;
+ };
+};
+
+&vcc5v0_host {
+ enable-active-high;
+ gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc5v0_host_en>;
+};
--
2.40.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v1 3/3] arm64: dts: rockchip: Add Radxa ROCK 4SE
2023-07-05 14:10 ` [PATCH v1 3/3] arm64: dts: " Christopher Obbard
@ 2023-07-05 15:53 ` Krzysztof Kozlowski
2023-07-06 11:33 ` Christopher Obbard
0 siblings, 1 reply; 7+ messages in thread
From: Krzysztof Kozlowski @ 2023-07-05 15:53 UTC (permalink / raw)
To: Christopher Obbard, linux-rockchip
Cc: kernel, Andy Yan, Chris Morgan, Conor Dooley, Heiko Stuebner,
Jagan Teki, Krzysztof Kozlowski, Maya Matuszczyk, Rob Herring,
Sebastian Reichel, Tianling Shen, devicetree, linux-arm-kernel,
linux-kernel
On 05/07/2023 16:10, Christopher Obbard wrote:
> Add board-specific devicetree file for the RK3399T-based Radxa ROCK 4SE
> board. This board offers similar peripherals in a similar form-factor to
> the existing ROCK Pi 4B but uses the cost-optimised RK3399T processor
> (which has different OPP table than the RK3399) and other minimal hardware
> changes.
>
> Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
> ---
>
> +
> +&sdio0 {
> + status = "okay";
> +
> + brcmf: wifi@1 {
> + compatible = "brcm,bcm4329-fmac";
> + reg = <1>;
> + interrupt-parent = <&gpio0>;
> + interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
I just send a patch to fix this in some files, so let's try keep it
good. Use proper interrupt type, not none.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v1 3/3] arm64: dts: rockchip: Add Radxa ROCK 4SE
2023-07-05 15:53 ` Krzysztof Kozlowski
@ 2023-07-06 11:33 ` Christopher Obbard
0 siblings, 0 replies; 7+ messages in thread
From: Christopher Obbard @ 2023-07-06 11:33 UTC (permalink / raw)
To: Krzysztof Kozlowski, linux-rockchip
Cc: kernel, Andy Yan, Chris Morgan, Conor Dooley, Heiko Stuebner,
Jagan Teki, Krzysztof Kozlowski, Maya Matuszczyk, Rob Herring,
Sebastian Reichel, Tianling Shen, devicetree, linux-arm-kernel,
linux-kernel
Hi Krzysztof,
On Wed, 2023-07-05 at 17:53 +0200, Krzysztof Kozlowski wrote:
> On 05/07/2023 16:10, Christopher Obbard wrote:
> > Add board-specific devicetree file for the RK3399T-based Radxa ROCK 4SE
> > board. This board offers similar peripherals in a similar form-factor to
> > the existing ROCK Pi 4B but uses the cost-optimised RK3399T processor
> > (which has different OPP table than the RK3399) and other minimal hardware
> > changes.
> >
> > Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
> > ---
> >
>
>
> > +
> > +&sdio0 {
> > + status = "okay";
> > +
> > + brcmf: wifi@1 {
> > + compatible = "brcm,bcm4329-fmac";
> > + reg = <1>;
> > + interrupt-parent = <&gpio0>;
> > + interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
>
> I just send a patch to fix this in some files, so let's try keep it
> good. Use proper interrupt type, not none.
Thank you for your review. I missed that patch, sent only a few hours before mine. I will address this in v2.
Cheers!
Chris
^ permalink raw reply [flat|nested] 7+ messages in thread