diff mbox series

[3/4] arm64: dts: rockchip: Fix wakeup prop names on brcm BT nodes

Message ID 20241007105657.6203-5-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 
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(-)

Comments

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

Patch

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