From: Heiko Stuebner <heiko@sntech.de>
To: linux-rockchip@lists.infradead.org
Cc: heiko@sntech.de, linux-arm-kernel@lists.infradead.org,
devicetree@vger.kernel.org, Andy Yan <andyshrk@163.com>
Subject: [PATCH v2 03/14] arm64: dts: rockchip: Fix bluetooth properties on rk3566 box demo
Date: Tue, 8 Oct 2024 22:39:29 +0200 [thread overview]
Message-ID: <20241008203940.2573684-4-heiko@sntech.de> (raw)
In-Reply-To: <20241008203940.2573684-1-heiko@sntech.de>
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
WARNING: multiple messages have this Message-ID (diff)
From: Heiko Stuebner <heiko@sntech.de>
To: linux-rockchip@lists.infradead.org
Cc: heiko@sntech.de, linux-arm-kernel@lists.infradead.org,
devicetree@vger.kernel.org, Andy Yan <andyshrk@163.com>
Subject: [PATCH v2 03/14] arm64: dts: rockchip: Fix bluetooth properties on rk3566 box demo
Date: Tue, 8 Oct 2024 22:39:29 +0200 [thread overview]
Message-ID: <20241008203940.2573684-4-heiko@sntech.de> (raw)
In-Reply-To: <20241008203940.2573684-1-heiko@sntech.de>
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
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2024-10-08 20:40 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
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 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:02 ` Dragan Simic
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
2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 21:07 ` Dragan Simic
2024-10-08 21:07 ` Dragan Simic
2024-10-08 20:39 ` Heiko Stuebner [this message]
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
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
2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 21:15 ` Dragan Simic
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
2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 21:17 ` Dragan Simic
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
2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:16 ` Dragan Simic
2024-10-09 7:16 ` Dragan Simic
2024-10-14 15:39 ` Quentin Schulz
2024-10-14 15:39 ` Quentin Schulz
2024-10-14 15:49 ` Dragan Simic
2024-10-14 15:49 ` Dragan Simic
2024-10-14 16:29 ` Quentin Schulz
2024-10-14 16:29 ` Quentin Schulz
2024-10-14 17:21 ` Dragan Simic
2024-10-14 17:21 ` Dragan Simic
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:19 ` Dragan Simic
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
2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:21 ` Dragan Simic
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
2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 5:09 ` Michael Riesch
2024-10-09 5:09 ` Michael Riesch
2024-10-09 7:26 ` Dragan Simic
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
2024-10-08 20:39 ` Heiko Stuebner
2024-10-08 23:13 ` Ondřej Jirman
2024-10-08 23:13 ` Ondřej Jirman
2024-10-08 23:31 ` Javier Martinez Canillas
2024-10-08 23:31 ` Javier Martinez Canillas
2024-10-09 7:30 ` Dragan Simic
2024-10-09 7:30 ` Dragan Simic
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:33 ` Dragan Simic
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
2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:37 ` Dragan Simic
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
2024-10-08 20:39 ` Heiko Stuebner
2024-10-09 7:42 ` Dragan Simic
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-08 20:39 ` Heiko Stuebner
2024-10-09 7:44 ` Dragan Simic
2024-10-09 7:44 ` Dragan Simic
2024-10-10 20:27 ` [PATCH v2 00/14] Fixing some dtbscheck warnings Heiko Stuebner
2024-10-10 20:27 ` Heiko Stuebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241008203940.2573684-4-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=andyshrk@163.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.