Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update gpiod label and fix bt lagging issue #72

Merged
merged 6 commits into from
Dec 6, 2023
Merged

update gpiod label and fix bt lagging issue #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d272f6a
linux: stable: update gpiod label
Ken-Vamrs Dec 5, 2023
1648f60
dts: add max-speed to 1500000 for bt
Ken-Vamrs Dec 5, 2023
aa33400
modify i2s_8ch_2 to i2s_8ch_0 and modify uart0
Ken-Vamrs Dec 5, 2023
bc32d0e
stable-6.6: rock s0: update gpiod label
Ken-Vamrs Dec 6, 2023
d2fd334
stable-6.6: rock s0: add max-speed to 1500000 for bt
Ken-Vamrs Dec 6, 2023
263fb75
stable-6.6: rock s0: enable overlay support
Ken-Vamrs Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion linux/.stable-6.1/0025-rock-s0/0001-arm64-dts-add-radxa-s0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ new file mode 100644
index 0000000000..f07543e072
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3308-radxa-s0.dts
@@ -0,0 +1,405 @@
@@ -0,0 +1,406 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Akash Gajjar <[email protected]>
Expand Down Expand Up @@ -236,6 +236,7 @@ index 0000000000..f07543e072
+ compatible = "brcm,bcm43430a1-bt";
+ clocks = <&cru SCLK_RTC32K>;
+ clock-names = "lpo";
+ max-speed = <1500000>;
+ device-wakeup-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
+ host-wakeup-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
+ shutdown-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
Expand Down
6 changes: 3 additions & 3 deletions linux/.stable-6.1/0025-rock-s0/0001-linux-dts-add-radxa-s0-gpiod-label.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ index f07543e072..9faa43d5a1 100644
+ "PIN_5", "", "", "PIN_27",
+
+ /* GPIO0_C0-C3 */
+ "", "PIN_15", "PIN_33", "",
+ "PIN_28", "PIN_15", "PIN_33", "",
+ /* GPIO0_C4-C7 */
+ "", "", "", "",
+
Expand All @@ -53,7 +53,7 @@ index f07543e072..9faa43d5a1 100644
+ "", "", "", "",
+
+ /* GPIO1_C0-C3 */
+ "PIN_28", "", "", "",
+ "", "", "", "",
+ /* GPIO1_C4-C7 */
+ "", "", "PIN_21", "PIN_19",
+
Expand All @@ -71,7 +71,7 @@ index f07543e072..9faa43d5a1 100644
+ "PIN_35", "PIN_38", "PIN_36", "PIN_40",
+
+ /* GPIO2_B0-B3 */
+ "PIN_26", "PIN_12", "PIN_31", "PIN_20",
+ "PIN_26", "PIN_12", "PIN_31", "PIN_22",
+ /* GPIO2_B4-B7 */
+ "PIN_32", "PIN_7", "PIN_11", "PIN_18",
+
Expand Down
45 changes: 0 additions & 45 deletions linux/.stable-6.1/0025-rock-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch
View file
Open in desktop

This file was deleted.

33 changes: 33 additions & 0 deletions .../.stable-6.1/0025-rock-s0/0004-dts-rock-s0-modify-i2s_8ch_2-to-i2s_8ch_0-and-modify.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From a765ae501d777c4d052f7df98dcba6a61dceb4dc Mon Sep 17 00:00:00 2001
From: bsp <[email protected]>
Date: Tue, 5 Dec 2023 20:26:28 +0800
Subject: [PATCH] dts: rock s0: modify i2s_8ch_2 to i2s_8ch_0 and modify uart0
pinctrl

Signed-off-by: Ken Wang <[email protected]>

diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
index 5f19393f58..4b0aa3600c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
@@ -44,7 +44,7 @@ codec: acodec-sound {
simple-audio-card,widgets =
"Headphone", "Headphones";
simple-audio-card,cpu {
- sound-dai = <&i2s_8ch_2>;
+ sound-dai = <&i2s_8ch_0>;
};
simple-audio-card,codec {
sound-dai = <&acodec>;
@@ -374,6 +374,8 @@ &spi2 {

&uart0 {
status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_xfer>;
};

&uart2 {
--
2.25.1

9 changes: 5 additions & 4 deletions linux/.stable-6.6/0025-rock-s0/0001-arm64-dts-add-rock-s0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ new file mode 100644
index 0000000000..f07543e072
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
@@ -0,0 +1,522 @@
@@ -0,0 +1,523 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Akash Gajjar <[email protected]>
Expand Down Expand Up @@ -237,6 +237,7 @@ index 0000000000..f07543e072
+ compatible = "brcm,bcm43430a1-bt";
+ clocks = <&cru SCLK_RTC32K>;
+ clock-names = "lpo";
+ max-speed = <1500000>;
+ device-wakeup-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
+ host-wakeup-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
+ shutdown-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
Expand Down Expand Up @@ -445,7 +446,7 @@ index 0000000000..f07543e072
+ "PIN_5", "", "", "PIN_27",
+
+ /* GPIO0_C0-C3 */
+ "", "PIN_15", "PIN_33", "",
+ "PIN_28", "PIN_15", "PIN_33", "",
+ /* GPIO0_C4-C7 */
+ "", "", "", "",
+
Expand All @@ -468,7 +469,7 @@ index 0000000000..f07543e072
+ "", "", "", "",
+
+ /* GPIO1_C0-C3 */
+ "PIN_28", "", "", "",
+ "", "", "", "",
+ /* GPIO1_C4-C7 */
+ "", "", "PIN_21", "PIN_19",
+
Expand All @@ -486,7 +487,7 @@ index 0000000000..f07543e072
+ "PIN_35", "PIN_38", "PIN_36", "PIN_40",
+
+ /* GPIO2_B0-B3 */
+ "PIN_26", "PIN_12", "PIN_31", "PIN_20",
+ "PIN_26", "PIN_12", "PIN_31", "PIN_22",
+ /* GPIO2_B4-B7 */
+ "PIN_32", "PIN_7", "PIN_11", "PIN_18",
+
Expand Down
3 changes: 2 additions & 1 deletion linux/.stable-6.6/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi
index 971b1f0ae..66aba816d 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -1,3 +1,21 @@
@@ -1,3 +1,22 @@
+DTC_FLAGS_rk3308-rock-pi-s := -@
+DTC_FLAGS_rk3308-rock-s0 := -@
+DTC_FLAGS_rk3328-rock-pi-e := -@
+DTC_FLAGS_rk3399-rock-4c-plus := -@
+DTC_FLAGS_rk3399-rock-pi-4a-plus := -@
Expand Down