* [PATCH v2 01/14] arm64: dts: rockchip: fix i2c2 pinctrl-names property on anbernic-rg353p/v
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 21:02 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 02/14] arm64: dts: rockchip: Drop regulator-init-microvolt from two boards Heiko Stuebner
` (13 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip; +Cc: heiko, linux-arm-kernel, devicetree, Chris Morgan
We want to control pins, not beer mugs, so rename pintctrl-names to the
expected inctrl-names.
This was not affecting functionality, because the i2c2 controller
already had a set of pinctrl properties.
Fixes: 523adb553573 ("arm64: dts: rockchip: add Anbernic RG353P and RG503")
Fixes: 1e141cf12726 ("arm64: dts: rockchip: add Anbernic RG353V and RG353VS")
Cc: Chris Morgan <macromorgan@hotmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Chris Morgan <macromorgan@hotmail.com>
---
arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 2 +-
arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
index a73cf30801ec..9816a4ed4599 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
@@ -92,7 +92,7 @@ button-r2 {
};
&i2c2 {
- pintctrl-names = "default";
+ pinctrl-names = "default";
pinctrl-0 = <&i2c2m1_xfer>;
status = "okay";
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts
index e9954a33e8cd..a79a5614bcc8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts
@@ -79,7 +79,7 @@ button-r2 {
};
&i2c2 {
- pintctrl-names = "default";
+ pinctrl-names = "default";
pinctrl-0 = <&i2c2m1_xfer>;
status = "okay";
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 01/14] arm64: dts: rockchip: fix i2c2 pinctrl-names property on anbernic-rg353p/v
2024-10-08 20:39 ` [PATCH v2 01/14] arm64: dts: rockchip: fix i2c2 pinctrl-names property on anbernic-rg353p/v Heiko Stuebner
@ 2024-10-08 21:02 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-08 21:02 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, devicetree, Chris Morgan
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> We want to control pins, not beer mugs, so rename pintctrl-names to the
> expected inctrl-names.
s/inctrl-names/pinctrl-names/
> This was not affecting functionality, because the i2c2 controller
> already had a set of pinctrl properties.
>
> Fixes: 523adb553573 ("arm64: dts: rockchip: add Anbernic RG353P and
> RG503")
> Fixes: 1e141cf12726 ("arm64: dts: rockchip: add Anbernic RG353V and
> RG353VS")
> Cc: Chris Morgan <macromorgan@hotmail.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> Acked-by: Chris Morgan <macromorgan@hotmail.com>
Looking good to me, thanks for the patch. It's obviously correct.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 2 +-
> arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
> b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
> index a73cf30801ec..9816a4ed4599 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
> @@ -92,7 +92,7 @@ button-r2 {
> };
>
> &i2c2 {
> - pintctrl-names = "default";
> + pinctrl-names = "default";
> pinctrl-0 = <&i2c2m1_xfer>;
> status = "okay";
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts
> b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts
> index e9954a33e8cd..a79a5614bcc8 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts
> @@ -79,7 +79,7 @@ button-r2 {
> };
>
> &i2c2 {
> - pintctrl-names = "default";
> + pinctrl-names = "default";
> pinctrl-0 = <&i2c2m1_xfer>;
> status = "okay";
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 02/14] arm64: dts: rockchip: Drop regulator-init-microvolt from two boards
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
2024-10-08 20:39 ` [PATCH v2 01/14] arm64: dts: rockchip: fix i2c2 pinctrl-names property on anbernic-rg353p/v Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 21:07 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 03/14] arm64: dts: rockchip: Fix bluetooth properties on rk3566 box demo Heiko Stuebner
` (12 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip
Cc: heiko, linux-arm-kernel, devicetree, Furkan Kardame, Elon Zhang
rk3568-roc-pc and rk3588-toybrick-x0 re-introduced this property despite
previous patches removing older instances already.
regulator-init-microvolt is not part of any regulator binding and is
only used in the Rockchip vendor kernel. So drop it.
It is used by u-boot in some places to setup initial regulator-state,
but that should happen in the existing -u-boot devicetree additions.
Fixes: 007b4bb47f44 ("arm64: dts: rockchip: add dts for Firefly Station P2 aka rk3568-roc-pc")
Cc: Furkan Kardame <f.kardame@manjaro.org>
Fixes: 8ffe365f8dc7 ("arm64: dts: rockchip: Add devicetree support for TB-RK3588X board")
Cc: Elon Zhang <zhangzj@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts | 3 ---
arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts | 1 -
2 files changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
index e333449ead04..2fa89a0eeafc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
@@ -272,7 +272,6 @@ vdd_logic: DCDC_REG1 {
regulator-name = "vdd_logic";
regulator-always-on;
regulator-boot-on;
- regulator-init-microvolt = <900000>;
regulator-initial-mode = <0x2>;
regulator-min-microvolt = <500000>;
regulator-max-microvolt = <1350000>;
@@ -285,7 +284,6 @@ regulator-state-mem {
vdd_gpu: DCDC_REG2 {
regulator-name = "vdd_gpu";
- regulator-init-microvolt = <900000>;
regulator-initial-mode = <0x2>;
regulator-min-microvolt = <500000>;
regulator-max-microvolt = <1350000>;
@@ -309,7 +307,6 @@ regulator-state-mem {
vdd_npu: DCDC_REG4 {
regulator-name = "vdd_npu";
- regulator-init-microvolt = <900000>;
regulator-initial-mode = <0x2>;
regulator-min-microvolt = <500000>;
regulator-max-microvolt = <1350000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
index d0021524e7f9..328dcb894ccb 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
@@ -428,7 +428,6 @@ vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 {
regulator-boot-on;
regulator-min-microvolt = <550000>;
regulator-max-microvolt = <950000>;
- regulator-init-microvolt = <750000>;
regulator-ramp-delay = <12500>;
regulator-state-mem {
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 02/14] arm64: dts: rockchip: Drop regulator-init-microvolt from two boards
2024-10-08 20:39 ` [PATCH v2 02/14] arm64: dts: rockchip: Drop regulator-init-microvolt from two boards Heiko Stuebner
@ 2024-10-08 21:07 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-08 21:07 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-rockchip, linux-arm-kernel, devicetree, Furkan Kardame,
Elon Zhang
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> rk3568-roc-pc and rk3588-toybrick-x0 re-introduced this property
> despite
> previous patches removing older instances already.
>
> regulator-init-microvolt is not part of any regulator binding and is
> only used in the Rockchip vendor kernel. So drop it.
>
> It is used by u-boot in some places to setup initial regulator-state,
> but that should happen in the existing -u-boot devicetree additions.
>
> Fixes: 007b4bb47f44 ("arm64: dts: rockchip: add dts for Firefly
> Station P2 aka rk3568-roc-pc")
> Cc: Furkan Kardame <f.kardame@manjaro.org>
> Fixes: 8ffe365f8dc7 ("arm64: dts: rockchip: Add devicetree support for
> TB-RK3588X board")
> Cc: Elon Zhang <zhangzj@rock-chips.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. Having support for the
"regulator-init-microvolt" property in board dts files, or not having
it, goes back to the main purpose of the DTs, which define hardware,
but, in general, do not contain system configuration or policies.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts | 3 ---
> arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts | 1 -
> 2 files changed, 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
> b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
> index e333449ead04..2fa89a0eeafc 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
> @@ -272,7 +272,6 @@ vdd_logic: DCDC_REG1 {
> regulator-name = "vdd_logic";
> regulator-always-on;
> regulator-boot-on;
> - regulator-init-microvolt = <900000>;
> regulator-initial-mode = <0x2>;
> regulator-min-microvolt = <500000>;
> regulator-max-microvolt = <1350000>;
> @@ -285,7 +284,6 @@ regulator-state-mem {
>
> vdd_gpu: DCDC_REG2 {
> regulator-name = "vdd_gpu";
> - regulator-init-microvolt = <900000>;
> regulator-initial-mode = <0x2>;
> regulator-min-microvolt = <500000>;
> regulator-max-microvolt = <1350000>;
> @@ -309,7 +307,6 @@ regulator-state-mem {
>
> vdd_npu: DCDC_REG4 {
> regulator-name = "vdd_npu";
> - regulator-init-microvolt = <900000>;
> regulator-initial-mode = <0x2>;
> regulator-min-microvolt = <500000>;
> regulator-max-microvolt = <1350000>;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
> b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
> index d0021524e7f9..328dcb894ccb 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
> @@ -428,7 +428,6 @@ vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 {
> regulator-boot-on;
> regulator-min-microvolt = <550000>;
> regulator-max-microvolt = <950000>;
> - regulator-init-microvolt = <750000>;
> regulator-ramp-delay = <12500>;
>
> regulator-state-mem {
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 03/14] arm64: dts: rockchip: Fix bluetooth properties on rk3566 box demo
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
2024-10-08 20:39 ` [PATCH v2 01/14] arm64: dts: rockchip: fix i2c2 pinctrl-names property on anbernic-rg353p/v Heiko Stuebner
2024-10-08 20:39 ` [PATCH v2 02/14] arm64: dts: rockchip: Drop regulator-init-microvolt from two boards Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 21:13 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 04/14] arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards Heiko Stuebner
` (11 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip; +Cc: heiko, linux-arm-kernel, devicetree, Andy Yan
The expected clock-name is different, and extclk also is deprecated
in favor of txco for clocks that are not crystals.
The wakeup gpio properties are named differently too, when changing
from vendor-tree to mainline. So fix those to match the binding.
Fixes: 2e0537b16b25 ("arm64: dts: rockchip: Add dts for rockchip rk3566 box demo board")
Cc: Andy Yan <andyshrk@163.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
index 0c18406e4c59..7d4680933823 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
@@ -449,9 +449,9 @@ &uart1 {
bluetooth {
compatible = "brcm,bcm43438-bt";
clocks = <&pmucru CLK_RTC_32K>;
- clock-names = "ext_clock";
- device-wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
- host-wake-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
+ clock-names = "txco";
+ device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
+ host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 03/14] arm64: dts: rockchip: Fix bluetooth properties on rk3566 box demo
2024-10-08 20:39 ` [PATCH v2 03/14] arm64: dts: rockchip: Fix bluetooth properties on rk3566 box demo Heiko Stuebner
@ 2024-10-08 21:13 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-08 21:13 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, devicetree, Andy Yan
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> The expected clock-name is different, and extclk also is deprecated
> in favor of txco for clocks that are not crystals.
>
> The wakeup gpio properties are named differently too, when changing
> from vendor-tree to mainline. So fix those to match the binding.
>
> Fixes: 2e0537b16b25 ("arm64: dts: rockchip: Add dts for rockchip
> rk3566 box demo board")
> Cc: Andy Yan <andyshrk@163.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. I've got these changes
cross-referenced to what's expected in drivers/bluetooth/hci_bcm.c,
and it's all fine.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
> b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
> index 0c18406e4c59..7d4680933823 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
> @@ -449,9 +449,9 @@ &uart1 {
> bluetooth {
> compatible = "brcm,bcm43438-bt";
> clocks = <&pmucru CLK_RTC_32K>;
> - clock-names = "ext_clock";
> - device-wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
> - host-wake-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
> + clock-names = "txco";
> + device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
> + host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
> shutdown-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
> pinctrl-names = "default";
> pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 04/14] arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (2 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 03/14] arm64: dts: rockchip: Fix bluetooth properties on rk3566 box demo Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 21:15 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 05/14] arm64: dts: rockchip: Remove undocumented supports-emmc property Heiko Stuebner
` (10 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip; +Cc: heiko, linux-arm-kernel, devicetree, Manivannan Sadhasivam
The expected clock-name is different, and extclk also is deprecated
in favor of txco for clocks that are not crystals.
So fix it to match the binding.
Fixes: c72235c288c8 ("arm64: dts: rockchip: Add on-board WiFi/BT support for Rock960 boards")
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 8146f870d2bd..ab890e7b6c59 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -576,7 +576,7 @@ &uart0 {
bluetooth {
compatible = "brcm,bcm43438-bt";
clocks = <&rk808 1>;
- clock-names = "ext_clock";
+ clock-names = "txco";
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>;
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 04/14] arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards
2024-10-08 20:39 ` [PATCH v2 04/14] arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards Heiko Stuebner
@ 2024-10-08 21:15 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-08 21:15 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-rockchip, linux-arm-kernel, devicetree,
Manivannan Sadhasivam
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> The expected clock-name is different, and extclk also is deprecated
> in favor of txco for clocks that are not crystals.
>
> So fix it to match the binding.
>
> Fixes: c72235c288c8 ("arm64: dts: rockchip: Add on-board WiFi/BT
> support for Rock960 boards")
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. I've got this change
cross-referenced to what's expected in drivers/bluetooth/hci_bcm.c,
and it's fine.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> index 8146f870d2bd..ab890e7b6c59 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> @@ -576,7 +576,7 @@ &uart0 {
> bluetooth {
> compatible = "brcm,bcm43438-bt";
> clocks = <&rk808 1>;
> - clock-names = "ext_clock";
> + clock-names = "txco";
> 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>;
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 05/14] arm64: dts: rockchip: Remove undocumented supports-emmc property
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (3 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 04/14] arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 21:17 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards Heiko Stuebner
` (9 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip
Cc: heiko, linux-arm-kernel, devicetree, Quentin Schulz,
Sergey Bostandzhyan, Wenhao Cui, Andy Yan
supports-emmc is an undocumented property that slipped into the mainline
kernel devicetree for some boards. Drop it.
Fixes: c484cf93f61b ("arm64: dts: rockchip: add PX30-µQ7 (Ringneck) SoM with Haikou baseboard")
Cc: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Fixes: b8c028782922 ("arm64: dts: rockchip: Add DTS for FriendlyARM NanoPi R2S Plus")
Cc: Sergey Bostandzhyan <jin@mediatomb.cc>
Fixes: 8d94da58de53 ("arm64: dts: rockchip: Add EmbedFire LubanCat 1")
Cc: Wenhao Cui <lasstp5011@gmail.com>
Fixes: cdf46cdbabfc ("arm64: dts: rockchip: Add dts for EmbedFire rk3568 LubanCat 2")
Cc: Andy Yan <andyshrk@163.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 1 -
4 files changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
index bb1aea82e666..b7163ed74232 100644
--- a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
@@ -66,7 +66,6 @@ &emmc {
bus-width = <8>;
cap-mmc-highspeed;
mmc-hs200-1_8v;
- supports-emmc;
mmc-pwrseq = <&emmc_pwrseq>;
non-removable;
vmmc-supply = <&vcc_3v3>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
index cb81ba3f23ff..3093f607f282 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
@@ -27,6 +27,5 @@ &emmc {
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
- supports-emmc;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
index c1194d1e438d..9a2f59a351de 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
@@ -507,7 +507,6 @@ &sdhci {
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
- supports-emmc;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
index a3112d5df200..b505a4537ee8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
@@ -589,7 +589,6 @@ &sdhci {
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
- supports-emmc;
status = "okay";
};
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 05/14] arm64: dts: rockchip: Remove undocumented supports-emmc property
2024-10-08 20:39 ` [PATCH v2 05/14] arm64: dts: rockchip: Remove undocumented supports-emmc property Heiko Stuebner
@ 2024-10-08 21:17 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-08 21:17 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-rockchip, linux-arm-kernel, devicetree, Quentin Schulz,
Sergey Bostandzhyan, Wenhao Cui, Andy Yan
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> supports-emmc is an undocumented property that slipped into the
> mainline
> kernel devicetree for some boards. Drop it.
>
> Fixes: c484cf93f61b ("arm64: dts: rockchip: add PX30-µQ7 (Ringneck)
> SoM with Haikou baseboard")
> Cc: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> Fixes: b8c028782922 ("arm64: dts: rockchip: Add DTS for FriendlyARM
> NanoPi R2S Plus")
> Cc: Sergey Bostandzhyan <jin@mediatomb.cc>
> Fixes: 8d94da58de53 ("arm64: dts: rockchip: Add EmbedFire LubanCat 1")
> Cc: Wenhao Cui <lasstp5011@gmail.com>
> Fixes: cdf46cdbabfc ("arm64: dts: rockchip: Add dts for EmbedFire
> rk3568 LubanCat 2")
> Cc: Andy Yan <andyshrk@163.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. The introduced changes
are obviously correct.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 1 -
> arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts | 1 -
> arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 1 -
> arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 1 -
> 4 files changed, 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
> b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
> index bb1aea82e666..b7163ed74232 100644
> --- a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
> @@ -66,7 +66,6 @@ &emmc {
> bus-width = <8>;
> cap-mmc-highspeed;
> mmc-hs200-1_8v;
> - supports-emmc;
> mmc-pwrseq = <&emmc_pwrseq>;
> non-removable;
> vmmc-supply = <&vcc_3v3>;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
> b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
> index cb81ba3f23ff..3093f607f282 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
> @@ -27,6 +27,5 @@ &emmc {
> num-slots = <1>;
> pinctrl-names = "default";
> pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
> - supports-emmc;
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
> b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
> index c1194d1e438d..9a2f59a351de 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
> @@ -507,7 +507,6 @@ &sdhci {
> non-removable;
> pinctrl-names = "default";
> pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
> - supports-emmc;
> status = "okay";
> };
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
> b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
> index a3112d5df200..b505a4537ee8 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
> @@ -589,7 +589,6 @@ &sdhci {
> non-removable;
> pinctrl-names = "default";
> pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
> - supports-emmc;
> status = "okay";
> };
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (4 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 05/14] arm64: dts: rockchip: Remove undocumented supports-emmc property Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:16 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 07/14] arm64: dts: rockchip: Fix LED triggers on rk3308-roc-cc Heiko Stuebner
` (8 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip
Cc: heiko, linux-arm-kernel, devicetree, Quentin Schulz, Klaus Goger,
Quentin Schulz
All Theobroma boards use a ti,amc6821 as fan controller.
It normally runs in an automatically controlled way and while it may be
possible to use it as part of a dt-based thermal management, this is
not yet specified in the binding, nor implemented in any kernel.
Newer boards already don't contain that #cooling-cells property, but
older ones do. So remove them for now, they can be re-added if thermal
integration gets implemented in the future.
Fixes: c484cf93f61b ("arm64: dts: rockchip: add PX30-µQ7 (Ringneck) SoM with Haikou baseboard")
Fixes: d99a02bcfa81 ("arm64: dts: rockchip: add RK3368-uQ7 (Lion) SoM")
Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM")
Cc: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Cc: Klaus Goger <klaus.goger@theobroma-systems.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
---
arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 -
3 files changed, 3 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
index b7163ed74232..a6ea9d8c785c 100644
--- a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
@@ -293,7 +293,6 @@ &i2c1 {
fan: fan@18 {
compatible = "ti,amc6821";
reg = <0x18>;
- #cooling-cells = <2>;
};
rtc_twi: rtc@6f {
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
index 8ac8acf4082d..ab3fda69a1fb 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
@@ -61,7 +61,6 @@ i2c_lvds_blc: i2c@0 {
fan: fan@18 {
compatible = "ti,amc6821";
reg = <0x18>;
- #cooling-cells = <2>;
};
rtc_twi: rtc@6f {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 650b1ba9c192..6de3128556b7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -395,7 +395,6 @@ &i2c7 {
fan: fan@18 {
compatible = "ti,amc6821";
reg = <0x18>;
- #cooling-cells = <2>;
};
rtc_twi: rtc@6f {
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards
2024-10-08 20:39 ` [PATCH v2 06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards Heiko Stuebner
@ 2024-10-09 7:16 ` Dragan Simic
2024-10-14 15:39 ` Quentin Schulz
0 siblings, 1 reply; 37+ messages in thread
From: Dragan Simic @ 2024-10-09 7:16 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-rockchip, linux-arm-kernel, devicetree, Quentin Schulz,
Klaus Goger, Quentin Schulz
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> All Theobroma boards use a ti,amc6821 as fan controller.
> It normally runs in an automatically controlled way and while it may be
> possible to use it as part of a dt-based thermal management, this is
> not yet specified in the binding, nor implemented in any kernel.
>
> Newer boards already don't contain that #cooling-cells property, but
> older ones do. So remove them for now, they can be re-added if thermal
> integration gets implemented in the future.
>
> Fixes: c484cf93f61b ("arm64: dts: rockchip: add PX30-µQ7 (Ringneck)
> SoM with Haikou baseboard")
> Fixes: d99a02bcfa81 ("arm64: dts: rockchip: add RK3368-uQ7 (Lion) SoM")
> Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM")
> Cc: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> Cc: Klaus Goger <klaus.goger@theobroma-systems.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
Looking good to me, thanks for the patch. In addition to the amc6821
driver currently not supporting full integration into the thermal
framework, the "fan" DT node also isn't referenced in any cooling map,
so having it define the "cooling-cells" property is of no use.
By the way, it would be nice to see the amc6821 driver supporting fan
speed regulation, and test it to check who does a better job when it
comes to cooling and fan speed regulation, the thermal framework or
the chip's built-in logic. :)
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 1 -
> arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 1 -
> arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 -
> 3 files changed, 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
> b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
> index b7163ed74232..a6ea9d8c785c 100644
> --- a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
> @@ -293,7 +293,6 @@ &i2c1 {
> fan: fan@18 {
> compatible = "ti,amc6821";
> reg = <0x18>;
> - #cooling-cells = <2>;
> };
>
> rtc_twi: rtc@6f {
> diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
> index 8ac8acf4082d..ab3fda69a1fb 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
> @@ -61,7 +61,6 @@ i2c_lvds_blc: i2c@0 {
> fan: fan@18 {
> compatible = "ti,amc6821";
> reg = <0x18>;
> - #cooling-cells = <2>;
> };
>
> rtc_twi: rtc@6f {
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
> index 650b1ba9c192..6de3128556b7 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
> @@ -395,7 +395,6 @@ &i2c7 {
> fan: fan@18 {
> compatible = "ti,amc6821";
> reg = <0x18>;
> - #cooling-cells = <2>;
> };
>
> rtc_twi: rtc@6f {
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH v2 06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards
2024-10-09 7:16 ` Dragan Simic
@ 2024-10-14 15:39 ` Quentin Schulz
2024-10-14 15:49 ` Dragan Simic
0 siblings, 1 reply; 37+ messages in thread
From: Quentin Schulz @ 2024-10-14 15:39 UTC (permalink / raw)
To: Dragan Simic, Heiko Stuebner
Cc: linux-rockchip, linux-arm-kernel, devicetree, Quentin Schulz,
Klaus Goger
Hi Dragan,
On 10/9/24 9:16 AM, Dragan Simic wrote:
> Hello Heiko,
>
> On 2024-10-08 22:39, Heiko Stuebner wrote:
>> All Theobroma boards use a ti,amc6821 as fan controller.
>> It normally runs in an automatically controlled way and while it may be
>> possible to use it as part of a dt-based thermal management, this is
>> not yet specified in the binding, nor implemented in any kernel.
>>
>> Newer boards already don't contain that #cooling-cells property, but
>> older ones do. So remove them for now, they can be re-added if thermal
>> integration gets implemented in the future.
>>
>> Fixes: c484cf93f61b ("arm64: dts: rockchip: add PX30-µQ7 (Ringneck)
>> SoM with Haikou baseboard")
>> Fixes: d99a02bcfa81 ("arm64: dts: rockchip: add RK3368-uQ7 (Lion) SoM")
>> Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM")
>> Cc: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>> Cc: Klaus Goger <klaus.goger@theobroma-systems.com>
>> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
>> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
>
> Looking good to me, thanks for the patch. In addition to the amc6821
> driver currently not supporting full integration into the thermal
> framework, the "fan" DT node also isn't referenced in any cooling map,
> so having it define the "cooling-cells" property is of no use.
>
> By the way, it would be nice to see the amc6821 driver supporting fan
> speed regulation, and test it to check who does a better job when it
> comes to cooling and fan speed regulation, the thermal framework or
> the chip's built-in logic. :)
>
Wasn't this feature added this summer by Guenter?
c.f.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/hwmon/amc6821.c?id=becbd16ed2f8f427239ffda66b5d894008bc56af
Mode 4 is
https://elixir.bootlin.com/linux/v6.11.3/source/drivers/hwmon/amc6821.c#L367
([FDRC1:FDRC0] = [01] -> Software-RPM Control Mode (Fan Speed Regulator)
according to the datasheet).
In any case, we cannot compare those for our products as we do not have
a genuine AMC6821 but a handmade simulation of the IP we run in an MCU.
But that'd be an interesting data point indeed :)
Cheers,
Quentin
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH v2 06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards
2024-10-14 15:39 ` Quentin Schulz
@ 2024-10-14 15:49 ` Dragan Simic
2024-10-14 16:29 ` Quentin Schulz
0 siblings, 1 reply; 37+ messages in thread
From: Dragan Simic @ 2024-10-14 15:49 UTC (permalink / raw)
To: Quentin Schulz
Cc: Heiko Stuebner, linux-rockchip, linux-arm-kernel, devicetree,
Quentin Schulz, Klaus Goger
Hello Quentin,
On 2024-10-14 17:39, Quentin Schulz wrote:
> On 10/9/24 9:16 AM, Dragan Simic wrote:
>> On 2024-10-08 22:39, Heiko Stuebner wrote:
>>> All Theobroma boards use a ti,amc6821 as fan controller.
>>> It normally runs in an automatically controlled way and while it may
>>> be
>>> possible to use it as part of a dt-based thermal management, this is
>>> not yet specified in the binding, nor implemented in any kernel.
>>>
>>> Newer boards already don't contain that #cooling-cells property, but
>>> older ones do. So remove them for now, they can be re-added if
>>> thermal
>>> integration gets implemented in the future.
>>>
>>> Fixes: c484cf93f61b ("arm64: dts: rockchip: add PX30-µQ7 (Ringneck)
>>> SoM with Haikou baseboard")
>>> Fixes: d99a02bcfa81 ("arm64: dts: rockchip: add RK3368-uQ7 (Lion)
>>> SoM")
>>> Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma)
>>> SoM")
>>> Cc: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>>> Cc: Klaus Goger <klaus.goger@theobroma-systems.com>
>>> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
>>> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
>>
>> Looking good to me, thanks for the patch. In addition to the amc6821
>> driver currently not supporting full integration into the thermal
>> framework, the "fan" DT node also isn't referenced in any cooling map,
>> so having it define the "cooling-cells" property is of no use.
>>
>> By the way, it would be nice to see the amc6821 driver supporting fan
>> speed regulation, and test it to check who does a better job when it
>> comes to cooling and fan speed regulation, the thermal framework or
>> the chip's built-in logic. :)
>
> Wasn't this feature added this summer by Guenter?
>
> c.f.
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/hwmon/amc6821.c?id=becbd16ed2f8f427239ffda66b5d894008bc56af
>
> Mode 4 is
> https://elixir.bootlin.com/linux/v6.11.3/source/drivers/hwmon/amc6821.c#L367
> ([FDRC1:FDRC0] = [01] -> Software-RPM Control Mode (Fan Speed
> Regulator) according to the datasheet).
Ah, SENSOR_DEVICE_ATTR_RW(fan1_target, fan, IDX_FAN1_TARGET)...
How did I miss that? Hmm... Maybe I was looking at some older
local branch, which happened not to include that commit.
Anywyay, good to know, thanks.
> In any case, we cannot compare those for our products as we do not
> have a genuine AMC6821 but a handmade simulation of the IP we run in
> an MCU.
I seem to remember your MCU that performs a few tasks, back from
some related discussions. I wonder what was the reason to implement
it in software, instead of using actual fan controller chip?
> But that'd be an interesting data point indeed :)
I'm glad that you agree. :)
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH v2 06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards
2024-10-14 15:49 ` Dragan Simic
@ 2024-10-14 16:29 ` Quentin Schulz
2024-10-14 17:21 ` Dragan Simic
0 siblings, 1 reply; 37+ messages in thread
From: Quentin Schulz @ 2024-10-14 16:29 UTC (permalink / raw)
To: Dragan Simic
Cc: Heiko Stuebner, linux-rockchip, linux-arm-kernel, devicetree,
Quentin Schulz, Klaus Goger
Hi Dragan,
On 10/14/24 5:49 PM, Dragan Simic wrote:
> Hello Quentin,
>
> On 2024-10-14 17:39, Quentin Schulz wrote:
>> On 10/9/24 9:16 AM, Dragan Simic wrote:
>>> On 2024-10-08 22:39, Heiko Stuebner wrote:
>>>> All Theobroma boards use a ti,amc6821 as fan controller.
>>>> It normally runs in an automatically controlled way and while it may be
>>>> possible to use it as part of a dt-based thermal management, this is
>>>> not yet specified in the binding, nor implemented in any kernel.
>>>>
>>>> Newer boards already don't contain that #cooling-cells property, but
>>>> older ones do. So remove them for now, they can be re-added if thermal
>>>> integration gets implemented in the future.
>>>>
>>>> Fixes: c484cf93f61b ("arm64: dts: rockchip: add PX30-µQ7 (Ringneck)
>>>> SoM with Haikou baseboard")
>>>> Fixes: d99a02bcfa81 ("arm64: dts: rockchip: add RK3368-uQ7 (Lion) SoM")
>>>> Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM")
>>>> Cc: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>>>> Cc: Klaus Goger <klaus.goger@theobroma-systems.com>
>>>> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
>>>> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
>>>
>>> Looking good to me, thanks for the patch. In addition to the amc6821
>>> driver currently not supporting full integration into the thermal
>>> framework, the "fan" DT node also isn't referenced in any cooling map,
>>> so having it define the "cooling-cells" property is of no use.
>>>
>>> By the way, it would be nice to see the amc6821 driver supporting fan
>>> speed regulation, and test it to check who does a better job when it
>>> comes to cooling and fan speed regulation, the thermal framework or
>>> the chip's built-in logic. :)
>>
>> Wasn't this feature added this summer by Guenter?
>>
>> c.f. https://eur02.safelinks.protection.outlook.com/?
>> url=https%3A%2F%2Fgit.kernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git%2Fcommit%2Fdrivers%2Fhwmon%2Famc6821.c%3Fid%3Dbecbd16ed2f8f427239ffda66b5d894008bc56af&data=05%7C02%7Cquentin.schulz%40cherry.de%7C6df77e4e73434d36a6fd08dcec67c21c%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C638645177611948235%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata=4VaZrAKxDUTdEf7avUM1ewHLl9PIgBple841dE55o4w%3D&reserved=0
>>
>> Mode 4 is
>> https://eur02.safelinks.protection.outlook.com/?
>> url=https%3A%2F%2Felixir.bootlin.com%2Flinux%2Fv6.11.3%2Fsource%2Fdrivers%2Fhwmon%2Famc6821.c%23L367&data=05%7C02%7Cquentin.schulz%40cherry.de%7C6df77e4e73434d36a6fd08dcec67c21c%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C638645177611979168%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata=uNnWR0Oux0BlNhpe20Xj4%2FEtGQJv%2FsU1hapm4fGn7Qk%3D&reserved=0
>> ([FDRC1:FDRC0] = [01] -> Software-RPM Control Mode (Fan Speed
>> Regulator) according to the datasheet).
>
> Ah, SENSOR_DEVICE_ATTR_RW(fan1_target, fan, IDX_FAN1_TARGET)...
> How did I miss that? Hmm... Maybe I was looking at some older
> local branch, which happened not to include that commit.
>
> Anywyay, good to know, thanks.
>
>> In any case, we cannot compare those for our products as we do not
>> have a genuine AMC6821 but a handmade simulation of the IP we run in
>> an MCU.
>
> I seem to remember your MCU that performs a few tasks, back from
> some related discussions. I wonder what was the reason to implement
> it in software, instead of using actual fan controller chip?
>
This predates my joining the company, so... I don't know.
What I can say is, we have the following emulated in the MCU:
- custom CAN over USB (UCAN; upstreamed already)
- ISL1208 RTC
- AMC6821 FAN controller
- custom PWM controller (upstreaming pending)
- a few bytes of NVRAM (AT24-based; upstreaming pending)
- uncontrollable (from SoC PoV) watchdog, allows another MCU/system to
trigger a full system reset
- possibly, custom HW watchdog controllable over I2C (required to fix a
very odd corner case in HW on PX30 Ringneck)
Possibly more if we have the need for it and it fits into the MCU flash :)
I assume this was born out of necessity to add support for CAN on RK3399
Puma since there's no CAN controller inside the SoC?
I also think ISL1208 and AMC6821 aren't that easy to source anymore
(RK3399 Puma has that MCU and its support started in ~2018 I seem to
recall?). Considering the quantities and prices we get for the two MCUs
flavors we have and how space constrained we are on some products,
especially the uQ7 (PX30 Ringneck), it was probably I wise decision. The
second MCU flavor came because STM32 was impossible to source at
reasonable prices during the shortage 2-4 years ago.
This also means we can expand the set of features over time (which we
are for example, with the custom PWM controller, NVRAM and I2C watchdog)
since the MCU can be flashed once in the field too.
Obviously, you replace component cost and footprint with MCU FW
development, so it's not necessarily cost-efficient but I'm not the one
running the numbers so wouldn't be able to tell you ;)
Cheers,
Quentin
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH v2 06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards
2024-10-14 16:29 ` Quentin Schulz
@ 2024-10-14 17:21 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-14 17:21 UTC (permalink / raw)
To: Quentin Schulz
Cc: Heiko Stuebner, linux-rockchip, linux-arm-kernel, devicetree,
Quentin Schulz, Klaus Goger
Hello Quentin,
On 2024-10-14 18:29, Quentin Schulz wrote:
> On 10/14/24 5:49 PM, Dragan Simic wrote:
>> On 2024-10-14 17:39, Quentin Schulz wrote:
>>> On 10/9/24 9:16 AM, Dragan Simic wrote:
>>>> On 2024-10-08 22:39, Heiko Stuebner wrote:
>>>>> All Theobroma boards use a ti,amc6821 as fan controller.
>>>>> It normally runs in an automatically controlled way and while it
>>>>> may be
>>>>> possible to use it as part of a dt-based thermal management, this
>>>>> is
>>>>> not yet specified in the binding, nor implemented in any kernel.
>>>>>
>>>>> Newer boards already don't contain that #cooling-cells property,
>>>>> but
>>>>> older ones do. So remove them for now, they can be re-added if
>>>>> thermal
>>>>> integration gets implemented in the future.
>>>>>
>>>>> Fixes: c484cf93f61b ("arm64: dts: rockchip: add PX30-µQ7 (Ringneck)
>>>>> SoM with Haikou baseboard")
>>>>> Fixes: d99a02bcfa81 ("arm64: dts: rockchip: add RK3368-uQ7 (Lion)
>>>>> SoM")
>>>>> Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma)
>>>>> SoM")
>>>>> Cc: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>>>>> Cc: Klaus Goger <klaus.goger@theobroma-systems.com>
>>>>> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
>>>>> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
>>>>
>>>> Looking good to me, thanks for the patch. In addition to the
>>>> amc6821
>>>> driver currently not supporting full integration into the thermal
>>>> framework, the "fan" DT node also isn't referenced in any cooling
>>>> map,
>>>> so having it define the "cooling-cells" property is of no use.
>>>>
>>>> By the way, it would be nice to see the amc6821 driver supporting
>>>> fan
>>>> speed regulation, and test it to check who does a better job when it
>>>> comes to cooling and fan speed regulation, the thermal framework or
>>>> the chip's built-in logic. :)
>>>
>>> Wasn't this feature added this summer by Guenter?
>>>
>>> c.f. https://eur02.safelinks.protection.outlook.com/?
>>> url=https%3A%2F%2Fgit.kernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git%2Fcommit%2Fdrivers%2Fhwmon%2Famc6821.c%3Fid%3Dbecbd16ed2f8f427239ffda66b5d894008bc56af&data=05%7C02%7Cquentin.schulz%40cherry.de%7C6df77e4e73434d36a6fd08dcec67c21c%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C638645177611948235%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata=4VaZrAKxDUTdEf7avUM1ewHLl9PIgBple841dE55o4w%3D&reserved=0
>>>
>>> Mode 4 is
>>> https://eur02.safelinks.protection.outlook.com/?
>>> url=https%3A%2F%2Felixir.bootlin.com%2Flinux%2Fv6.11.3%2Fsource%2Fdrivers%2Fhwmon%2Famc6821.c%23L367&data=05%7C02%7Cquentin.schulz%40cherry.de%7C6df77e4e73434d36a6fd08dcec67c21c%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C638645177611979168%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata=uNnWR0Oux0BlNhpe20Xj4%2FEtGQJv%2FsU1hapm4fGn7Qk%3D&reserved=0
>>> ([FDRC1:FDRC0] = [01] -> Software-RPM Control Mode (Fan Speed
>>> Regulator) according to the datasheet).
>>
>> Ah, SENSOR_DEVICE_ATTR_RW(fan1_target, fan, IDX_FAN1_TARGET)...
>> How did I miss that? Hmm... Maybe I was looking at some older
>> local branch, which happened not to include that commit.
>>
>> Anywyay, good to know, thanks.
>>
>>> In any case, we cannot compare those for our products as we do not
>>> have a genuine AMC6821 but a handmade simulation of the IP we run in
>>> an MCU.
>>
>> I seem to remember your MCU that performs a few tasks, back from
>> some related discussions. I wonder what was the reason to implement
>> it in software, instead of using actual fan controller chip?
>
> This predates my joining the company, so... I don't know.
>
> What I can say is, we have the following emulated in the MCU:
> - custom CAN over USB (UCAN; upstreamed already)
> - ISL1208 RTC
> - AMC6821 FAN controller
> - custom PWM controller (upstreaming pending)
> - a few bytes of NVRAM (AT24-based; upstreaming pending)
> - uncontrollable (from SoC PoV) watchdog, allows another MCU/system to
> trigger a full system reset
> - possibly, custom HW watchdog controllable over I2C (required to fix
> a very odd corner case in HW on PX30 Ringneck)
Nice, that's quite a lot of emulated stuff.
> Possibly more if we have the need for it and it fits into the MCU flash
> :)
That's one of the benefits that come with an approach like this.
It's like some kind of PaaS (or whatever is the "cool" thing these
days) for hardware design. :)
> I assume this was born out of necessity to add support for CAN on
> RK3399 Puma since there's no CAN controller inside the SoC?
Could be, and the additional functionality, also required for the
board, was then just "offloaded" to the same MCU.
> I also think ISL1208 and AMC6821 aren't that easy to source anymore
> (RK3399 Puma has that MCU and its support started in ~2018 I seem to
> recall?). Considering the quantities and prices we get for the two
> MCUs flavors we have and how space constrained we are on some
> products, especially the uQ7 (PX30 Ringneck), it was probably I wise
> decision. The second MCU flavor came because STM32 was impossible to
> source at reasonable prices during the shortage 2-4 years ago.
Makes sense. Instead of two or more separate additional chips,
whose availability can change at virtually any point, you now
depend on a single additional chip, which is also, presumably,
more widely used, so should be easier to source.
> This also means we can expand the set of features over time (which we
> are for example, with the custom PWM controller, NVRAM and I2C
> watchdog) since the MCU can be flashed once in the field too.
Yup, just like PaaS, SaaS or whatever. :)
> Obviously, you replace component cost and footprint with MCU FW
> development, so it's not necessarily cost-efficient but I'm not the
> one running the numbers so wouldn't be able to tell you ;)
Also good point. Additional standalone chips are sometimes less
expensive than the equivalent manpower. :)
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 07/14] arm64: dts: rockchip: Fix LED triggers on rk3308-roc-cc
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (5 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:19 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 08/14] arm64: dts: rockchip: remove num-slots property from rk3328-nanopi-r2s-plus Heiko Stuebner
` (7 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip; +Cc: heiko, linux-arm-kernel, devicetree, Andy Yan
There are two LEDs on the board, power and user events.
Currently both are assigned undocumented IR(-remote)
triggers that are probably only part of the vendor-kernel.
To make dtbs check happier, assign the power-led to a generic
default-on trigger and the user led to the documented rc-feedback
trigger that should mostly match its current usage.
Fixes: 4403e1237be3 ("arm64: dts: rockchip: Add devicetree for board roc-rk3308-cc")
Cc: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
index 9232357f4fec..d9e191ad1d77 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
@@ -36,14 +36,14 @@ leds {
power_led: led-0 {
label = "firefly:red:power";
- linux,default-trigger = "ir-power-click";
+ linux,default-trigger = "default-on";
default-state = "on";
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
};
user_led: led-1 {
label = "firefly:blue:user";
- linux,default-trigger = "ir-user-click";
+ linux,default-trigger = "rc-feedback";
default-state = "off";
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
};
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 07/14] arm64: dts: rockchip: Fix LED triggers on rk3308-roc-cc
2024-10-08 20:39 ` [PATCH v2 07/14] arm64: dts: rockchip: Fix LED triggers on rk3308-roc-cc Heiko Stuebner
@ 2024-10-09 7:19 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-09 7:19 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, devicetree, Andy Yan
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> There are two LEDs on the board, power and user events.
> Currently both are assigned undocumented IR(-remote)
> triggers that are probably only part of the vendor-kernel.
>
> To make dtbs check happier, assign the power-led to a generic
> default-on trigger and the user led to the documented rc-feedback
> trigger that should mostly match its current usage.
>
> Fixes: 4403e1237be3 ("arm64: dts: rockchip: Add devicetree for board
> roc-rk3308-cc")
> Cc: Andy Yan <andy.yan@rock-chips.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking rather meh to me, but I guess that's as good as it gets.
Thanks for the patch.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
> b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
> index 9232357f4fec..d9e191ad1d77 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
> @@ -36,14 +36,14 @@ leds {
>
> power_led: led-0 {
> label = "firefly:red:power";
> - linux,default-trigger = "ir-power-click";
> + linux,default-trigger = "default-on";
> default-state = "on";
> gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
> };
>
> user_led: led-1 {
> label = "firefly:blue:user";
> - linux,default-trigger = "ir-user-click";
> + linux,default-trigger = "rc-feedback";
> default-state = "off";
> gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
> };
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 08/14] arm64: dts: rockchip: remove num-slots property from rk3328-nanopi-r2s-plus
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (6 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 07/14] arm64: dts: rockchip: Fix LED triggers on rk3308-roc-cc Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:21 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 09/14] arm64: dts: rockchip: Remove 'enable-active-low' from two boards Heiko Stuebner
` (6 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip; +Cc: heiko, linux-arm-kernel, devicetree, Sergey Bostandzhyan
num-slots was not part of the dw-mmc binding and the last slipage of
one of them seeping in from the vendor kernel was removed way back in
2017. Somehow the nanopi-r2s-plus managed to smuggle another on in the
kernel, so remove that as well.
Fixes: b8c028782922 ("arm64: dts: rockchip: Add DTS for FriendlyARM NanoPi R2S Plus")
Cc: Sergey Bostandzhyan <jin@mediatomb.cc>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
index 3093f607f282..4b9ced67742d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
@@ -24,7 +24,6 @@ &emmc {
disable-wp;
mmc-hs200-1_8v;
non-removable;
- num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
status = "okay";
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 08/14] arm64: dts: rockchip: remove num-slots property from rk3328-nanopi-r2s-plus
2024-10-08 20:39 ` [PATCH v2 08/14] arm64: dts: rockchip: remove num-slots property from rk3328-nanopi-r2s-plus Heiko Stuebner
@ 2024-10-09 7:21 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-09 7:21 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-rockchip, linux-arm-kernel, devicetree, Sergey Bostandzhyan
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> num-slots was not part of the dw-mmc binding and the last slipage of
> one of them seeping in from the vendor kernel was removed way back in
> 2017. Somehow the nanopi-r2s-plus managed to smuggle another on in the
> kernel, so remove that as well.
>
> Fixes: b8c028782922 ("arm64: dts: rockchip: Add DTS for FriendlyARM
> NanoPi R2S Plus")
> Cc: Sergey Bostandzhyan <jin@mediatomb.cc>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. The introduced change
is obviously correct.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
> b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
> index 3093f607f282..4b9ced67742d 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
> @@ -24,7 +24,6 @@ &emmc {
> disable-wp;
> mmc-hs200-1_8v;
> non-removable;
> - num-slots = <1>;
> pinctrl-names = "default";
> pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
> status = "okay";
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 09/14] arm64: dts: rockchip: Remove 'enable-active-low' from two boards
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (7 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 08/14] arm64: dts: rockchip: remove num-slots property from rk3328-nanopi-r2s-plus Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 5:09 ` Michael Riesch
2024-10-09 7:26 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro Heiko Stuebner
` (5 subsequent siblings)
14 siblings, 2 replies; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip
Cc: heiko, linux-arm-kernel, devicetree, Michael Riesch,
Muhammed Efe Cetin
The 'enable-active-low' property is not a valid, because it is the
default behaviour of the fixed regulator.
Only 'enable-active-high' is valid, and when this property is absent
the fixed regulator will act as active low by default.
Both the rk3588-orange-pi-5 and the Wolfvision pf5 io expander overlay
smuggled those enable-active-low properties in, so remove them to
make dtbscheck happier.
Fixes: 28799a7734a0 ("arm64: dts: rockchip: add wolfvision pf5 io expander board")
Cc: Michael Riesch <michael.riesch@wolfvision.net>
Fixes: b6bc755d806e ("arm64: dts: rockchip: Add Orange Pi 5")
Cc: Muhammed Efe Cetin <efectn@6tel.net>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
.../boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
index ebcaeafc3800..fa61633aea15 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
+++ b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
@@ -49,7 +49,6 @@ vcc1v8_eth: vcc1v8-eth-regulator {
vcc3v3_eth: vcc3v3-eth-regulator {
compatible = "regulator-fixed";
- enable-active-low;
gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&vcc3v3_eth_enn>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
index feea6b20a6bf..6b77be643249 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
@@ -71,7 +71,6 @@ vcc5v0_sys: vcc5v0-sys-regulator {
vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
compatible = "regulator-fixed";
- enable-active-low;
gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>;
regulator-name = "vcc_3v3_sd_s0";
regulator-boot-on;
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 09/14] arm64: dts: rockchip: Remove 'enable-active-low' from two boards
2024-10-08 20:39 ` [PATCH v2 09/14] arm64: dts: rockchip: Remove 'enable-active-low' from two boards Heiko Stuebner
@ 2024-10-09 5:09 ` Michael Riesch
2024-10-09 7:26 ` Dragan Simic
1 sibling, 0 replies; 37+ messages in thread
From: Michael Riesch @ 2024-10-09 5:09 UTC (permalink / raw)
To: Heiko Stuebner, linux-rockchip
Cc: linux-arm-kernel, devicetree, Muhammed Efe Cetin
Hi Heiko,
On 10/8/24 22:39, Heiko Stuebner wrote:
> The 'enable-active-low' property is not a valid, because it is the
"is not a valid" -> "is not a valid one"?
> default behaviour of the fixed regulator.
>
> Only 'enable-active-high' is valid, and when this property is absent
> the fixed regulator will act as active low by default.
>
> Both the rk3588-orange-pi-5 and the Wolfvision pf5 io expander overlay
> smuggled those enable-active-low properties in, so remove them to
> make dtbscheck happier.
Ooops :-)
>
> Fixes: 28799a7734a0 ("arm64: dts: rockchip: add wolfvision pf5 io expander board")
> Cc: Michael Riesch <michael.riesch@wolfvision.net>
> Fixes: b6bc755d806e ("arm64: dts: rockchip: Add Orange Pi 5")
> Cc: Muhammed Efe Cetin <efectn@6tel.net>
>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Michael Riesch <michael.riesch@wolfvision.net>
Thanks a lot and best regards,
Michael
> ---
> .../boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso | 1 -
> arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
> index ebcaeafc3800..fa61633aea15 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
> +++ b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
> @@ -49,7 +49,6 @@ vcc1v8_eth: vcc1v8-eth-regulator {
>
> vcc3v3_eth: vcc3v3-eth-regulator {
> compatible = "regulator-fixed";
> - enable-active-low;
> gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW>;
> pinctrl-names = "default";
> pinctrl-0 = <&vcc3v3_eth_enn>;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
> index feea6b20a6bf..6b77be643249 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
> @@ -71,7 +71,6 @@ vcc5v0_sys: vcc5v0-sys-regulator {
>
> vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
> compatible = "regulator-fixed";
> - enable-active-low;
> gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>;
> regulator-name = "vcc_3v3_sd_s0";
> regulator-boot-on;
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH v2 09/14] arm64: dts: rockchip: Remove 'enable-active-low' from two boards
2024-10-08 20:39 ` [PATCH v2 09/14] arm64: dts: rockchip: Remove 'enable-active-low' from two boards Heiko Stuebner
2024-10-09 5:09 ` Michael Riesch
@ 2024-10-09 7:26 ` Dragan Simic
1 sibling, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-09 7:26 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-rockchip, linux-arm-kernel, devicetree, Michael Riesch,
Muhammed Efe Cetin
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> The 'enable-active-low' property is not a valid, because it is the
s/is not a valid/is not valid/
> default behaviour of the fixed regulator.
>
> Only 'enable-active-high' is valid, and when this property is absent
> the fixed regulator will act as active low by default.
>
> Both the rk3588-orange-pi-5 and the Wolfvision pf5 io expander overlay
> smuggled those enable-active-low properties in, so remove them to
> make dtbscheck happier.
>
> Fixes: 28799a7734a0 ("arm64: dts: rockchip: add wolfvision pf5 io
> expander board")
> Cc: Michael Riesch <michael.riesch@wolfvision.net>
> Fixes: b6bc755d806e ("arm64: dts: rockchip: Add Orange Pi 5")
> Cc: Muhammed Efe Cetin <efectn@6tel.net>
>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. According to the bindings
in Documentation/devicetree/bindings/regulator/fixed-regulator.yaml,
only "enable-active-high" is supported.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> .../boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso | 1 -
> arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git
> a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
> b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
> index ebcaeafc3800..fa61633aea15 100644
> ---
> a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
> +++
> b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
> @@ -49,7 +49,6 @@ vcc1v8_eth: vcc1v8-eth-regulator {
>
> vcc3v3_eth: vcc3v3-eth-regulator {
> compatible = "regulator-fixed";
> - enable-active-low;
> gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW>;
> pinctrl-names = "default";
> pinctrl-0 = <&vcc3v3_eth_enn>;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
> b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
> index feea6b20a6bf..6b77be643249 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
> @@ -71,7 +71,6 @@ vcc5v0_sys: vcc5v0-sys-regulator {
>
> vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
> compatible = "regulator-fixed";
> - enable-active-low;
> gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>;
> regulator-name = "vcc_3v3_sd_s0";
> regulator-boot-on;
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (8 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 09/14] arm64: dts: rockchip: Remove 'enable-active-low' from two boards Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 23:13 ` Ondřej Jirman
` (2 more replies)
2024-10-08 20:39 ` [PATCH v2 11/14] ARM: dts: rockchip: fix rk3036 acodec node Heiko Stuebner
` (4 subsequent siblings)
14 siblings, 3 replies; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip
Cc: heiko, linux-arm-kernel, devicetree, Martijn Braam,
Javier Martinez Canillas, Ondrej Jirman
The patch adding display support for the pinephone pro introduced two
regulators that contain pinctrl-names props but no pinctrl-assignments.
Looks like someone forgot the pinctrl settings, so remove the orphans
for now, until that changes.
Fixes: 3e987e1f22b9 ("arm64: dts: rockchip: Add internal display support to rk3399-pinephone-pro")
Cc: Martijn Braam <martijn@brixit.nl>
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Ondrej Jirman <megi@xff.cz>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
index 1a44582a49fb..09a016ea8c76 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
@@ -166,7 +166,6 @@ vcc1v8_lcd: vcc1v8-lcd {
regulator-max-microvolt = <1800000>;
vin-supply = <&vcc3v3_sys>;
gpio = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
};
/* MIPI DSI panel 2.8v supply */
@@ -178,7 +177,6 @@ vcc2v8_lcd: vcc2v8-lcd {
regulator-max-microvolt = <2800000>;
vin-supply = <&vcc3v3_sys>;
gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
};
vibrator {
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro
2024-10-08 20:39 ` [PATCH v2 10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro Heiko Stuebner
@ 2024-10-08 23:13 ` Ondřej Jirman
2024-10-08 23:31 ` Javier Martinez Canillas
2024-10-09 7:30 ` Dragan Simic
2 siblings, 0 replies; 37+ messages in thread
From: Ondřej Jirman @ 2024-10-08 23:13 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-rockchip, linux-arm-kernel, devicetree, Martijn Braam,
Javier Martinez Canillas
Hello Heiko,
On Tue, Oct 08, 2024 at 10:39:36PM GMT, Heiko Stuebner wrote:
> The patch adding display support for the pinephone pro introduced two
> regulators that contain pinctrl-names props but no pinctrl-assignments.
>
> Looks like someone forgot the pinctrl settings, so remove the orphans
> for now, until that changes.
Reviewed-by: Ondrej Jirman <megi@xff.cz>
Thank you,
o.
> Fixes: 3e987e1f22b9 ("arm64: dts: rockchip: Add internal display support to rk3399-pinephone-pro")
> Cc: Martijn Braam <martijn@brixit.nl>
> Cc: Javier Martinez Canillas <javierm@redhat.com>
> Cc: Ondrej Jirman <megi@xff.cz>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
> arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
> index 1a44582a49fb..09a016ea8c76 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
> @@ -166,7 +166,6 @@ vcc1v8_lcd: vcc1v8-lcd {
> regulator-max-microvolt = <1800000>;
> vin-supply = <&vcc3v3_sys>;
> gpio = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> };
>
> /* MIPI DSI panel 2.8v supply */
> @@ -178,7 +177,6 @@ vcc2v8_lcd: vcc2v8-lcd {
> regulator-max-microvolt = <2800000>;
> vin-supply = <&vcc3v3_sys>;
> gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> };
>
> vibrator {
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH v2 10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro
2024-10-08 20:39 ` [PATCH v2 10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro Heiko Stuebner
2024-10-08 23:13 ` Ondřej Jirman
@ 2024-10-08 23:31 ` Javier Martinez Canillas
2024-10-09 7:30 ` Dragan Simic
2 siblings, 0 replies; 37+ messages in thread
From: Javier Martinez Canillas @ 2024-10-08 23:31 UTC (permalink / raw)
To: Heiko Stuebner, linux-rockchip
Cc: heiko, linux-arm-kernel, devicetree, Martijn Braam, Ondrej Jirman
Heiko Stuebner <heiko@sntech.de> writes:
Hello Heiko,
> The patch adding display support for the pinephone pro introduced two
> regulators that contain pinctrl-names props but no pinctrl-assignments.
>
> Looks like someone forgot the pinctrl settings, so remove the orphans
> for now, until that changes.
>
> Fixes: 3e987e1f22b9 ("arm64: dts: rockchip: Add internal display support to rk3399-pinephone-pro")
> Cc: Martijn Braam <martijn@brixit.nl>
> Cc: Javier Martinez Canillas <javierm@redhat.com>
> Cc: Ondrej Jirman <megi@xff.cz>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
--
Best regards,
Javier Martinez Canillas
Core Platforms
Red Hat
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH v2 10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro
2024-10-08 20:39 ` [PATCH v2 10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro Heiko Stuebner
2024-10-08 23:13 ` Ondřej Jirman
2024-10-08 23:31 ` Javier Martinez Canillas
@ 2024-10-09 7:30 ` Dragan Simic
2 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-09 7:30 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-rockchip, linux-arm-kernel, devicetree, Martijn Braam,
Javier Martinez Canillas, Ondrej Jirman
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> The patch adding display support for the pinephone pro introduced two
> regulators that contain pinctrl-names props but no pinctrl-assignments.
>
> Looks like someone forgot the pinctrl settings, so remove the orphans
> for now, until that changes.
>
> Fixes: 3e987e1f22b9 ("arm64: dts: rockchip: Add internal display
> support to rk3399-pinephone-pro")
> Cc: Martijn Braam <martijn@brixit.nl>
> Cc: Javier Martinez Canillas <javierm@redhat.com>
> Cc: Ondrej Jirman <megi@xff.cz>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. The introduced change
is obviously correct.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
> b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
> index 1a44582a49fb..09a016ea8c76 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
> @@ -166,7 +166,6 @@ vcc1v8_lcd: vcc1v8-lcd {
> regulator-max-microvolt = <1800000>;
> vin-supply = <&vcc3v3_sys>;
> gpio = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> };
>
> /* MIPI DSI panel 2.8v supply */
> @@ -178,7 +177,6 @@ vcc2v8_lcd: vcc2v8-lcd {
> regulator-max-microvolt = <2800000>;
> vin-supply = <&vcc3v3_sys>;
> gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> };
>
> vibrator {
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 11/14] ARM: dts: rockchip: fix rk3036 acodec node
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (9 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:33 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 12/14] ARM: dts: rockchip: drop grf reference from rk3036 hdmi Heiko Stuebner
` (3 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip; +Cc: heiko, linux-arm-kernel, devicetree
The acodec node is not conformant to the binding.
Set the correct nodename, use the correct compatible,
add the needed #sound-dai-cells and sort the rockchip,grf
below clocks properties as expected.
Fixes: faea098e1808 ("ARM: dts: rockchip: add core rk3036 dtsi")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/boot/dts/rockchip/rk3036.dtsi | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi
index 96279d1e02fe..37369538483f 100644
--- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
@@ -384,12 +384,13 @@ reboot-mode {
};
};
- acodec: acodec-ana@20030000 {
- compatible = "rk3036-codec";
+ acodec: audio-codec@20030000 {
+ compatible = "rockchip,rk3036-codec";
reg = <0x20030000 0x4000>;
- rockchip,grf = <&grf>;
clock-names = "acodec_pclk";
clocks = <&cru PCLK_ACODEC>;
+ rockchip,grf = <&grf>;
+ #sound-dai-cells = <0>;
status = "disabled";
};
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 11/14] ARM: dts: rockchip: fix rk3036 acodec node
2024-10-08 20:39 ` [PATCH v2 11/14] ARM: dts: rockchip: fix rk3036 acodec node Heiko Stuebner
@ 2024-10-09 7:33 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-09 7:33 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, devicetree
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> The acodec node is not conformant to the binding.
> Set the correct nodename, use the correct compatible,
> add the needed #sound-dai-cells and sort the rockchip,grf
> below clocks properties as expected.
Maybe reflow the commit description a bit, to use the available
column width better. :)
> Fixes: faea098e1808 ("ARM: dts: rockchip: add core rk3036 dtsi")
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. The introduced changes
are obviously correct.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm/boot/dts/rockchip/rk3036.dtsi | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> index 96279d1e02fe..37369538483f 100644
> --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> @@ -384,12 +384,13 @@ reboot-mode {
> };
> };
>
> - acodec: acodec-ana@20030000 {
> - compatible = "rk3036-codec";
> + acodec: audio-codec@20030000 {
> + compatible = "rockchip,rk3036-codec";
> reg = <0x20030000 0x4000>;
> - rockchip,grf = <&grf>;
> clock-names = "acodec_pclk";
> clocks = <&cru PCLK_ACODEC>;
> + rockchip,grf = <&grf>;
> + #sound-dai-cells = <0>;
> status = "disabled";
> };
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 12/14] ARM: dts: rockchip: drop grf reference from rk3036 hdmi
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (10 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 11/14] ARM: dts: rockchip: fix rk3036 acodec node Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:37 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 13/14] ARM: dts: rockchip: Fix the spi controller on rk3036 Heiko Stuebner
` (2 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip; +Cc: heiko, linux-arm-kernel, devicetree, Caesar Wang
Neither the binding nor the driver implementation specify/use the grf
reference provided in the rk3036. And neither does the newer rk3128
user of the hdmi controller. So drop the rockchip,grf property.
Fixes: b7217cf19c63 ("ARM: dts: rockchip: add hdmi device node for rk3036")
Cc: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/boot/dts/rockchip/rk3036.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi
index 37369538483f..09371f07d7b4 100644
--- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
@@ -400,7 +400,6 @@ hdmi: hdmi@20034000 {
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_HDMI>;
clock-names = "pclk";
- rockchip,grf = <&grf>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_ctl>;
#sound-dai-cells = <0>;
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 12/14] ARM: dts: rockchip: drop grf reference from rk3036 hdmi
2024-10-08 20:39 ` [PATCH v2 12/14] ARM: dts: rockchip: drop grf reference from rk3036 hdmi Heiko Stuebner
@ 2024-10-09 7:37 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-09 7:37 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, devicetree, Caesar Wang
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> Neither the binding nor the driver implementation specify/use the grf
> reference provided in the rk3036. And neither does the newer rk3128
> user of the hdmi controller. So drop the rockchip,grf property.
>
> Fixes: b7217cf19c63 ("ARM: dts: rockchip: add hdmi device node for
> rk3036")
> Cc: Caesar Wang <wxt@rock-chips.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. There's nothing about the
"rockchip,grf" property in drivers/gpu/drm/rockchip/inno_hdmi.c.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm/boot/dts/rockchip/rk3036.dtsi | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> index 37369538483f..09371f07d7b4 100644
> --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> @@ -400,7 +400,6 @@ hdmi: hdmi@20034000 {
> interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&cru PCLK_HDMI>;
> clock-names = "pclk";
> - rockchip,grf = <&grf>;
> pinctrl-names = "default";
> pinctrl-0 = <&hdmi_ctl>;
> #sound-dai-cells = <0>;
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 13/14] ARM: dts: rockchip: Fix the spi controller on rk3036
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (11 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 12/14] ARM: dts: rockchip: drop grf reference from rk3036 hdmi Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:42 ` Dragan Simic
2024-10-08 20:39 ` [PATCH v2 14/14] ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin Heiko Stuebner
2024-10-10 20:27 ` [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip; +Cc: heiko, linux-arm-kernel, devicetree, Caesar Wang
Compatible and clock names did not match the existing binding.
So set the correct values and re-order+rename the clocks.
It looks like no rk3036 board did use the spi controller so far,
so this was never detected on a running device yet.
Fixes: f629fcfab2cd ("ARM: dts: rockchip: support the spi for rk3036")
Cc: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/boot/dts/rockchip/rk3036.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi
index 09371f07d7b4..63b9912be06a 100644
--- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
@@ -553,11 +553,11 @@ i2c0: i2c@20072000 {
};
spi: spi@20074000 {
- compatible = "rockchip,rockchip-spi";
+ compatible = "rockchip,rk3036-spi";
reg = <0x20074000 0x1000>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;
- clock-names = "apb-pclk","spi_pclk";
+ clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;
+ clock-names = "spiclk", "apb_pclk";
dmas = <&pdma 8>, <&pdma 9>;
dma-names = "tx", "rx";
pinctrl-names = "default";
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 13/14] ARM: dts: rockchip: Fix the spi controller on rk3036
2024-10-08 20:39 ` [PATCH v2 13/14] ARM: dts: rockchip: Fix the spi controller on rk3036 Heiko Stuebner
@ 2024-10-09 7:42 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-09 7:42 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, devicetree, Caesar Wang
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> Compatible and clock names did not match the existing binding.
> So set the correct values and re-order+rename the clocks.
>
> It looks like no rk3036 board did use the spi controller so far,
> so this was never detected on a running device yet.
Wow, that's quite surprising.
> Fixes: f629fcfab2cd ("ARM: dts: rockchip: support the spi for rk3036")
> Cc: Caesar Wang <wxt@rock-chips.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. It all matches with
what drivers/spi/spi-rockchip.c actually expects.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm/boot/dts/rockchip/rk3036.dtsi | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> index 09371f07d7b4..63b9912be06a 100644
> --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> @@ -553,11 +553,11 @@ i2c0: i2c@20072000 {
> };
>
> spi: spi@20074000 {
> - compatible = "rockchip,rockchip-spi";
> + compatible = "rockchip,rk3036-spi";
> reg = <0x20074000 0x1000>;
> interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;
> - clock-names = "apb-pclk","spi_pclk";
> + clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;
> + clock-names = "spiclk", "apb_pclk";
> dmas = <&pdma 8>, <&pdma 9>;
> dma-names = "tx", "rx";
> pinctrl-names = "default";
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 14/14] ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (12 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 13/14] ARM: dts: rockchip: Fix the spi controller on rk3036 Heiko Stuebner
@ 2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:44 ` Dragan Simic
2024-10-10 20:27 ` [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
14 siblings, 1 reply; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-08 20:39 UTC (permalink / raw)
To: linux-rockchip; +Cc: heiko, linux-arm-kernel, devicetree, Caesar Wang
Both the node name as well as the compatible were not named
according to the binding expectations, fix that.
Fixes: 47bf3a5c9e2a ("ARM: dts: rockchip: add the sound setup for rk3036-kylin board")
Cc: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/boot/dts/rockchip/rk3036-kylin.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
index e32c73d32f0a..2f84e2805712 100644
--- a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
@@ -325,8 +325,8 @@ regulator-state-mem {
&i2c2 {
status = "okay";
- rt5616: rt5616@1b {
- compatible = "rt5616";
+ rt5616: audio-codec@1b {
+ compatible = "realtek,rt5616";
reg = <0x1b>;
clocks = <&cru SCLK_I2S_OUT>;
clock-names = "mclk";
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2 14/14] ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin
2024-10-08 20:39 ` [PATCH v2 14/14] ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin Heiko Stuebner
@ 2024-10-09 7:44 ` Dragan Simic
0 siblings, 0 replies; 37+ messages in thread
From: Dragan Simic @ 2024-10-09 7:44 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, devicetree, Caesar Wang
Hello Heiko,
On 2024-10-08 22:39, Heiko Stuebner wrote:
> Both the node name as well as the compatible were not named
> according to the binding expectations, fix that.
>
> Fixes: 47bf3a5c9e2a ("ARM: dts: rockchip: add the sound setup for
> rk3036-kylin board")
> Cc: Caesar Wang <wxt@rock-chips.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Looking good to me, thanks for the patch. The introduced changes
are obviously correct.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
> arch/arm/boot/dts/rockchip/rk3036-kylin.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
> b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
> index e32c73d32f0a..2f84e2805712 100644
> --- a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
> +++ b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
> @@ -325,8 +325,8 @@ regulator-state-mem {
> &i2c2 {
> status = "okay";
>
> - rt5616: rt5616@1b {
> - compatible = "rt5616";
> + rt5616: audio-codec@1b {
> + compatible = "realtek,rt5616";
> reg = <0x1b>;
> clocks = <&cru SCLK_I2S_OUT>;
> clock-names = "mclk";
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v2 00/14] Fixing some dtbscheck warnings
2024-10-08 20:39 [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
` (13 preceding siblings ...)
2024-10-08 20:39 ` [PATCH v2 14/14] ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin Heiko Stuebner
@ 2024-10-10 20:27 ` Heiko Stuebner
14 siblings, 0 replies; 37+ messages in thread
From: Heiko Stuebner @ 2024-10-10 20:27 UTC (permalink / raw)
To: Heiko Stuebner, linux-rockchip; +Cc: devicetree, linux-arm-kernel
On Tue, 8 Oct 2024 22:39:26 +0200, Heiko Stuebner wrote:
> Fixing dtbs-check warnings should be declared addictive, one starts
> with one warning, then another one and then it's oh, I'll just fix
> this "last" one over and over ;-)
>
> We still have more, if others want to play too :-D .
>
> changes in v2:
> - more fixes
> - use more appropriate txco clk for brcm bluetooth
>
> [...]
Applied, thanks!
[01/14] arm64: dts: rockchip: fix i2c2 pinctrl-names property on anbernic-rg353p/v
commit: f94b934336e30cebae75d4fbe04a2109a3c8fdec
[02/14] arm64: dts: rockchip: Drop regulator-init-microvolt from two boards
commit: 98c3f4a2d61a29a53244ce45e50655140bd47afb
[03/14] arm64: dts: rockchip: Fix bluetooth properties on rk3566 box demo
commit: 2fa98dcc8d3ea2ebbd9e6be778f8bb19231c28be
[04/14] arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards
commit: ea74528aaea5a1dfc8e3de09ef2af37530eca526
[05/14] arm64: dts: rockchip: Remove undocumented supports-emmc property
commit: 1b670212ee3dd9d14c6d39a042dfe4ae79b49b4e
[06/14] arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma boards
commit: 5ed96580568c4f79a0aff11a67f10b3e9229ba86
I've limited the commit to only lion now. Both Puma and Ringneck
loose their #cooling-cells property in the i2c-mux-conversion for
6.13 already and the undocumented property is in the boards so
long already, that it didn't make sense to cause extra merge
conflicts for this.
[07/14] arm64: dts: rockchip: Fix LED triggers on rk3308-roc-cc
commit: 3a53a7187f41ec3db12cf4c2cb0db4ba87c2f3a1
[08/14] arm64: dts: rockchip: remove num-slots property from rk3328-nanopi-r2s-plus
commit: b1f8d3b81d9289e171141a7120093ddefe7bd2f4
[09/14] arm64: dts: rockchip: Remove 'enable-active-low' from two boards
commit: f4d29bebaa6118c1e51e8f1c21ce2b34f43e1479
[10/14] arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro
commit: 8fb9f4ee733c50cc9b6dce2313d1948d6229e804
[11/14] ARM: dts: rockchip: fix rk3036 acodec node
commit: d015181e18070dc53c2dfdcfaa7441567cc990f1
[12/14] ARM: dts: rockchip: drop grf reference from rk3036 hdmi
commit: a30ef8fa0e6d70fcf7e933a876a05bc9ca101472
[13/14] ARM: dts: rockchip: Fix the spi controller on rk3036
commit: 34387c259d42c7e62aa046ffb982c710c8971418
[14/14] ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin
commit: 9f03220ac5717d19d71ae21c9020e4dd56f1efa7
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 37+ messages in thread