diff mbox series

[4/4] arm64: dts: rockchip: Fix reset-gpios prop on brcm BT nodes

Message ID 20241007105657.6203-6-didi.debian@cknow.org (mailing list archive)
State New, archived
Headers show
Series [1/4] arm64: dts: rockchip: Add PD to csi dphy node on rk356x | expand

Commit Message

Diederik de Haas Oct. 7, 2024, 10:28 a.m. UTC
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(-)

Comments

Heiko Stuebner Oct. 7, 2024, 2:04 p.m. UTC | #1
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>;
>  	};
>
Diederik de Haas Oct. 7, 2024, 2:28 p.m. UTC | #2
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>;
> >  	};
> >
diff mbox series

Patch

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>;
 	};