mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
b733b6acb5
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.44 Removed upstreamed: rockchip/patches-6.6/044-v6.11-arm64-dts-rockchip-Add-sdmmc-related-properties-on-r.patch[1] rockchip/patches-6.6/045-v6.11-arm64-dts-rockchip-Add-pinctrl-for-UART0-to-rk3308-r.patch[2] rockchip/patches-6.6/046-v6.11-arm64-dts-rockchip-Add-mdio-and-ethernet-phy-nodes-t.patch[3] rockchip/patches-6.6/048-v6.11-arm64-dts-rockchip-Update-WIFi-BT-related-nodes-on-r.patch[4] rockchip/patches-6.6/310-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch[5] Manually rebased: bcm27xx/patches-6.6/950-0526-mfd-Add-rp1-driver.patch ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.44&id=96155dc8c99e76a0e58932ca5f88148a37af3617 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.44&id=30ee9e5ecc5fd6854a1690ab11e6e6b4851ac9ab 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.44&id=0c4c1b7daf23bccf0da5b65b3cd5b32bfa5a5af4 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.44&id=a86a5685675834732789df202e73153db59d8dcc 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.44&id=a30211c6704899de0616ac0f97601122d899c86d Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16061 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
153 lines
4.4 KiB
Diff
153 lines
4.4 KiB
Diff
From 085021cc825ed90a6ddc4406f608fb8a85745f81 Mon Sep 17 00:00:00 2001
|
|
From: Trevor Woerner <twoerner@gmail.com>
|
|
Date: Tue, 19 Dec 2023 12:38:13 -0500
|
|
Subject: [PATCH] arm64: dts: rockchip: rk3308-rock-pi-s gpio-line-names
|
|
cleanup
|
|
|
|
Perform the following cleanups on a previous patch:
|
|
- indent lines after "gpio-line-names"
|
|
- fix D0-D8 -> D0-D7
|
|
- sort phandle references
|
|
|
|
Fixes: c45de75d7a9a ("arm64: dts: rockchip: add gpio-line-names to rk3308-rock-pi-s")
|
|
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
|
|
Link: https://lore.kernel.org/r/20231219173814.1569-1-twoerner@gmail.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
.../boot/dts/rockchip/rk3308-rock-pi-s.dts | 120 +++++++++---------
|
|
1 file changed, 62 insertions(+), 58 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
|
@@ -166,6 +166,68 @@
|
|
};
|
|
};
|
|
|
|
+&gpio0 {
|
|
+ gpio-line-names =
|
|
+ /* GPIO0_A0 - A7 */
|
|
+ "", "", "", "", "", "", "", "",
|
|
+ /* GPIO0_B0 - B7 */
|
|
+ "", "", "", "header1-pin3 [GPIO0_B3]",
|
|
+ "header1-pin5 [GPIO0_B4]", "", "",
|
|
+ "header1-pin11 [GPIO0_B7]",
|
|
+ /* GPIO0_C0 - C7 */
|
|
+ "header1-pin13 [GPIO0_C0]",
|
|
+ "header1-pin15 [GPIO0_C1]", "", "", "",
|
|
+ "", "", "",
|
|
+ /* GPIO0_D0 - D7 */
|
|
+ "", "", "", "", "", "", "", "";
|
|
+};
|
|
+
|
|
+&gpio1 {
|
|
+ gpio-line-names =
|
|
+ /* GPIO1_A0 - A7 */
|
|
+ "", "", "", "", "", "", "", "",
|
|
+ /* GPIO1_B0 - B7 */
|
|
+ "", "", "", "", "", "", "", "",
|
|
+ /* GPIO1_C0 - C7 */
|
|
+ "", "", "", "", "", "", "header1-pin21 [GPIO1_C6]",
|
|
+ "header1-pin19 [GPIO1_C7]",
|
|
+ /* GPIO1_D0 - D7 */
|
|
+ "header1-pin23 [GPIO1_D0]", "header1-pin24 [GPIO1_D1]",
|
|
+ "", "", "", "", "", "";
|
|
+};
|
|
+
|
|
+&gpio2 {
|
|
+ gpio-line-names =
|
|
+ /* GPIO2_A0 - A7 */
|
|
+ "header1-pin10 [GPIO2_A0]", "header1-pin8 [GPIO2_A1]",
|
|
+ "", "",
|
|
+ "header1-pin7 [GPIO2_A4]", "header1-pin12 [GPIO2_A5]",
|
|
+ "header2-pin46 [GPIO2_A6]", "header1-pin22 [GPIO1_A7]",
|
|
+ /* GPIO2_B0 - B7 */
|
|
+ "header2-pin45 [GPIO2_B0]", "header1-pin18 [GPIO2_B1]",
|
|
+ "header1-pin16 [GPIO2_B2]", "header2-pin44 [GPIO2_B3]",
|
|
+ "header2-pin43 [GPIO2_B4]", "header2-pin28 [GPIO2_B5]",
|
|
+ "header2-pin30 [GPIO2_B6]", "header2-pin32 [GPIO2_B7]",
|
|
+ /* GPIO2_C0 - C7 */
|
|
+ "header2-pin34 [GPIO2_C0]", "", "", "", "", "", "", "",
|
|
+ /* GPIO2_D0 - D7 */
|
|
+ "", "", "", "", "", "", "", "";
|
|
+};
|
|
+
|
|
+&gpio3 {
|
|
+ gpio-line-names =
|
|
+ /* GPIO3_A0 - A7 */
|
|
+ "", "", "", "", "", "", "", "",
|
|
+ /* GPIO3_B0 - B7 */
|
|
+ "", "", "header2-pin42 [GPIO3_B2]",
|
|
+ "header2-pin41 [GPIO3_B3]", "header2-pin40 [GPIO3_B4]",
|
|
+ "header2-pin39 [GPIO3_B5]", "", "",
|
|
+ /* GPIO3_C0 - C7 */
|
|
+ "", "", "", "", "", "", "", "",
|
|
+ /* GPIO3_D0 - D7 */
|
|
+ "", "", "", "", "", "", "", "";
|
|
+};
|
|
+
|
|
&i2c1 {
|
|
status = "okay";
|
|
};
|
|
@@ -315,61 +377,3 @@
|
|
&wdt {
|
|
status = "okay";
|
|
};
|
|
-
|
|
-&gpio0 {
|
|
- gpio-line-names =
|
|
- /* GPIO0_A0 - A7 */
|
|
- "", "", "", "", "", "", "", "",
|
|
- /* GPIO0_B0 - B7 */
|
|
- "", "", "", "header1-pin3 [GPIO0_B3]", "header1-pin5 [GPIO0_B4]",
|
|
- "", "", "header1-pin11 [GPIO0_B7]",
|
|
- /* GPIO0_C0 - C7 */
|
|
- "header1-pin13 [GPIO0_C0]", "header1-pin15 [GPIO0_C1]", "", "", "",
|
|
- "", "", "",
|
|
- /* GPIO0_D0 - D8 */
|
|
- "", "", "", "", "", "", "", "";
|
|
-};
|
|
-
|
|
-&gpio1 {
|
|
- gpio-line-names =
|
|
- /* GPIO1_A0 - A7 */
|
|
- "", "", "", "", "", "", "", "",
|
|
- /* GPIO1_B0 - B7 */
|
|
- "", "", "", "", "", "", "", "",
|
|
- /* GPIO1_C0 - C7 */
|
|
- "", "", "", "", "", "", "header1-pin21 [GPIO1_C6]",
|
|
- "header1-pin19 [GPIO1_C7]",
|
|
- /* GPIO1_D0 - D8 */
|
|
- "header1-pin23 [GPIO1_D0]", "header1-pin24 [GPIO1_D1]", "", "", "",
|
|
- "", "", "";
|
|
-};
|
|
-
|
|
-&gpio2 {
|
|
- gpio-line-names =
|
|
- /* GPIO2_A0 - A7 */
|
|
- "header1-pin10 [GPIO2_A0]", "header1-pin8 [GPIO2_A1]", "", "",
|
|
- "header1-pin7 [GPIO2_A4]", "header1-pin12 [GPIO2_A5]",
|
|
- "header2-pin46 [GPIO2_A6]", "header1-pin22 [GPIO1_A7]",
|
|
- /* GPIO2_B0 - B7 */
|
|
- "header2-pin45 [GPIO2_B0]", "header1-pin18 [GPIO2_B1]",
|
|
- "header1-pin16 [GPIO2_B2]", "header2-pin44 [GPIO2_B3]",
|
|
- "header2-pin43 [GPIO2_B4]", "header2-pin28 [GPIO2_B5]",
|
|
- "header2-pin30 [GPIO2_B6]", "header2-pin32 [GPIO2_B7]",
|
|
- /* GPIO2_C0 - C7 */
|
|
- "header2-pin34 [GPIO2_C0]", "", "", "", "", "", "", "",
|
|
- /* GPIO2_D0 - D8 */
|
|
- "", "", "", "", "", "", "", "";
|
|
-};
|
|
-
|
|
-&gpio3 {
|
|
- gpio-line-names =
|
|
- /* GPIO3_A0 - A7 */
|
|
- "", "", "", "", "", "", "", "",
|
|
- /* GPIO3_B0 - B7 */
|
|
- "", "", "header2-pin42 [GPIO3_B2]", "header2-pin41 [GPIO3_B3]",
|
|
- "header2-pin40 [GPIO3_B4]", "header2-pin39 [GPIO3_B5]", "", "",
|
|
- /* GPIO3_C0 - C7 */
|
|
- "", "", "", "", "", "", "", "",
|
|
- /* GPIO3_D0 - D8 */
|
|
- "", "", "", "", "", "", "", "";
|
|
-};
|