* [PATCH 1/4] arm64: dts: rockchip: Add PD to csi dphy node on rk356x
2024-10-07 10:28 rockchip: Fix several DT validation errors Diederik de Haas
@ 2024-10-07 10:28 ` Diederik de Haas
2024-10-07 10:28 ` [PATCH 2/4] arm64: dts: rockchip: Remove hdmi's 2nd interrupt on rk3328 Diederik de Haas
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Diederik de Haas @ 2024-10-07 10:28 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Diederik de Haas, Dragan Simic, devicetree, linux-arm-kernel,
linux-rockchip, linux-kernel
The "rockchip-inno-csi-dphy.yaml" binding requires the power-domains
property. According to RK3568 TRM Part 1 section 7.3 (page 475) the
CSIHOST is placed in the PD_VI power domain.
So set the csi_dphy node power-domains property accordingly.
Fixes: b6c228401b25 ("arm64: dts: rockchip: add csi dphy node to rk356x")
Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
---
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
index 0ee0ada6f0ab..d581170914f9 100644
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
@@ -1790,6 +1790,7 @@ csi_dphy: phy@fe870000 {
clocks = <&cru PCLK_MIPICSIPHY>;
clock-names = "pclk";
#phy-cells = <0>;
+ power-domains = <&power RK3568_PD_VI>;
resets = <&cru SRST_P_MIPICSIPHY>;
reset-names = "apb";
rockchip,grf = <&grf>;
--
2.45.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/4] arm64: dts: rockchip: Remove hdmi's 2nd interrupt on rk3328
2024-10-07 10:28 rockchip: Fix several DT validation errors Diederik de Haas
2024-10-07 10:28 ` [PATCH 1/4] arm64: dts: rockchip: Add PD to csi dphy node on rk356x Diederik de Haas
@ 2024-10-07 10:28 ` Diederik de Haas
2024-10-07 10:28 ` [PATCH 3/4] arm64: dts: rockchip: Fix wakeup prop names on brcm BT nodes Diederik de Haas
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Diederik de Haas @ 2024-10-07 10:28 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Diederik de Haas, Dragan Simic, devicetree, linux-arm-kernel,
linux-rockchip, linux-kernel
The "synopsys,dw-hdmi.yaml" binding specifies that the interrupts
property of the hdmi node has 'maxItems: 1', so the hdmi node in
rk3328.dtsi having 2 is incorrect.
Paragraph 1.3 ("System Interrupt connection") of the RK3328 TRM v1.1
page 16 and 17 define the following hdmi related interrupts:
- 67 hdmi_intr
- 103 hdmi_intr_wakeup
The difference of 32 is due to a different base used in the TRM.
The RK3399 (which uses the same binding) has '23: hdmi_irq' and
'24: hdmi_wakeup_irq' according to its TRM (page 19).
The RK3568 (also same binding) has '76: hdmi_wakeup' and '77: hdmi'
according to page 17 of its TRM.
In both cases the non-wakeup IRQ was used, so use that too for rk3328.
Helped-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
---
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index b5cbe7cab10b..0597de415fe0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -754,8 +754,7 @@ hdmi: hdmi@ff3c0000 {
compatible = "rockchip,rk3328-dw-hdmi";
reg = <0x0 0xff3c0000 0x0 0x20000>;
reg-io-width = <4>;
- interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_HDMI>,
<&cru SCLK_HDMI_SFC>,
<&cru SCLK_RTC32K>;
--
2.45.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/4] arm64: dts: rockchip: Fix wakeup prop names on brcm BT nodes
2024-10-07 10:28 rockchip: Fix several DT validation errors Diederik de Haas
2024-10-07 10:28 ` [PATCH 1/4] arm64: dts: rockchip: Add PD to csi dphy node on rk356x Diederik de Haas
2024-10-07 10:28 ` [PATCH 2/4] arm64: dts: rockchip: Remove hdmi's 2nd interrupt on rk3328 Diederik de Haas
@ 2024-10-07 10:28 ` Diederik de Haas
2024-10-07 14:06 ` Heiko Stübner
2024-10-07 10:28 ` [PATCH 4/4] arm64: dts: rockchip: Fix reset-gpios prop " Diederik de Haas
2024-10-07 18:44 ` rockchip: Fix several DT validation errors Rob Herring (Arm)
4 siblings, 1 reply; 10+ messages in thread
From: Diederik de Haas @ 2024-10-07 10:28 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Diederik de Haas, Dragan Simic, devicetree, linux-arm-kernel,
linux-rockchip, linux-kernel
The "brcm,bluetooth.yaml" binding has 'device-wakeup-gpios' and
'host-wakeup-gpios' property names.
Fix the ones where '*-wake-gpios' was used.
Note that the "realtek,bluetooth.yaml" binding does use the
'*-wake-gpios' property names.
Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
---
arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 4 ++--
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 4 ++--
2 files changed, 4 insertions(+), 4 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..16fd98698db3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
@@ -450,8 +450,8 @@ 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>;
+ 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>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
index de4c082dce07..7381bb751852 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
@@ -684,8 +684,8 @@ bluetooth {
compatible = "brcm,bcm43438-bt";
clocks = <&rk817 1>;
clock-names = "lpo";
- device-wake-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
- host-wake-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
+ device-wakeup-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
+ host-wakeup-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&bt_enable_h>, <&bt_host_wake_l>, <&bt_wake_h>;
pinctrl-names = "default";
--
2.45.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 3/4] arm64: dts: rockchip: Fix wakeup prop names on brcm BT nodes
2024-10-07 10:28 ` [PATCH 3/4] arm64: dts: rockchip: Fix wakeup prop names on brcm BT nodes Diederik de Haas
@ 2024-10-07 14:06 ` Heiko Stübner
2024-10-07 14:22 ` Diederik de Haas
0 siblings, 1 reply; 10+ messages in thread
From: Heiko Stübner @ 2024-10-07 14:06 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Diederik de Haas
Cc: Diederik de Haas, Dragan Simic, devicetree, linux-arm-kernel,
linux-rockchip, linux-kernel
Am Montag, 7. Oktober 2024, 12:28:18 CEST schrieb Diederik de Haas:
> The "brcm,bluetooth.yaml" binding has 'device-wakeup-gpios' and
> 'host-wakeup-gpios' property names.
> Fix the ones where '*-wake-gpios' was used.
>
> Note that the "realtek,bluetooth.yaml" binding does use the
> '*-wake-gpios' property names.
>
> Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
parts of the commit conflict with a previous one from me ;-) [0]
[0] https://lore.kernel.org/linux-arm-kernel/20240930210112.1993625-7-heiko@sntech.de/T/#m59bdb72d6c22f85fe79716761fedaea2a2e1c73e
> ---
> arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 4 ++--
> arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 4 ++--
> 2 files changed, 4 insertions(+), 4 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..16fd98698db3 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
> @@ -450,8 +450,8 @@ 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>;
> + 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>;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> index de4c082dce07..7381bb751852 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> @@ -684,8 +684,8 @@ bluetooth {
> compatible = "brcm,bcm43438-bt";
> clocks = <&rk817 1>;
> clock-names = "lpo";
> - device-wake-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
> - host-wake-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
> + device-wakeup-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
> + host-wakeup-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
> reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
> pinctrl-0 = <&bt_enable_h>, <&bt_host_wake_l>, <&bt_wake_h>;
> pinctrl-names = "default";
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 3/4] arm64: dts: rockchip: Fix wakeup prop names on brcm BT nodes
2024-10-07 14:06 ` Heiko Stübner
@ 2024-10-07 14:22 ` Diederik de Haas
0 siblings, 0 replies; 10+ messages in thread
From: Diederik de Haas @ 2024-10-07 14:22 UTC (permalink / raw)
To: Heiko Stübner, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: Dragan Simic, devicetree, linux-arm-kernel, linux-rockchip,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2776 bytes --]
Hi,
On Mon Oct 7, 2024 at 4:06 PM CEST, Heiko Stübner wrote:
> Am Montag, 7. Oktober 2024, 12:28:18 CEST schrieb Diederik de Haas:
> > The "brcm,bluetooth.yaml" binding has 'device-wakeup-gpios' and
> > 'host-wakeup-gpios' property names.
> > Fix the ones where '*-wake-gpios' was used.
> >
> > Note that the "realtek,bluetooth.yaml" binding does use the
> > '*-wake-gpios' property names.
> >
> > Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
>
> parts of the commit conflict with a previous one from me ;-) [0]
>
>
> [0] https://lore.kernel.org/linux-arm-kernel/20240930210112.1993625-7-heiko@sntech.de/T/#m59bdb72d6c22f85fe79716761fedaea2a2e1c73e
Haha, I actually did base my changes on one of your patch submissions
("rk3328 cru dt-binding conversion"), but that's the 'wrong' one ;-)
Will drop the rk3566-box-demo.dts one in v2.
Cheers,
Diederik
> > ---
> > arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 4 ++--
> > arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 4 ++--
> > 2 files changed, 4 insertions(+), 4 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..16fd98698db3 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
> > +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
> > @@ -450,8 +450,8 @@ 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>;
> > + 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>;
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> > index de4c082dce07..7381bb751852 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> > @@ -684,8 +684,8 @@ bluetooth {
> > compatible = "brcm,bcm43438-bt";
> > clocks = <&rk817 1>;
> > clock-names = "lpo";
> > - device-wake-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
> > - host-wake-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
> > + device-wakeup-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
> > + host-wakeup-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
> > reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
> > pinctrl-0 = <&bt_enable_h>, <&bt_host_wake_l>, <&bt_wake_h>;
> > pinctrl-names = "default";
> >
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/4] arm64: dts: rockchip: Fix reset-gpios prop on brcm BT nodes
2024-10-07 10:28 rockchip: Fix several DT validation errors Diederik de Haas
` (2 preceding siblings ...)
2024-10-07 10:28 ` [PATCH 3/4] arm64: dts: rockchip: Fix wakeup prop names on brcm BT nodes Diederik de Haas
@ 2024-10-07 10:28 ` Diederik de Haas
2024-10-07 14:04 ` Heiko Stübner
2024-10-07 18:44 ` rockchip: Fix several DT validation errors Rob Herring (Arm)
4 siblings, 1 reply; 10+ messages in thread
From: Diederik de Haas @ 2024-10-07 10:28 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Diederik de Haas, Dragan Simic, devicetree, linux-arm-kernel,
linux-rockchip, linux-kernel
Except for some compatibles, the "brcm,bluetooth.yaml" binding doesn't
allow the 'reset-gpios' property, so replace the invalid ones with the
'shutdown-gpios' property.
Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
---
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 +-
arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
index 7381bb751852..100a2774bbb5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
@@ -686,9 +686,9 @@ bluetooth {
clock-names = "lpo";
device-wakeup-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
- reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&bt_enable_h>, <&bt_host_wake_l>, <&bt_wake_h>;
pinctrl-names = "default";
+ shutdown-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
vbat-supply = <&vcc_wl>;
vddio-supply = <&vcca_1v8_pmu>;
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
index d09e6542e236..3e0cbfff96d8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
@@ -402,9 +402,9 @@ bluetooth {
clock-names = "lpo";
device-wakeup-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
- reset-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake_h &bt_reg_on_h &bt_wake_host_h>;
+ shutdown-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_LOW>;
vbat-supply = <&vcc_3v3>;
vddio-supply = <&vcc_1v8>;
};
--
2.45.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 4/4] arm64: dts: rockchip: Fix reset-gpios prop on brcm BT nodes
2024-10-07 10:28 ` [PATCH 4/4] arm64: dts: rockchip: Fix reset-gpios prop " Diederik de Haas
@ 2024-10-07 14:04 ` Heiko Stübner
2024-10-07 14:28 ` Diederik de Haas
0 siblings, 1 reply; 10+ messages in thread
From: Heiko Stübner @ 2024-10-07 14:04 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Diederik de Haas
Cc: Diederik de Haas, Dragan Simic, devicetree, linux-arm-kernel,
linux-rockchip, linux-kernel
Hey :-) ,
Am Montag, 7. Oktober 2024, 12:28:19 CEST schrieb Diederik de Haas:
> Except for some compatibles, the "brcm,bluetooth.yaml" binding doesn't
> allow the 'reset-gpios' property, so replace the invalid ones with the
> 'shutdown-gpios' property.
this probably needs more explanation in the commit message, because
by name I'd expect reset and shutdown being different functionalities.
But for these cases, things should be good, simply because when looking
at the bt_enable_h pinctrl, that pin really provides the shutdown
functionality.
Heiko
> Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
> ---
> arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 +-
> arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> index 7381bb751852..100a2774bbb5 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> @@ -686,9 +686,9 @@ bluetooth {
> clock-names = "lpo";
> device-wakeup-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
> host-wakeup-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
> - reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
> pinctrl-0 = <&bt_enable_h>, <&bt_host_wake_l>, <&bt_wake_h>;
> pinctrl-names = "default";
> + shutdown-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
> vbat-supply = <&vcc_wl>;
> vddio-supply = <&vcca_1v8_pmu>;
> };
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
> index d09e6542e236..3e0cbfff96d8 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
> @@ -402,9 +402,9 @@ bluetooth {
> clock-names = "lpo";
> device-wakeup-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
> host-wakeup-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
> - reset-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_LOW>;
> pinctrl-names = "default";
> pinctrl-0 = <&bt_host_wake_h &bt_reg_on_h &bt_wake_host_h>;
> + shutdown-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_LOW>;
> vbat-supply = <&vcc_3v3>;
> vddio-supply = <&vcc_1v8>;
> };
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 4/4] arm64: dts: rockchip: Fix reset-gpios prop on brcm BT nodes
2024-10-07 14:04 ` Heiko Stübner
@ 2024-10-07 14:28 ` Diederik de Haas
0 siblings, 0 replies; 10+ messages in thread
From: Diederik de Haas @ 2024-10-07 14:28 UTC (permalink / raw)
To: Heiko Stübner, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: Dragan Simic, devicetree, linux-arm-kernel, linux-rockchip,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3003 bytes --]
Hello :)
On Mon Oct 7, 2024 at 4:04 PM CEST, Heiko Stübner wrote:
> Am Montag, 7. Oktober 2024, 12:28:19 CEST schrieb Diederik de Haas:
> > Except for some compatibles, the "brcm,bluetooth.yaml" binding doesn't
> > allow the 'reset-gpios' property, so replace the invalid ones with the
> > 'shutdown-gpios' property.
>
> this probably needs more explanation in the commit message, because
> by name I'd expect reset and shutdown being different functionalities.
>
> But for these cases, things should be good, simply because when looking
> at the bt_enable_h pinctrl, that pin really provides the shutdown
> functionality.
I guess I forgot to add the reference to page 12 of the
AzureWave-CM256SM datasheet (v1.9):
Pin 34 'BT_REG_ON':
Used by PMU to power up or power down the internal
regulators used by the Bluetooth section. Also, when
deasserted, this pin holds the Bluetooth section in reset. This
pin has an internal 200k ohm pull down resistor that is
enabled by default. It can be disabled through programming.
So my research was more extensive then I actually put in the commit
message ... will fix that in v2.
Cheers,
Diederik
> > Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
> > ---
> > arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 +-
> > arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> > index 7381bb751852..100a2774bbb5 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
> > @@ -686,9 +686,9 @@ bluetooth {
> > clock-names = "lpo";
> > device-wakeup-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
> > host-wakeup-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
> > - reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
> > pinctrl-0 = <&bt_enable_h>, <&bt_host_wake_l>, <&bt_wake_h>;
> > pinctrl-names = "default";
> > + shutdown-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
> > vbat-supply = <&vcc_wl>;
> > vddio-supply = <&vcca_1v8_pmu>;
> > };
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
> > index d09e6542e236..3e0cbfff96d8 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
> > @@ -402,9 +402,9 @@ bluetooth {
> > clock-names = "lpo";
> > device-wakeup-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
> > host-wakeup-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
> > - reset-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_LOW>;
> > pinctrl-names = "default";
> > pinctrl-0 = <&bt_host_wake_h &bt_reg_on_h &bt_wake_host_h>;
> > + shutdown-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_LOW>;
> > vbat-supply = <&vcc_3v3>;
> > vddio-supply = <&vcc_1v8>;
> > };
> >
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: rockchip: Fix several DT validation errors
2024-10-07 10:28 rockchip: Fix several DT validation errors Diederik de Haas
` (3 preceding siblings ...)
2024-10-07 10:28 ` [PATCH 4/4] arm64: dts: rockchip: Fix reset-gpios prop " Diederik de Haas
@ 2024-10-07 18:44 ` Rob Herring (Arm)
4 siblings, 0 replies; 10+ messages in thread
From: Rob Herring (Arm) @ 2024-10-07 18:44 UTC (permalink / raw)
To: Diederik de Haas
Cc: devicetree, Conor Dooley, linux-kernel, linux-arm-kernel,
Dragan Simic, linux-rockchip, Krzysztof Kozlowski, Heiko Stuebner
On Mon, 07 Oct 2024 12:28:15 +0200, Diederik de Haas wrote:
> This is a set of 4 small device-tree validation fixes.
>
> Patch 1 adds the power-domains property to the csi dphy node on rk356x.
> Patch 2 removes the 2nd interrupt from the hdmi node on rk3328.
> Patch 3 replaces 'wake' with 'wakeup' on brcm BT nodes.
> Patch 4 replaces 'reset-gpios' with 'shutdown-gpios' on brcm BT nodes.
>
> arch/arm64/boot/dts/rockchip/rk3328.dtsi | 3 +--
> arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 4 ++--
> arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 6 +++---
> arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi | 2 +-
> arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 +
> 5 files changed, 8 insertions(+), 8 deletions(-)
>
>
My bot found new DTB warnings on the .dts files added or changed in this
series.
Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.
If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:
pip3 install dtschema --upgrade
New warnings running 'make CHECK_DTBS=y rockchip/rk3566-box-demo.dtb' for 20241007105657.6203-2-didi.debian@cknow.org:
arch/arm64/boot/dts/rockchip/rk3566-box-demo.dtb: bluetooth: Unevaluated properties are not allowed ('clock-names' was unexpected)
from schema $id: http://devicetree.org/schemas/net/bluetooth/brcm,bluetooth.yaml#
^ permalink raw reply [flat|nested] 10+ messages in thread