imx: imx93-11x11-evk: convert to OF_UPSTREAM

Convert to OF_UPSTREAM for i.MX93 11x11 EVK.

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 0c6f0221b77df4be4058e01bbdf21ebdef70411c..4c6e26cbe3038a7f34c606741e69f72802b23bb3 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1042,7 +1042,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mq-librem5-r4.dtb
 
 dtb-$(CONFIG_ARCH_IMX9) += \
-       imx93-11x11-evk.dtb \
        imx93-var-som-symphony.dtb \
        imx93-phyboard-segin.dtb
 

diff --git a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
index a99ba99bfb4f2c08752472536f2450c8e79fb87e..408e601bc90eb69744ce1198498e01b12f814ca9 100644 (file)
--- a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
@@ -26,6 +26,111 @@
        bootph-pre-ram;
 };
 
+&lpi2c2 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+       clock-frequency = <400000>;
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&pinctrl_lpi2c2>;
+       pinctrl-1 = <&pinctrl_lpi2c2>;
+       status = "okay";
+
+       pmic@25 {
+               compatible = "nxp,pca9451a";
+               reg = <0x25>;
+               interrupt-parent = <&pcal6524>;
+               interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+
+               regulators {
+                       buck1: BUCK1 {
+                               regulator-name = "BUCK1";
+                               regulator-min-microvolt = <650000>;
+                               regulator-max-microvolt = <2237500>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <3125>;
+                       };
+
+                       buck2: BUCK2 {
+                               regulator-name = "BUCK2";
+                               regulator-min-microvolt = <600000>;
+                               regulator-max-microvolt = <2187500>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <3125>;
+                       };
+
+                       buck4: BUCK4{
+                               regulator-name = "BUCK4";
+                               regulator-min-microvolt = <600000>;
+                               regulator-max-microvolt = <3400000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       buck5: BUCK5{
+                               regulator-name = "BUCK5";
+                               regulator-min-microvolt = <600000>;
+                               regulator-max-microvolt = <3400000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       buck6: BUCK6 {
+                               regulator-name = "BUCK6";
+                               regulator-min-microvolt = <600000>;
+                               regulator-max-microvolt = <3400000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo1: LDO1 {
+                               regulator-name = "LDO1";
+                               regulator-min-microvolt = <1600000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo4: LDO4 {
+                               regulator-name = "LDO4";
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo5: LDO5 {
+                               regulator-name = "LDO5";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+               };
+       };
+
+       pcal6524: gpio@22 {
+               compatible = "nxp,pcal6524";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_pcal6524>;
+               reg = <0x22>;
+               gpio-controller;
+               #gpio-cells = <2>;
+               interrupt-controller;
+               #interrupt-cells = <2>;
+               interrupt-parent = <&gpio3>;
+               interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
+       };
+
+       adp5585gpio: gpio@34 {
+               compatible = "adp5585";
+               reg = <0x34>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+};
+
 &aips1 {
        bootph-pre-ram;
        bootph-all;
@@ -44,6 +149,19 @@
 &iomuxc {
        bootph-pre-ram;
        bootph-some-ram;
+
+       pinctrl_lpi2c2: lpi2c2grp {
+               fsl,pins = <
+                       MX93_PAD_I2C2_SCL__LPI2C2_SCL                   0x40000b9e
+                       MX93_PAD_I2C2_SDA__LPI2C2_SDA                   0x40000b9e
+               >;
+       };
+
+       pinctrl_pcal6524: pcal6524grp {
+               fsl,pins = <
+                       MX93_PAD_CCM_CLKO2__GPIO3_IO27                  0x31e
+               >;
+       };
 };
 
 &reg_usdhc2_vmmc {

diff --git a/arch/arm/dts/imx93-11x11-evk.dts b/arch/arm/dts/imx93-11x11-evk.dts
deleted file mode 100644 (file)
index 4322cc3..0000000
--- a/arch/arm/dts/imx93-11x11-evk.dts
+++ /dev/null
@@ -1,322 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright 2022 NXP
- */
-
-/dts-v1/;
-
-#include "imx93.dtsi"
-
-/ {
-       model = "NXP i.MX93 11X11 EVK board";
-       compatible = "fsl,imx93-11x11-evk", "fsl,imx93";
-
-       chosen {
-               stdout-path = &lpuart1;
-       };
-
-       reg_vref_1v8: regulator-adc-vref {
-               compatible = "regulator-fixed";
-               regulator-name = "vref_1v8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-       };
-
-       reg_usdhc2_vmmc: regulator-usdhc2 {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_reg_usdhc2_vmmc>;
-               regulator-name = "VSD_3V3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio3 7 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-};
-
-&adc1 {
-       vref-supply = <&reg_vref_1v8>;
-       status = "okay";
-};
-
-&mu1 {
-       status = "okay";
-};
-
-&mu2 {
-       status = "okay";
-};
-
-&eqos {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_eqos>;
-       phy-mode = "rgmii-id";
-       phy-handle = <&ethphy1>;
-       status = "okay";
-
-       mdio {
-               compatible = "snps,dwmac-mdio";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               clock-frequency = <5000000>;
-
-               ethphy1: ethernet-phy@1 {
-                       reg = <1>;
-                       eee-broken-1000t;
-               };
-       };
-};
-
-&fec {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec>;
-       phy-mode = "rgmii-id";
-       phy-handle = <&ethphy2>;
-       fsl,magic-packet;
-       status = "okay";
-
-       mdio {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               clock-frequency = <5000000>;
-
-               ethphy2: ethernet-phy@2 {
-                       reg = <2>;
-                       eee-broken-1000t;
-               };
-       };
-};
-
-&lpi2c2 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       clock-frequency = <400000>;
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&pinctrl_lpi2c2>;
-       pinctrl-1 = <&pinctrl_lpi2c2>;
-       status = "okay";
-
-       pmic@25 {
-               compatible = "nxp,pca9451a";
-               reg = <0x25>;
-               interrupt-parent = <&pcal6524>;
-               interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
-
-               regulators {
-                       buck1: BUCK1 {
-                               regulator-name = "BUCK1";
-                               regulator-min-microvolt = <650000>;
-                               regulator-max-microvolt = <2237500>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                               regulator-ramp-delay = <3125>;
-                       };
-
-                       buck2: BUCK2 {
-                               regulator-name = "BUCK2";
-                               regulator-min-microvolt = <600000>;
-                               regulator-max-microvolt = <2187500>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                               regulator-ramp-delay = <3125>;
-                       };
-
-                       buck4: BUCK4{
-                               regulator-name = "BUCK4";
-                               regulator-min-microvolt = <600000>;
-                               regulator-max-microvolt = <3400000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       buck5: BUCK5{
-                               regulator-name = "BUCK5";
-                               regulator-min-microvolt = <600000>;
-                               regulator-max-microvolt = <3400000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       buck6: BUCK6 {
-                               regulator-name = "BUCK6";
-                               regulator-min-microvolt = <600000>;
-                               regulator-max-microvolt = <3400000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo1: LDO1 {
-                               regulator-name = "LDO1";
-                               regulator-min-microvolt = <1600000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo4: LDO4 {
-                               regulator-name = "LDO4";
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo5: LDO5 {
-                               regulator-name = "LDO5";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-               };
-       };
-
-       pcal6524: gpio@22 {
-               compatible = "nxp,pcal6524";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_pcal6524>;
-               reg = <0x22>;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
-       };
-
-       adp5585gpio: gpio@34 {
-               compatible = "adp5585";
-               reg = <0x34>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
-};
-
-&lpuart1 { /* console */
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1>;
-       status = "okay";
-};
-
-&usdhc1 {
-       pinctrl-names = "default", "state_100mhz", "state_200mhz";
-       pinctrl-0 = <&pinctrl_usdhc1>;
-       pinctrl-1 = <&pinctrl_usdhc1>;
-       pinctrl-2 = <&pinctrl_usdhc1>;
-       bus-width = <8>;
-       non-removable;
-       status = "okay";
-};
-
-&usdhc2 {
-       pinctrl-names = "default", "state_100mhz", "state_200mhz";
-       pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
-       pinctrl-1 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
-       pinctrl-2 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
-       cd-gpios = <&gpio3 00 GPIO_ACTIVE_LOW>;
-       vmmc-supply = <&reg_usdhc2_vmmc>;
-       bus-width = <4>;
-       status = "okay";
-       no-sdio;
-       no-mmc;
-};
-
-&iomuxc {
-       pinctrl_lpi2c2: lpi2c2grp {
-               fsl,pins = <
-                       MX93_PAD_I2C2_SCL__LPI2C2_SCL                   0x40000b9e
-                       MX93_PAD_I2C2_SDA__LPI2C2_SDA                   0x40000b9e
-               >;
-       };
-
-       pinctrl_pcal6524: pcal6524grp {
-               fsl,pins = <
-                       MX93_PAD_CCM_CLKO2__GPIO3_IO27                  0x31e
-               >;
-       };
-
-       pinctrl_eqos: eqosgrp {
-               fsl,pins = <
-                       MX93_PAD_ENET1_MDC__ENET_QOS_MDC                        0x57e
-                       MX93_PAD_ENET1_MDIO__ENET_QOS_MDIO                      0x57e
-                       MX93_PAD_ENET1_RD0__ENET_QOS_RGMII_RD0                  0x57e
-                       MX93_PAD_ENET1_RD1__ENET_QOS_RGMII_RD1                  0x57e
-                       MX93_PAD_ENET1_RD2__ENET_QOS_RGMII_RD2                  0x57e
-                       MX93_PAD_ENET1_RD3__ENET_QOS_RGMII_RD3                  0x57e
-                       MX93_PAD_ENET1_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK  0x5fe
-                       MX93_PAD_ENET1_RX_CTL__ENET_QOS_RGMII_RX_CTL            0x57e
-                       MX93_PAD_ENET1_TD0__ENET_QOS_RGMII_TD0                  0x57e
-                       MX93_PAD_ENET1_TD1__ENET_QOS_RGMII_TD1                  0x57e
-                       MX93_PAD_ENET1_TD2__ENET_QOS_RGMII_TD2                  0x57e
-                       MX93_PAD_ENET1_TD3__ENET_QOS_RGMII_TD3                  0x57e
-                       MX93_PAD_ENET1_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK  0x5fe
-                       MX93_PAD_ENET1_TX_CTL__ENET_QOS_RGMII_TX_CTL            0x57e
-               >;
-       };
-
-       pinctrl_fec: fecgrp {
-               fsl,pins = <
-                       MX93_PAD_ENET2_MDC__ENET1_MDC                   0x57e
-                       MX93_PAD_ENET2_MDIO__ENET1_MDIO                 0x57e
-                       MX93_PAD_ENET2_RD0__ENET1_RGMII_RD0             0x57e
-                       MX93_PAD_ENET2_RD1__ENET1_RGMII_RD1             0x57e
-                       MX93_PAD_ENET2_RD2__ENET1_RGMII_RD2             0x57e
-                       MX93_PAD_ENET2_RD3__ENET1_RGMII_RD3             0x57e
-                       MX93_PAD_ENET2_RXC__ENET1_RGMII_RXC             0x5fe
-                       MX93_PAD_ENET2_RX_CTL__ENET1_RGMII_RX_CTL       0x57e
-                       MX93_PAD_ENET2_TD0__ENET1_RGMII_TD0             0x57e
-                       MX93_PAD_ENET2_TD1__ENET1_RGMII_TD1             0x57e
-                       MX93_PAD_ENET2_TD2__ENET1_RGMII_TD2             0x57e
-                       MX93_PAD_ENET2_TD3__ENET1_RGMII_TD3             0x57e
-                       MX93_PAD_ENET2_TXC__ENET1_RGMII_TXC             0x5fe
-                       MX93_PAD_ENET2_TX_CTL__ENET1_RGMII_TX_CTL       0x57e
-               >;
-       };
-
-       pinctrl_uart1: uart1grp {
-               fsl,pins = <
-                       MX93_PAD_UART1_RXD__LPUART1_RX                  0x31e
-                       MX93_PAD_UART1_TXD__LPUART1_TX                  0x31e
-               >;
-       };
-
-       pinctrl_usdhc1: usdhc1grp {
-               fsl,pins = <
-                       MX93_PAD_SD1_CLK__USDHC1_CLK            0x15fe
-                       MX93_PAD_SD1_CMD__USDHC1_CMD            0x13fe
-                       MX93_PAD_SD1_DATA0__USDHC1_DATA0        0x13fe
-                       MX93_PAD_SD1_DATA1__USDHC1_DATA1        0x13fe
-                       MX93_PAD_SD1_DATA2__USDHC1_DATA2        0x13fe
-                       MX93_PAD_SD1_DATA3__USDHC1_DATA3        0x13fe
-                       MX93_PAD_SD1_DATA4__USDHC1_DATA4        0x13fe
-                       MX93_PAD_SD1_DATA5__USDHC1_DATA5        0x13fe
-                       MX93_PAD_SD1_DATA6__USDHC1_DATA6        0x13fe
-                       MX93_PAD_SD1_DATA7__USDHC1_DATA7        0x13fe
-                       MX93_PAD_SD1_STROBE__USDHC1_STROBE      0x15fe
-               >;
-       };
-
-       pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp {
-               fsl,pins = <
-                       MX93_PAD_SD2_RESET_B__GPIO3_IO07        0x31e
-               >;
-       };
-
-       pinctrl_usdhc2_gpio: usdhc2gpiogrp {
-               fsl,pins = <
-                       MX93_PAD_SD2_CD_B__GPIO3_IO00           0x31e
-               >;
-       };
-
-       pinctrl_usdhc2: usdhc2grp {
-               fsl,pins = <
-                       MX93_PAD_SD2_CLK__USDHC2_CLK            0x15fe
-                       MX93_PAD_SD2_CMD__USDHC2_CMD            0x13fe
-                       MX93_PAD_SD2_DATA0__USDHC2_DATA0        0x13fe
-                       MX93_PAD_SD2_DATA1__USDHC2_DATA1        0x13fe
-                       MX93_PAD_SD2_DATA2__USDHC2_DATA2        0x13fe
-                       MX93_PAD_SD2_DATA3__USDHC2_DATA3        0x13fe
-                       MX93_PAD_SD2_VSELECT__USDHC2_VSELECT    0x51e
-               >;
-       };
-};

diff --git a/arch/arm/dts/imx93-u-boot.dtsi b/arch/arm/dts/imx93-u-boot.dtsi
index 40e17bbc5ae0c7939825350d5b09a8a4f85d4f75..289aba175843c4899fdae0f9452c7fc7fad9c3d7 100644 (file)
--- a/arch/arm/dts/imx93-u-boot.dtsi
+++ b/arch/arm/dts/imx93-u-boot.dtsi
@@ -86,3 +86,18 @@
                };
        };
 };
+
+&tmu {
+       compatible = "fsl,imx93-tmu";
+       reg = <0x44482000 0x1000>;
+       clocks = <&clk IMX93_CLK_TMC_GATE>;
+       little-endian;
+       fsl,tmu-calibration = <0x0000000e 0x800000da
+                              0x00000029 0x800000e9
+                              0x00000056 0x80000102
+                              0x000000a2 0x8000012a
+                              0x00000116 0x80000166
+                              0x00000195 0x800001a7
+                              0x000001b2 0x800001b6>;
+       #thermal-sensor-cells = <1>;
+};

diff --git a/arch/arm/mach-imx/imx9/Kconfig b/arch/arm/mach-imx/imx9/Kconfig
index b79485f1f752a48600f4b90b63d683d06ba7865a..e892da80fe839bfcfe95c0b252b3da171645b97a 100644 (file)
--- a/arch/arm/mach-imx/imx9/Kconfig
+++ b/arch/arm/mach-imx/imx9/Kconfig
@@ -31,6 +31,7 @@ choice
 config TARGET_IMX93_11X11_EVK
        bool "imx93_11x11_evk"
        select IMX93
+       imply OF_UPSTREAM
 
 config TARGET_IMX93_VAR_SOM
        bool "imx93_var_som"

diff --git a/configs/imx93_11x11_evk_defconfig b/configs/imx93_11x11_evk_defconfig
index db2f2623d89f027ef8eea1ef25a0461531d27e9d..5ad770f91e1033eef4f2547615cd5d8b9179d320 100644 (file)
--- a/configs/imx93_11x11_evk_defconfig
+++ b/configs/imx93_11x11_evk_defconfig
@@ -10,7 +10,7 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x700000
 CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg"
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx93-11x11-evk"
+CONFIG_DEFAULT_DEVICE_TREE="freescale/imx93-11x11-evk"
 CONFIG_SPL_TEXT_BASE=0x2049A000
 CONFIG_TARGET_IMX93_11X11_EVK=y
 CONFIG_SYS_MONITOR_LEN=524288

diff --git a/configs/imx93_11x11_evk_ld_defconfig b/configs/imx93_11x11_evk_ld_defconfig
index 822cad7e3fa2815a9da0cfc324e1cae2a6f93478..abda6d1266294d000eb515d271cc007125c4a502 100644 (file)
--- a/configs/imx93_11x11_evk_ld_defconfig
+++ b/configs/imx93_11x11_evk_ld_defconfig
@@ -10,7 +10,7 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x400000
 CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg"
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx93-11x11-evk"
+CONFIG_DEFAULT_DEVICE_TREE="freescale/imx93-11x11-evk"
 CONFIG_SPL_TEXT_BASE=0x2049A000
 CONFIG_IMX9_LOW_DRIVE_MODE=y
 CONFIG_TARGET_IMX93_11X11_EVK=y