riscv: dts: spacemit: Move UARTs under dma-bus for K1

UART devices in Spacemit K1 use dma-bus DMA translations. Move these
nodes under dma-bus to reflect this fact.

Signed-off-by: Vivian Wang <wangruikang@iscas.ac.cn>
Reviewed-by: Guodong Xu <guodong@riscstar.com>
Link: https://lore.kernel.org/r/20250623-k1-dma-buses-rfc-wip-v1-2-c0144082061f@iscas.ac.cn
Signed-off-by: Yixun Lan <dlan@gentoo.org>

diff --git a/arch/riscv/boot/dts/spacemit/k1.dtsi b/arch/riscv/boot/dts/spacemit/k1.dtsi
index 92b631a549f4067a8f53eaf49e3f6b6f18da0975..c025bed96a62bd8289305cbd8865c8b806ae71bd 100644 (file)
--- a/arch/riscv/boot/dts/spacemit/k1.dtsi
+++ b/arch/riscv/boot/dts/spacemit/k1.dtsi
@@ -369,114 +369,6 @@
                        #reset-cells = <1>;
                };
 
-               uart0: serial@d4017000 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xd4017000 0x0 0x100>;
-                       clocks = <&syscon_apbc CLK_UART0>,
-                                <&syscon_apbc CLK_UART0_BUS>;
-                       clock-names = "core", "bus";
-                       interrupts = <42>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "disabled";
-               };
-
-               uart2: serial@d4017100 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xd4017100 0x0 0x100>;
-                       clocks = <&syscon_apbc CLK_UART2>,
-                                <&syscon_apbc CLK_UART2_BUS>;
-                       clock-names = "core", "bus";
-                       interrupts = <44>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "disabled";
-               };
-
-               uart3: serial@d4017200 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xd4017200 0x0 0x100>;
-                       clocks = <&syscon_apbc CLK_UART3>,
-                                <&syscon_apbc CLK_UART3_BUS>;
-                       clock-names = "core", "bus";
-                       interrupts = <45>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "disabled";
-               };
-
-               uart4: serial@d4017300 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xd4017300 0x0 0x100>;
-                       clocks = <&syscon_apbc CLK_UART4>,
-                                <&syscon_apbc CLK_UART4_BUS>;
-                       clock-names = "core", "bus";
-                       interrupts = <46>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "disabled";
-               };
-
-               uart5: serial@d4017400 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xd4017400 0x0 0x100>;
-                       clocks = <&syscon_apbc CLK_UART5>,
-                                <&syscon_apbc CLK_UART5_BUS>;
-                       clock-names = "core", "bus";
-                       interrupts = <47>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "disabled";
-               };
-
-               uart6: serial@d4017500 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xd4017500 0x0 0x100>;
-                       clocks = <&syscon_apbc CLK_UART6>,
-                                <&syscon_apbc CLK_UART6_BUS>;
-                       clock-names = "core", "bus";
-                       interrupts = <48>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "disabled";
-               };
-
-               uart7: serial@d4017600 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xd4017600 0x0 0x100>;
-                       clocks = <&syscon_apbc CLK_UART7>,
-                                <&syscon_apbc CLK_UART7_BUS>;
-                       clock-names = "core", "bus";
-                       interrupts = <49>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "disabled";
-               };
-
-               uart8: serial@d4017700 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xd4017700 0x0 0x100>;
-                       clocks = <&syscon_apbc CLK_UART8>,
-                                <&syscon_apbc CLK_UART8_BUS>;
-                       clock-names = "core", "bus";
-                       interrupts = <50>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "disabled";
-               };
-
-               uart9: serial@d4017800 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xd4017800 0x0 0x100>;
-                       clocks = <&syscon_apbc CLK_UART9>,
-                                <&syscon_apbc CLK_UART9_BUS>;
-                       clock-names = "core", "bus";
-                       interrupts = <51>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "disabled";
-               };
-
                gpio: gpio@d4019000 {
                        compatible = "spacemit,k1-gpio";
                        reg = <0x0 0xd4019000 0x0 0x100>;
@@ -760,16 +652,6 @@
                        #reset-cells = <1>;
                };
 
-               sec_uart1: serial@f0612000 {
-                       compatible = "spacemit,k1-uart", "intel,xscale-uart";
-                       reg = <0x0 0xf0612000 0x0 0x100>;
-                       interrupts = <43>;
-                       clock-frequency = <14857000>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       status = "reserved"; /* for TEE usage */
-               };
-
                camera-bus {
                        compatible = "simple-bus";
                        ranges;
@@ -786,6 +668,134 @@
                        #size-cells = <2>;
                        dma-ranges = <0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>,
                                     <0x1 0x00000000 0x1 0x80000000 0x3 0x00000000>;
+
+                       uart0: serial@d4017000 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xd4017000 0x0 0x100>;
+                               clocks = <&syscon_apbc CLK_UART0>,
+                                        <&syscon_apbc CLK_UART0_BUS>;
+                               clock-names = "core", "bus";
+                               interrupts = <42>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "disabled";
+                       };
+
+                       uart2: serial@d4017100 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xd4017100 0x0 0x100>;
+                               clocks = <&syscon_apbc CLK_UART2>,
+                                        <&syscon_apbc CLK_UART2_BUS>;
+                               clock-names = "core", "bus";
+                               interrupts = <44>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "disabled";
+                       };
+
+                       uart3: serial@d4017200 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xd4017200 0x0 0x100>;
+                               clocks = <&syscon_apbc CLK_UART3>,
+                                        <&syscon_apbc CLK_UART3_BUS>;
+                               clock-names = "core", "bus";
+                               interrupts = <45>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "disabled";
+                       };
+
+                       uart4: serial@d4017300 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xd4017300 0x0 0x100>;
+                               clocks = <&syscon_apbc CLK_UART4>,
+                                        <&syscon_apbc CLK_UART4_BUS>;
+                               clock-names = "core", "bus";
+                               interrupts = <46>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "disabled";
+                       };
+
+                       uart5: serial@d4017400 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xd4017400 0x0 0x100>;
+                               clocks = <&syscon_apbc CLK_UART5>,
+                                        <&syscon_apbc CLK_UART5_BUS>;
+                               clock-names = "core", "bus";
+                               interrupts = <47>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "disabled";
+                       };
+
+                       uart6: serial@d4017500 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xd4017500 0x0 0x100>;
+                               clocks = <&syscon_apbc CLK_UART6>,
+                                        <&syscon_apbc CLK_UART6_BUS>;
+                               clock-names = "core", "bus";
+                               interrupts = <48>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "disabled";
+                       };
+
+                       uart7: serial@d4017600 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xd4017600 0x0 0x100>;
+                               clocks = <&syscon_apbc CLK_UART7>,
+                                        <&syscon_apbc CLK_UART7_BUS>;
+                               clock-names = "core", "bus";
+                               interrupts = <49>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "disabled";
+                       };
+
+                       uart8: serial@d4017700 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xd4017700 0x0 0x100>;
+                               clocks = <&syscon_apbc CLK_UART8>,
+                                        <&syscon_apbc CLK_UART8_BUS>;
+                               clock-names = "core", "bus";
+                               interrupts = <50>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "disabled";
+                       };
+
+                       uart9: serial@d4017800 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xd4017800 0x0 0x100>;
+                               clocks = <&syscon_apbc CLK_UART9>,
+                                        <&syscon_apbc CLK_UART9_BUS>;
+                               clock-names = "core", "bus";
+                               interrupts = <51>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "disabled";
+                       };
+
+                       sec_uart1: serial@f0612000 {
+                               compatible = "spacemit,k1-uart",
+                                            "intel,xscale-uart";
+                               reg = <0x0 0xf0612000 0x0 0x100>;
+                               interrupts = <43>;
+                               clock-frequency = <14857000>;
+                               reg-shift = <2>;
+                               reg-io-width = <4>;
+                               status = "reserved"; /* for TEE usage */
+                       };
                };
 
                multimedia-bus {