]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
arm64: dts: imx8: split adma ss into dma and audio ss
authorDong Aisheng <aisheng.dong@nxp.com>
Mon, 8 Mar 2021 03:14:27 +0000 (11:14 +0800)
committerShawn Guo <shawnguo@kernel.org>
Mon, 29 Mar 2021 01:49:57 +0000 (09:49 +0800)
amda ss is consisted of dma and audio ss in qxp which are
also used in qm.
Let's split them into two ss for better code reuse.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm64/boot/dts/freescale/imx8-ss-adma.dtsi
arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts
arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi
arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi
arch/arm64/boot/dts/freescale/imx8qxp.dtsi

index ff0696d806542f52c51de8afa3b58964d8d4ffa6..9386d1a59e82b6e8a8b10e460b6708a32a992b5c 100644 (file)
@@ -4,245 +4,5 @@
  *     Dong Aisheng <aisheng.dong@nxp.com>
  */
 
-#include <dt-bindings/clock/imx8-lpcg.h>
-#include <dt-bindings/firmware/imx/rsrc.h>
-
-adma_subsys: bus@59000000 {
-       compatible = "simple-bus";
-       #address-cells = <1>;
-       #size-cells = <1>;
-       ranges = <0x59000000 0x0 0x59000000 0x2000000>;
-
-       dma_ipg_clk: clock-dma-ipg {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <120000000>;
-               clock-output-names = "dma_ipg_clk";
-       };
-
-       dsp_lpcg: clock-controller@59580000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x59580000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&dma_ipg_clk>,
-                        <&dma_ipg_clk>,
-                        <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_4>, <IMX_LPCG_CLK_5>,
-                               <IMX_LPCG_CLK_7>;
-               clock-output-names = "dsp_lpcg_adb_clk",
-                                    "dsp_lpcg_ipg_clk",
-                                    "dsp_lpcg_core_clk";
-               power-domains = <&pd IMX_SC_R_DSP>;
-       };
-
-       dsp_ram_lpcg: clock-controller@59590000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x59590000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_4>;
-               clock-output-names = "dsp_ram_lpcg_ipg_clk";
-               power-domains = <&pd IMX_SC_R_DSP_RAM>;
-       };
-
-       adma_dsp: dsp@596e8000 {
-               compatible = "fsl,imx8qxp-dsp";
-               reg = <0x596e8000 0x88000>;
-               clocks = <&dsp_lpcg IMX_LPCG_CLK_5>,
-                        <&dsp_ram_lpcg IMX_LPCG_CLK_4>,
-                        <&dsp_lpcg IMX_LPCG_CLK_7>;
-               clock-names = "ipg", "ocram", "core";
-               power-domains = <&pd IMX_SC_R_MU_13A>,
-                       <&pd IMX_SC_R_MU_13B>,
-                       <&pd IMX_SC_R_DSP>,
-                       <&pd IMX_SC_R_DSP_RAM>;
-               mbox-names = "txdb0", "txdb1",
-                       "rxdb0", "rxdb1";
-               mboxes = <&lsio_mu13 2 0>,
-                       <&lsio_mu13 2 1>,
-                       <&lsio_mu13 3 0>,
-                       <&lsio_mu13 3 1>;
-               memory-region = <&dsp_reserved>;
-               status = "disabled";
-       };
-
-       adma_lpuart0: serial@5a060000 {
-               reg = <0x5a060000 0x1000>;
-               interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&uart0_lpcg IMX_LPCG_CLK_4>,
-                        <&uart0_lpcg IMX_LPCG_CLK_0>;
-               clock-names = "ipg", "baud";
-               power-domains = <&pd IMX_SC_R_UART_0>;
-               status = "disabled";
-       };
-
-       adma_lpuart1: serial@5a070000 {
-               reg = <0x5a070000 0x1000>;
-               interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&uart1_lpcg IMX_LPCG_CLK_4>,
-                        <&uart1_lpcg IMX_LPCG_CLK_0>;
-               clock-names = "ipg", "baud";
-               power-domains = <&pd IMX_SC_R_UART_1>;
-               status = "disabled";
-       };
-
-       adma_lpuart2: serial@5a080000 {
-               reg = <0x5a080000 0x1000>;
-               interrupts = <GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&uart2_lpcg IMX_LPCG_CLK_4>,
-                        <&uart2_lpcg IMX_LPCG_CLK_0>;
-               clock-names = "ipg", "baud";
-               power-domains = <&pd IMX_SC_R_UART_2>;
-               status = "disabled";
-       };
-
-       adma_lpuart3: serial@5a090000 {
-               reg = <0x5a090000 0x1000>;
-               interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&uart3_lpcg IMX_LPCG_CLK_4>,
-                        <&uart3_lpcg IMX_LPCG_CLK_0>;
-               clock-names = "ipg", "baud";
-               power-domains = <&pd IMX_SC_R_UART_3>;
-               status = "disabled";
-       };
-
-       uart0_lpcg: clock-controller@5a460000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x5a460000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&clk IMX_SC_R_UART_0 IMX_SC_PM_CLK_PER>,
-                        <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
-               clock-output-names = "uart0_lpcg_baud_clk",
-                                    "uart0_lpcg_ipg_clk";
-               power-domains = <&pd IMX_SC_R_UART_0>;
-       };
-
-       uart1_lpcg: clock-controller@5a470000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x5a470000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&clk IMX_SC_R_UART_1 IMX_SC_PM_CLK_PER>,
-                        <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
-               clock-output-names = "uart1_lpcg_baud_clk",
-                                    "uart1_lpcg_ipg_clk";
-               power-domains = <&pd IMX_SC_R_UART_1>;
-       };
-
-       uart2_lpcg: clock-controller@5a480000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x5a480000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&clk IMX_SC_R_UART_2 IMX_SC_PM_CLK_PER>,
-                        <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
-               clock-output-names = "uart2_lpcg_baud_clk",
-                                    "uart2_lpcg_ipg_clk";
-               power-domains = <&pd IMX_SC_R_UART_2>;
-       };
-
-       uart3_lpcg: clock-controller@5a490000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x5a490000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&clk IMX_SC_R_UART_3 IMX_SC_PM_CLK_PER>,
-                        <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
-               clock-output-names = "uart3_lpcg_baud_clk",
-                                    "uart3_lpcg_ipg_clk";
-               power-domains = <&pd IMX_SC_R_UART_3>;
-       };
-
-       adma_i2c0: i2c@5a800000 {
-               reg = <0x5a800000 0x4000>;
-               interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&i2c0_lpcg IMX_LPCG_CLK_0>;
-               clock-names = "per";
-               assigned-clocks = <&clk IMX_SC_R_I2C_0 IMX_SC_PM_CLK_PER>;
-               assigned-clock-rates = <24000000>;
-               power-domains = <&pd IMX_SC_R_I2C_0>;
-               status = "disabled";
-       };
-
-       adma_i2c1: i2c@5a810000 {
-               reg = <0x5a810000 0x4000>;
-               interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&i2c1_lpcg IMX_LPCG_CLK_0>;
-               clock-names = "per";
-               assigned-clocks = <&clk IMX_SC_R_I2C_1 IMX_SC_PM_CLK_PER>;
-               assigned-clock-rates = <24000000>;
-               power-domains = <&pd IMX_SC_R_I2C_1>;
-               status = "disabled";
-       };
-
-       adma_i2c2: i2c@5a820000 {
-               reg = <0x5a820000 0x4000>;
-               interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&i2c2_lpcg IMX_LPCG_CLK_0>;
-               clock-names = "per";
-               assigned-clocks = <&clk IMX_SC_R_I2C_2 IMX_SC_PM_CLK_PER>;
-               assigned-clock-rates = <24000000>;
-               power-domains = <&pd IMX_SC_R_I2C_2>;
-               status = "disabled";
-       };
-
-       adma_i2c3: i2c@5a830000 {
-               reg = <0x5a830000 0x4000>;
-               interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&i2c3_lpcg IMX_LPCG_CLK_0>;
-               clock-names = "per";
-               assigned-clocks = <&clk IMX_SC_R_I2C_3 IMX_SC_PM_CLK_PER>;
-               assigned-clock-rates = <24000000>;
-               power-domains = <&pd IMX_SC_R_I2C_3>;
-               status = "disabled";
-       };
-
-       i2c0_lpcg: clock-controller@5ac00000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x5ac00000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&clk IMX_SC_R_I2C_0 IMX_SC_PM_CLK_PER>,
-                        <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
-               clock-output-names = "i2c0_lpcg_clk",
-                                    "i2c0_lpcg_ipg_clk";
-               power-domains = <&pd IMX_SC_R_I2C_0>;
-       };
-
-       i2c1_lpcg: clock-controller@5ac10000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x5ac10000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&clk IMX_SC_R_I2C_1 IMX_SC_PM_CLK_PER>,
-                        <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
-               clock-output-names = "i2c1_lpcg_clk",
-                                    "i2c1_lpcg_ipg_clk";
-               power-domains = <&pd IMX_SC_R_I2C_1>;
-       };
-
-       i2c2_lpcg: clock-controller@5ac20000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x5ac20000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&clk IMX_SC_R_I2C_2 IMX_SC_PM_CLK_PER>,
-                        <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
-               clock-output-names = "i2c2_lpcg_clk",
-                                    "i2c2_lpcg_ipg_clk";
-               power-domains = <&pd IMX_SC_R_I2C_2>;
-       };
-
-       i2c3_lpcg: clock-controller@5ac30000 {
-               compatible = "fsl,imx8qxp-lpcg";
-               reg = <0x5ac30000 0x10000>;
-               #clock-cells = <1>;
-               clocks = <&clk IMX_SC_R_I2C_3 IMX_SC_PM_CLK_PER>,
-                        <&dma_ipg_clk>;
-               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
-               clock-output-names = "i2c3_lpcg_clk",
-                                    "i2c3_lpcg_ipg_clk";
-               power-domains = <&pd IMX_SC_R_I2C_3>;
-       };
-};
+#include "imx8-ss-audio.dtsi"
+#include "imx8-ss-dma.dtsi"
diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
new file mode 100644 (file)
index 0000000..6c8d75e
--- /dev/null
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018-2019 NXP
+ *     Dong Aisheng <aisheng.dong@nxp.com>
+ */
+
+#include <dt-bindings/clock/imx8-lpcg.h>
+#include <dt-bindings/firmware/imx/rsrc.h>
+
+audio_subsys: bus@59000000 {
+       compatible = "simple-bus";
+       #address-cells = <1>;
+       #size-cells = <1>;
+       ranges = <0x59000000 0x0 0x59000000 0x1000000>;
+
+       audio_ipg_clk: clock-audio-ipg {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <120000000>;
+               clock-output-names = "audio_ipg_clk";
+       };
+
+       dsp_lpcg: clock-controller@59580000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x59580000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&audio_ipg_clk>,
+                        <&audio_ipg_clk>,
+                        <&audio_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_4>, <IMX_LPCG_CLK_5>,
+                               <IMX_LPCG_CLK_7>;
+               clock-output-names = "dsp_lpcg_adb_clk",
+                                    "dsp_lpcg_ipg_clk",
+                                    "dsp_lpcg_core_clk";
+               power-domains = <&pd IMX_SC_R_DSP>;
+       };
+
+       dsp_ram_lpcg: clock-controller@59590000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x59590000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&audio_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_4>;
+               clock-output-names = "dsp_ram_lpcg_ipg_clk";
+               power-domains = <&pd IMX_SC_R_DSP_RAM>;
+       };
+
+       dsp: dsp@596e8000 {
+               compatible = "fsl,imx8qxp-dsp";
+               reg = <0x596e8000 0x88000>;
+               clocks = <&dsp_lpcg IMX_LPCG_CLK_5>,
+                        <&dsp_ram_lpcg IMX_LPCG_CLK_4>,
+                        <&dsp_lpcg IMX_LPCG_CLK_7>;
+               clock-names = "ipg", "ocram", "core";
+               power-domains = <&pd IMX_SC_R_MU_13A>,
+                       <&pd IMX_SC_R_MU_13B>,
+                       <&pd IMX_SC_R_DSP>,
+                       <&pd IMX_SC_R_DSP_RAM>;
+               mbox-names = "txdb0", "txdb1",
+                       "rxdb0", "rxdb1";
+               mboxes = <&lsio_mu13 2 0>,
+                       <&lsio_mu13 2 1>,
+                       <&lsio_mu13 3 0>,
+                       <&lsio_mu13 3 1>;
+               memory-region = <&dsp_reserved>;
+               status = "disabled";
+       };
+};
diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi
new file mode 100644 (file)
index 0000000..960a802
--- /dev/null
@@ -0,0 +1,202 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018-2019 NXP
+ *     Dong Aisheng <aisheng.dong@nxp.com>
+ */
+
+#include <dt-bindings/clock/imx8-lpcg.h>
+#include <dt-bindings/firmware/imx/rsrc.h>
+
+dma_subsys: bus@5a000000 {
+       compatible = "simple-bus";
+       #address-cells = <1>;
+       #size-cells = <1>;
+       ranges = <0x5a000000 0x0 0x5a000000 0x1000000>;
+
+       dma_ipg_clk: clock-dma-ipg {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <120000000>;
+               clock-output-names = "dma_ipg_clk";
+       };
+
+       lpuart0: serial@5a060000 {
+               reg = <0x5a060000 0x1000>;
+               interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&uart0_lpcg IMX_LPCG_CLK_4>,
+                        <&uart0_lpcg IMX_LPCG_CLK_0>;
+               clock-names = "ipg", "baud";
+               power-domains = <&pd IMX_SC_R_UART_0>;
+               status = "disabled";
+       };
+
+       lpuart1: serial@5a070000 {
+               reg = <0x5a070000 0x1000>;
+               interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&uart1_lpcg IMX_LPCG_CLK_4>,
+                        <&uart1_lpcg IMX_LPCG_CLK_0>;
+               clock-names = "ipg", "baud";
+               power-domains = <&pd IMX_SC_R_UART_1>;
+               status = "disabled";
+       };
+
+       lpuart2: serial@5a080000 {
+               reg = <0x5a080000 0x1000>;
+               interrupts = <GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&uart2_lpcg IMX_LPCG_CLK_4>,
+                        <&uart2_lpcg IMX_LPCG_CLK_0>;
+               clock-names = "ipg", "baud";
+               power-domains = <&pd IMX_SC_R_UART_2>;
+               status = "disabled";
+       };
+
+       lpuart3: serial@5a090000 {
+               reg = <0x5a090000 0x1000>;
+               interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&uart3_lpcg IMX_LPCG_CLK_4>,
+                        <&uart3_lpcg IMX_LPCG_CLK_0>;
+               clock-names = "ipg", "baud";
+               power-domains = <&pd IMX_SC_R_UART_3>;
+               status = "disabled";
+       };
+
+       uart0_lpcg: clock-controller@5a460000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x5a460000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&clk IMX_SC_R_UART_0 IMX_SC_PM_CLK_PER>,
+                        <&dma_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
+               clock-output-names = "uart0_lpcg_baud_clk",
+                                    "uart0_lpcg_ipg_clk";
+               power-domains = <&pd IMX_SC_R_UART_0>;
+       };
+
+       uart1_lpcg: clock-controller@5a470000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x5a470000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&clk IMX_SC_R_UART_1 IMX_SC_PM_CLK_PER>,
+                        <&dma_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
+               clock-output-names = "uart1_lpcg_baud_clk",
+                                    "uart1_lpcg_ipg_clk";
+               power-domains = <&pd IMX_SC_R_UART_1>;
+       };
+
+       uart2_lpcg: clock-controller@5a480000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x5a480000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&clk IMX_SC_R_UART_2 IMX_SC_PM_CLK_PER>,
+                        <&dma_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
+               clock-output-names = "uart2_lpcg_baud_clk",
+                                    "uart2_lpcg_ipg_clk";
+               power-domains = <&pd IMX_SC_R_UART_2>;
+       };
+
+       uart3_lpcg: clock-controller@5a490000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x5a490000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&clk IMX_SC_R_UART_3 IMX_SC_PM_CLK_PER>,
+                        <&dma_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
+               clock-output-names = "uart3_lpcg_baud_clk",
+                                    "uart3_lpcg_ipg_clk";
+               power-domains = <&pd IMX_SC_R_UART_3>;
+       };
+
+       i2c0: i2c@5a800000 {
+               reg = <0x5a800000 0x4000>;
+               interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&i2c0_lpcg IMX_LPCG_CLK_0>;
+               clock-names = "per";
+               assigned-clocks = <&clk IMX_SC_R_I2C_0 IMX_SC_PM_CLK_PER>;
+               assigned-clock-rates = <24000000>;
+               power-domains = <&pd IMX_SC_R_I2C_0>;
+               status = "disabled";
+       };
+
+       i2c1: i2c@5a810000 {
+               reg = <0x5a810000 0x4000>;
+               interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&i2c1_lpcg IMX_LPCG_CLK_0>;
+               clock-names = "per";
+               assigned-clocks = <&clk IMX_SC_R_I2C_1 IMX_SC_PM_CLK_PER>;
+               assigned-clock-rates = <24000000>;
+               power-domains = <&pd IMX_SC_R_I2C_1>;
+               status = "disabled";
+       };
+
+       i2c2: i2c@5a820000 {
+               reg = <0x5a820000 0x4000>;
+               interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&i2c2_lpcg IMX_LPCG_CLK_0>;
+               clock-names = "per";
+               assigned-clocks = <&clk IMX_SC_R_I2C_2 IMX_SC_PM_CLK_PER>;
+               assigned-clock-rates = <24000000>;
+               power-domains = <&pd IMX_SC_R_I2C_2>;
+               status = "disabled";
+       };
+
+       i2c3: i2c@5a830000 {
+               reg = <0x5a830000 0x4000>;
+               interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&i2c3_lpcg IMX_LPCG_CLK_0>;
+               clock-names = "per";
+               assigned-clocks = <&clk IMX_SC_R_I2C_3 IMX_SC_PM_CLK_PER>;
+               assigned-clock-rates = <24000000>;
+               power-domains = <&pd IMX_SC_R_I2C_3>;
+               status = "disabled";
+       };
+
+       i2c0_lpcg: clock-controller@5ac00000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x5ac00000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&clk IMX_SC_R_I2C_0 IMX_SC_PM_CLK_PER>,
+                        <&dma_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
+               clock-output-names = "i2c0_lpcg_clk",
+                                    "i2c0_lpcg_ipg_clk";
+               power-domains = <&pd IMX_SC_R_I2C_0>;
+       };
+
+       i2c1_lpcg: clock-controller@5ac10000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x5ac10000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&clk IMX_SC_R_I2C_1 IMX_SC_PM_CLK_PER>,
+                        <&dma_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
+               clock-output-names = "i2c1_lpcg_clk",
+                                    "i2c1_lpcg_ipg_clk";
+               power-domains = <&pd IMX_SC_R_I2C_1>;
+       };
+
+       i2c2_lpcg: clock-controller@5ac20000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x5ac20000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&clk IMX_SC_R_I2C_2 IMX_SC_PM_CLK_PER>,
+                        <&dma_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
+               clock-output-names = "i2c2_lpcg_clk",
+                                    "i2c2_lpcg_ipg_clk";
+               power-domains = <&pd IMX_SC_R_I2C_2>;
+       };
+
+       i2c3_lpcg: clock-controller@5ac30000 {
+               compatible = "fsl,imx8qxp-lpcg";
+               reg = <0x5ac30000 0x10000>;
+               #clock-cells = <1>;
+               clocks = <&clk IMX_SC_R_I2C_3 IMX_SC_PM_CLK_PER>,
+                        <&dma_ipg_clk>;
+               clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
+               clock-output-names = "i2c3_lpcg_clk",
+                                    "i2c3_lpcg_ipg_clk";
+               power-domains = <&pd IMX_SC_R_I2C_3>;
+       };
+};
index b5352706e3f0ac51580c479283f85a5705d71c9c..47bb68823b240edb307b6924e6b1469803234f1b 100644 (file)
        compatible = "einfochips,imx8qxp-ai_ml", "fsl,imx8qxp";
 
        aliases {
-               serial1 = &adma_lpuart1;
-               serial2 = &adma_lpuart2;
-               serial3 = &adma_lpuart3;
+               serial1 = &lpuart1;
+               serial2 = &lpuart2;
+               serial3 = &lpuart3;
        };
 
        chosen {
-               stdout-path = &adma_lpuart2;
+               stdout-path = &lpuart2;
        };
 
        memory@80000000 {
@@ -82,7 +82,7 @@
 };
 
 /* BT */
-&adma_lpuart0 {
+&lpuart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lpuart0>;
        uart-has-rtscts;
 };
 
 /* LS-UART0 */
-&adma_lpuart1 {
+&lpuart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lpuart1>;
        status = "okay";
 };
 
 /* Debug */
-&adma_lpuart2 {
+&lpuart2 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lpuart2>;
        status = "okay";
 };
 
 /* PCI-E UART */
-&adma_lpuart3 {
+&lpuart3 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lpuart3>;
        status = "okay";
index c7336f38760546cd8c7e148c1f115b3f70806b7e..144fc9e82da751c62ce047a121e40283ec3c8acf 100644 (file)
@@ -26,7 +26,7 @@
        };
 };
 
-&adma_i2c1 {
+&i2c1 {
        status = "okay";
 
        /* M41T0M6 real time clock on carrier board */
 };
 
 /* Colibri UART_B */
-&adma_lpuart0 {
+&lpuart0 {
        status= "okay";
 };
 
 /* Colibri UART_C */
-&adma_lpuart2 {
+&lpuart2 {
        status= "okay";
 };
 
 /* Colibri UART_A */
-&adma_lpuart3 {
+&lpuart3 {
        status= "okay";
 };
 
index f38acff0d25c6792a5fec0afb1d2ec3357480a75..89d70e0304339b0ba3b78c9e406cc8a95ac74e36 100644 (file)
@@ -10,7 +10,7 @@
        compatible = "toradex,colibri-imx8x", "fsl,imx8qxp";
 
        chosen {
-               stdout-path = &adma_lpuart3;
+               stdout-path = &lpuart3;
        };
 
        reg_module_3v3: regulator-module-3v3 {
@@ -22,7 +22,7 @@
 };
 
 /* On-module I2C */
-&adma_i2c0 {
+&i2c0 {
        #address-cells = <1>;
        #size-cells = <0>;
        clock-frequency = <100000>;
@@ -49,7 +49,7 @@
 };
 
 /* Colibri I2C */
-&adma_i2c1 {
+&i2c1 {
        #address-cells = <1>;
        #size-cells = <0>;
        clock-frequency = <100000>;
 };
 
 /* Colibri UART_B */
-&adma_lpuart0 {
+&lpuart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lpuart0>;
 };
 
 /* Colibri UART_C */
-&adma_lpuart2 {
+&lpuart2 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lpuart2>;
 };
 
 /* Colibri UART_A */
-&adma_lpuart3 {
+&lpuart3 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lpuart3>, <&pinctrl_lpuart3_ctrl>;
 };
index c40bbb313b780d6a6639ea6c7b4a698d7baa42e4..863232a47004c380cd4b614cce88d79844ad8085 100644 (file)
@@ -12,7 +12,7 @@
        compatible = "fsl,imx8qxp-mek", "fsl,imx8qxp";
 
        chosen {
-               stdout-path = &adma_lpuart0;
+               stdout-path = &lpuart0;
        };
 
        memory@80000000 {
        };
 };
 
-&adma_dsp {
+&dsp {
        status = "okay";
 };
 
-&adma_i2c1 {
+&fec1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_fec1>;
+       phy-mode = "rgmii-id";
+       phy-handle = <&ethphy0>;
+       fsl,magic-packet;
+       status = "okay";
+
+       mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ethphy0: ethernet-phy@0 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reg = <0>;
+               };
+       };
+};
+
+&i2c1 {
        #address-cells = <1>;
        #size-cells = <0>;
        clock-frequency = <100000>;
        };
 };
 
-&adma_lpuart0 {
+&lpuart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lpuart0>;
        status = "okay";
 };
 
-&fec1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec1>;
-       phy-mode = "rgmii-id";
-       phy-handle = <&ethphy0>;
-       fsl,magic-packet;
-       status = "okay";
-
-       mdio {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               ethphy0: ethernet-phy@0 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <0>;
-               };
-       };
-};
-
 &scu_key {
        status = "okay";
 };
index 3dc3238e7ca6855f05a089accaa334c366de0ef1..dc1daa8dc72feba760f5be36178acf1bf4b08182 100644 (file)
@@ -4,34 +4,34 @@
  *     Dong Aisheng <aisheng.dong@nxp.com>
  */
 
-&adma_lpuart0 {
+&lpuart0 {
        compatible = "fsl,imx8qxp-lpuart", "fsl,imx7ulp-lpuart";
 };
 
-&adma_lpuart1 {
+&lpuart1 {
        compatible = "fsl,imx8qxp-lpuart", "fsl,imx7ulp-lpuart";
 };
 
-&adma_lpuart2 {
+&lpuart2 {
        compatible = "fsl,imx8qxp-lpuart", "fsl,imx7ulp-lpuart";
 };
 
-&adma_lpuart3 {
+&lpuart3 {
        compatible = "fsl,imx8qxp-lpuart", "fsl,imx7ulp-lpuart";
 };
 
-&adma_i2c0 {
+&i2c0 {
        compatible = "fsl,imx8qxp-lpi2c", "fsl,imx7ulp-lpi2c";
 };
 
-&adma_i2c1 {
+&i2c1 {
        compatible = "fsl,imx8qxp-lpi2c", "fsl,imx7ulp-lpi2c";
 };
 
-&adma_i2c2 {
+&i2c2 {
        compatible = "fsl,imx8qxp-lpi2c", "fsl,imx7ulp-lpi2c";
 };
 
-&adma_i2c3 {
+&i2c3 {
        compatible = "fsl,imx8qxp-lpi2c", "fsl,imx7ulp-lpi2c";
 };
index 9513bb7b5c894f92a3d718b43461300cd280826a..1e6b4995091e0c6567ebf3d23b9b755cbbfa2c6a 100644 (file)
                gpio5 = &lsio_gpio5;
                gpio6 = &lsio_gpio6;
                gpio7 = &lsio_gpio7;
-               i2c0 = &adma_i2c0;
-               i2c1 = &adma_i2c1;
-               i2c2 = &adma_i2c2;
-               i2c3 = &adma_i2c3;
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
+               i2c2 = &i2c2;
+               i2c3 = &i2c3;
                mmc0 = &usdhc1;
                mmc1 = &usdhc2;
                mmc2 = &usdhc3;
                mu2 = &lsio_mu2;
                mu3 = &lsio_mu3;
                mu4 = &lsio_mu4;
-               serial0 = &adma_lpuart0;
-               serial1 = &adma_lpuart1;
-               serial2 = &adma_lpuart2;
-               serial3 = &adma_lpuart3;
+               serial0 = &lpuart0;
+               serial1 = &lpuart1;
+               serial2 = &lpuart2;
+               serial3 = &lpuart3;
        };
 
        cpus {