]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
riscv: dts: spacemit: k3: add full resource to UART
authorYixun Lan <dlan@kernel.org>
Wed, 4 Mar 2026 07:36:45 +0000 (07:36 +0000)
committerYixun Lan <dlan@kernel.org>
Fri, 13 Mar 2026 11:17:03 +0000 (11:17 +0000)
Previously the UART rely on external bootloader to initialize clock,
pinctrl and reset, to solve this, explicitly adding those resource in
Device Tree, so UART driver will handle them properly.

Link: https://lore.kernel.org/r/20260304-01-dts-uart-full-v1-4-50a0aa53a245@kernel.org
Signed-off-by: Yixun Lan <dlan@kernel.org>
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts
arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi [new file with mode: 0644]
arch/riscv/boot/dts/spacemit/k3.dtsi

index b691304d4b74609e995159896a1e8165d99edb38..b098dbd0e7a15f542e8c44c69fce3157f9e56b82 100644 (file)
@@ -5,6 +5,7 @@
  */
 
 #include "k3.dtsi"
+#include "k3-pinctrl.dtsi"
 
 / {
        model = "SpacemiT K3 Pico-ITX";
@@ -25,5 +26,7 @@
 };
 
 &uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart0_0_cfg>;
        status = "okay";
 };
diff --git a/arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi b/arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi
new file mode 100644 (file)
index 0000000..efb0f15
--- /dev/null
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (c) 2026 Yixun Lan <dlan@kernel.org>
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+
+#define K3_PADCONF(pin, func) (((pin) << 16) | (func))
+
+/* Map GPIO pin to each bank's <index, offset> */
+#define K3_GPIO(x)     (x / 32) (x % 32)
+
+&pinctrl {
+       /omit-if-no-ref/
+       uart0_0_cfg: uart0-0-cfg {
+               uart0-0-pins {
+                       pinmux = <K3_PADCONF(149, 2)>,  /* uart0 tx */
+                                <K3_PADCONF(150, 2)>;  /* uart0 rx */
+
+                       bias-pull-up = <0>;
+                       drive-strength = <25>;
+               };
+       };
+};
index 3683a1a653628657b47fd2c08d4b9802de4ab5b9..a3a8ceddabec49f4a7520f36042030ce633bd673 100644 (file)
@@ -5,6 +5,7 @@
  */
 
 #include <dt-bindings/clock/spacemit,k3-clocks.h>
+#include <dt-bindings/reset/spacemit,k3-resets.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
 /dts-v1/;
                        reg = <0x0 0xd4017000 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART0>,
+                                <&syscon_apbc CLK_APBC_UART0_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART0>;
                        interrupts = <42 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
                        reg = <0x0 0xd4017100 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART2>,
+                                <&syscon_apbc CLK_APBC_UART2_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART2>;
                        interrupts = <44 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
                        reg = <0x0 0xd4017200 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART3>,
+                                <&syscon_apbc CLK_APBC_UART3_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART3>;
                        interrupts = <45 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
                        reg = <0x0 0xd4017300 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART4>,
+                                <&syscon_apbc CLK_APBC_UART4_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART4>;
                        interrupts = <46 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
                        reg = <0x0 0xd4017400 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART5>,
+                                <&syscon_apbc CLK_APBC_UART5_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART5>;
                        interrupts = <47 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
                        reg = <0x0 0xd4017500 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART6>,
+                                <&syscon_apbc CLK_APBC_UART6_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART6>;
                        interrupts = <48 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
                        reg = <0x0 0xd4017600 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART7>,
+                                <&syscon_apbc CLK_APBC_UART7_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART7>;
                        interrupts = <49 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
                        reg = <0x0 0xd4017700 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART8>,
+                                <&syscon_apbc CLK_APBC_UART8_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART8>;
                        interrupts = <50 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
                        reg = <0x0 0xd4017800 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART9>,
+                                <&syscon_apbc CLK_APBC_UART9_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART9>;
                        interrupts = <51 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
                        reg = <0x0 0xd401f000 0x0 0x100>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
-                       clock-frequency = <14700000>;
+                       clocks = <&syscon_apbc CLK_APBC_UART10>,
+                                <&syscon_apbc CLK_APBC_UART10_BUS>;
+                       clock-names = "core", "bus";
+                       resets = <&syscon_apbc RESET_APBC_UART10>;
                        interrupts = <281 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };