linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm64: dts: rockchip: fix quartz64-a bluetooth configuration
@ 2022-09-25 12:31 Lev Popov
  2022-09-25 12:39 ` Dan Johansen
  0 siblings, 1 reply; 7+ messages in thread
From: Lev Popov @ 2022-09-25 12:31 UTC (permalink / raw)
  To: Rob Herring, Krzysztof Kozlowski, Heiko Stuebner
  Cc: Lev Popov, Peter Geis, Nicolas Frattaroli, Michael Riesch,
	devicetree, linux-arm-kernel, linux-rockchip, linux-kernel

For "Quartz64 Model A" add missing RTS line to the UART interface used by
bluetooth and swap bluetooth host-wakeup and device-wakeup gpio pins to
match the boards physical layout. This changes are necessary to make
bluetooth provided by the wireless module work.

Signed-off-by: Lev Popov <leo@nabam.net>
---
 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
index a05460b92415..91908081c5ed 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
@@ -740,7 +740,7 @@ &uart0 {
 
 &uart1 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
 	status = "okay";
 	uart-has-rtscts;
 
@@ -748,8 +748,8 @@ bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		clocks = <&rk817 1>;
 		clock-names = "lpo";
-		device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
-		host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
+		host-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
+		device-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.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] arm64: dts: rockchip: fix quartz64-a bluetooth configuration
  2022-09-25 12:31 [PATCH] arm64: dts: rockchip: fix quartz64-a bluetooth configuration Lev Popov
@ 2022-09-25 12:39 ` Dan Johansen
  2022-09-25 12:48   ` [PATCH v2] " Lev Popov
  0 siblings, 1 reply; 7+ messages in thread
From: Dan Johansen @ 2022-09-25 12:39 UTC (permalink / raw)
  To: Lev Popov, Rob Herring, Krzysztof Kozlowski, Heiko Stuebner
  Cc: Peter Geis, Nicolas Frattaroli, Michael Riesch, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel


Den 25.09.2022 kl. 14.31 skrev Lev Popov:
> For "Quartz64 Model A" add missing RTS line to the UART interface used by
> bluetooth and swap bluetooth host-wakeup and device-wakeup gpio pins to
> match the boards physical layout. This changes are necessary to make
> bluetooth provided by the wireless module work.
You should add
Fixes:  cd414d5ac1fdeecf0617737e688a1af00858253a (arm64: dts: rockchip: 
rename Quartz64-A bluetooth gpios)
I think, as that was the last commit that touched the gpio lines.
> Signed-off-by: Lev Popov <leo@nabam.net>
> ---
>   arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> index a05460b92415..91908081c5ed 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> @@ -740,7 +740,7 @@ &uart0 {
>   
>   &uart1 {
>   	pinctrl-names = "default";
> -	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
> +	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
>   	status = "okay";
>   	uart-has-rtscts;
>   
> @@ -748,8 +748,8 @@ bluetooth {
>   		compatible = "brcm,bcm43438-bt";
>   		clocks = <&rk817 1>;
>   		clock-names = "lpo";
> -		device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
> -		host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
> +		host-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
> +		device-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>;
-- 
Kind regards
*Dan Johansen*
Project lead of the *Manjaro ARM* project
Manjaro-ARM <https://manjaro.org>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2] arm64: dts: rockchip: fix quartz64-a bluetooth configuration
  2022-09-25 12:39 ` Dan Johansen
@ 2022-09-25 12:48   ` Lev Popov
  2022-09-26  1:46     ` Peter Geis
  0 siblings, 1 reply; 7+ messages in thread
From: Lev Popov @ 2022-09-25 12:48 UTC (permalink / raw)
  To: Dan Johansen
  Cc: Lev Popov, Rob Herring, Krzysztof Kozlowski, Heiko Stuebner,
	Peter Geis, Nicolas Frattaroli, Michael Riesch, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

For "Quartz64 Model A" add missing RTS line to the UART interface used by
bluetooth and swap bluetooth host-wakeup and device-wakeup gpio pins to
match the boards physical layout. This changes are necessary to make
bluetooth provided by the wireless module work.

Fixes:  cd414d5ac1fdeecf0617737e688a1af00858253a (arm64: dts: rockchip: rename Quartz64-A bluetooth gpios)

Signed-off-by: Lev Popov <leo@nabam.net>
---
 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
index a05460b92415..91908081c5ed 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
@@ -740,7 +740,7 @@ &uart0 {
 
 &uart1 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
 	status = "okay";
 	uart-has-rtscts;
 
@@ -748,8 +748,8 @@ bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		clocks = <&rk817 1>;
 		clock-names = "lpo";
-		device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
-		host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
+		host-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
+		device-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.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] arm64: dts: rockchip: fix quartz64-a bluetooth configuration
  2022-09-25 12:48   ` [PATCH v2] " Lev Popov
@ 2022-09-26  1:46     ` Peter Geis
  2022-09-26  5:54       ` [PATCH v3] " Lev Popov
  2022-09-26 12:53       ` [PATCH v4] " Lev Popov
  0 siblings, 2 replies; 7+ messages in thread
From: Peter Geis @ 2022-09-26  1:46 UTC (permalink / raw)
  To: Lev Popov
  Cc: Dan Johansen, Rob Herring, Krzysztof Kozlowski, Heiko Stuebner,
	Nicolas Frattaroli, Michael Riesch, devicetree, linux-arm-kernel,
	linux-rockchip, linux-kernel

On Sun, Sep 25, 2022 at 8:48 AM Lev Popov <leo@nabam.net> wrote:
>
> For "Quartz64 Model A" add missing RTS line to the UART interface used by
> bluetooth and swap bluetooth host-wakeup and device-wakeup gpio pins to
> match the boards physical layout. This changes are necessary to make
> bluetooth provided by the wireless module work.
>
> Fixes:  cd414d5ac1fdeecf0617737e688a1af00858253a (arm64: dts: rockchip: rename Quartz64-A bluetooth gpios)

Good Evening,

That patch only renamed the lines to comply with the dt-bindings, the
correct patch is the one that introduced the original line layout:
Fixes: b33a22a1e7c4 ("arm64: dts: rockchip: add basic dts for Pine64
Quartz64-A")

Very Respectfully,
Peter

>
> Signed-off-by: Lev Popov <leo@nabam.net>
> ---
>  arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> index a05460b92415..91908081c5ed 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> @@ -740,7 +740,7 @@ &uart0 {
>
>  &uart1 {
>         pinctrl-names = "default";
> -       pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
> +       pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
>         status = "okay";
>         uart-has-rtscts;
>
> @@ -748,8 +748,8 @@ bluetooth {
>                 compatible = "brcm,bcm43438-bt";
>                 clocks = <&rk817 1>;
>                 clock-names = "lpo";
> -               device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
> -               host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
> +               host-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
> +               device-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.37.3
>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v3] arm64: dts: rockchip: fix quartz64-a bluetooth configuration
  2022-09-26  1:46     ` Peter Geis
@ 2022-09-26  5:54       ` Lev Popov
  2022-09-26 12:53       ` [PATCH v4] " Lev Popov
  1 sibling, 0 replies; 7+ messages in thread
From: Lev Popov @ 2022-09-26  5:54 UTC (permalink / raw)
  To: Peter Geis
  Cc: Dan Johansen, Lev Popov, Rob Herring, Krzysztof Kozlowski,
	Heiko Stuebner, Nicolas Frattaroli, Michael Riesch, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

For "Quartz64 Model A" add missing RTS line to the UART interface used by
bluetooth and swap bluetooth host-wakeup and device-wakeup gpio pins to
match the boards physical layout. This changes are necessary to make
bluetooth provided by the wireless module work.

Fixes: b33a22a1e7c4248608e533fc4fa524258b3fae84 (arm64: dts: rockchip: add basic dts for Pine64 Quartz64-A)

Signed-off-by: Lev Popov <leo@nabam.net>
---
 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
index a05460b92415..91908081c5ed 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
@@ -740,7 +740,7 @@ &uart0 {
 
 &uart1 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
 	status = "okay";
 	uart-has-rtscts;
 
@@ -748,8 +748,8 @@ bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		clocks = <&rk817 1>;
 		clock-names = "lpo";
-		device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
-		host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
+		host-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
+		device-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.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH v4] arm64: dts: rockchip: fix quartz64-a bluetooth configuration
  2022-09-26  1:46     ` Peter Geis
  2022-09-26  5:54       ` [PATCH v3] " Lev Popov
@ 2022-09-26 12:53       ` Lev Popov
  2022-10-17 12:34         ` Heiko Stuebner
  1 sibling, 1 reply; 7+ messages in thread
From: Lev Popov @ 2022-09-26 12:53 UTC (permalink / raw)
  To: Lev Popov
  Cc: Dan Johansen, Rob Herring, Krzysztof Kozlowski, Heiko Stuebner,
	Peter Geis, Nicolas Frattaroli, Michael Riesch, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

For "Quartz64 Model A" add missing RTS line to the UART interface used by
bluetooth and swap bluetooth host-wakeup and device-wakeup gpio pins to
match the boards physical layout. This changes are necessary to make
bluetooth provided by the wireless module work.

Also set max-speed on the bluetooth device as it's not automatically
detected.

Fixes: b33a22a1e7c4248608e533fc4fa524258b3fae84 (arm64: dts: rockchip: add basic dts for Pine64 Quartz64-A)

Signed-off-by: Lev Popov <leo@nabam.net>
---
 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
index a05460b92415..25a8c781f4e7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
@@ -740,7 +740,7 @@ &uart0 {
 
 &uart1 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
 	status = "okay";
 	uart-has-rtscts;
 
@@ -748,13 +748,14 @@ bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		clocks = <&rk817 1>;
 		clock-names = "lpo";
-		device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
-		host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
+		host-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
+		device-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>;
 		vbat-supply = <&vcc_sys>;
 		vddio-supply = <&vcca1v8_pmu>;
+		max-speed = <3000000>;
 	};
 };
 
-- 
2.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v4] arm64: dts: rockchip: fix quartz64-a bluetooth configuration
  2022-09-26 12:53       ` [PATCH v4] " Lev Popov
@ 2022-10-17 12:34         ` Heiko Stuebner
  0 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2022-10-17 12:34 UTC (permalink / raw)
  To: Lev Popov
  Cc: Heiko Stuebner, Nicolas Frattaroli, Rob Herring, linux-kernel,
	Dan Johansen, Peter Geis, linux-arm-kernel, devicetree,
	Krzysztof Kozlowski, Michael Riesch, linux-rockchip

On Mon, 26 Sep 2022 14:53:48 +0200, Lev Popov wrote:
> For "Quartz64 Model A" add missing RTS line to the UART interface used by
> bluetooth and swap bluetooth host-wakeup and device-wakeup gpio pins to
> match the boards physical layout. This changes are necessary to make
> bluetooth provided by the wireless module work.
> 
> Also set max-speed on the bluetooth device as it's not automatically
> detected.
> 
> [...]

Applied, thanks!

[1/1] arm64: dts: rockchip: fix quartz64-a bluetooth configuration
      commit: 2dcd7e0c821fe9b663f7d3382b6d2faa8edf2129

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-10-17 12:37 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-25 12:31 [PATCH] arm64: dts: rockchip: fix quartz64-a bluetooth configuration Lev Popov
2022-09-25 12:39 ` Dan Johansen
2022-09-25 12:48   ` [PATCH v2] " Lev Popov
2022-09-26  1:46     ` Peter Geis
2022-09-26  5:54       ` [PATCH v3] " Lev Popov
2022-09-26 12:53       ` [PATCH v4] " Lev Popov
2022-10-17 12:34         ` Heiko Stuebner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).