]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
imx8mq: pico: Switch OF_UPSTREAM
authorPeng Fan <peng.fan@nxp.com>
Sat, 25 Apr 2026 00:36:55 +0000 (08:36 +0800)
committerFabio Estevam <festevam@gmail.com>
Fri, 15 May 2026 20:31:39 +0000 (17:31 -0300)
arch/arm/dts/imx8mq-pico-pi.dts is almost same as upstream Linux dts,
so switch to OF_UPSTREAM by dropping the U-Boot copy of the dts,
enabling OF_UPSTREAM and updating CONFIG_DEFAULT_DEVICE_TREE.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
arch/arm/dts/Makefile
arch/arm/dts/imx8mq-pico-pi.dts [deleted file]
arch/arm/mach-imx/imx8m/Kconfig
configs/pico-imx8mq_defconfig

index 51f5edcf49fad7bc7fcc04998e86e20c4aff2b8c..d1aa0e2a83535d6300739b40d1b6d33bed285721 100644 (file)
@@ -889,7 +889,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mp-dhcom-picoitx.dtb \
        imx8mp-icore-mx8mp-edimm2.2.dtb \
        imx8mp-msc-sm2s.dtb \
-       imx8mq-pico-pi.dtb \
        imx8mq-kontron-pitx-imx8m.dtb \
        imx8mq-librem5-r4.dtb
 
diff --git a/arch/arm/dts/imx8mq-pico-pi.dts b/arch/arm/dts/imx8mq-pico-pi.dts
deleted file mode 100644 (file)
index 89cbec5..0000000
+++ /dev/null
@@ -1,418 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2018 Wandboard, Org.
- * Copyright 2017 NXP
- *
- * Author: Richard Hu <hakahu@gmail.com>
- */
-
-/dts-v1/;
-
-#include "imx8mq.dtsi"
-#include <dt-bindings/interrupt-controller/irq.h>
-
-/ {
-       model = "TechNexion PICO-PI-8M";
-       compatible = "technexion,pico-pi-imx8m", "fsl,imx8mq";
-
-       chosen {
-               stdout-path = &uart1;
-       };
-
-       pmic_osc: clock-pmic {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               clock-output-names = "pmic_osc";
-       };
-
-       reg_usb_otg_vbus: regulator-usb-otg-vbus {
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_otg_vbus>;
-               compatible = "regulator-fixed";
-               regulator-name = "usb_otg_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&gpio3 14 GPIO_ACTIVE_LOW>;
-       };
-};
-
-&fec1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec1 &pinctrl_enet_3v3>;
-       phy-mode = "rgmii-id";
-       phy-handle = <&ethphy0>;
-       fsl,magic-packet;
-       status = "okay";
-
-       mdio {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               ethphy0: ethernet-phy@1 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <1>;
-               };
-       };
-};
-
-&i2c1 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1>;
-       status = "okay";
-
-       pmic: pmic@4b {
-               reg = <0x4b>;
-               compatible = "rohm,bd71837";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_pmic>;
-               clocks = <&pmic_osc>;
-               clock-names = "osc";
-               clock-output-names = "pmic_clk";
-               interrupt-parent = <&gpio1>;
-               interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
-               interrupt-names = "irq";
-
-               regulators {
-                       buck1: BUCK1 {
-                               regulator-name = "buck1";
-                               regulator-min-microvolt = <700000>;
-                               regulator-max-microvolt = <1300000>;
-                               regulator-boot-on;
-                               regulator-ramp-delay = <1250>;
-                               rohm,dvs-run-voltage = <900000>;
-                               rohm,dvs-idle-voltage = <850000>;
-                               rohm,dvs-suspend-voltage = <800000>;
-                       };
-
-                       buck2: BUCK2 {
-                               regulator-name = "buck2";
-                               regulator-min-microvolt = <700000>;
-                               regulator-max-microvolt = <1300000>;
-                               regulator-boot-on;
-                               regulator-ramp-delay = <1250>;
-                               rohm,dvs-run-voltage = <1000000>;
-                               rohm,dvs-idle-voltage = <900000>;
-                       };
-
-                       buck3: BUCK3 {
-                               regulator-name = "buck3";
-                               regulator-min-microvolt = <700000>;
-                               regulator-max-microvolt = <1300000>;
-                               regulator-boot-on;
-                               rohm,dvs-run-voltage = <1000000>;
-                       };
-
-                       buck4: BUCK4 {
-                               regulator-name = "buck4";
-                               regulator-min-microvolt = <700000>;
-                               regulator-max-microvolt = <1300000>;
-                               regulator-boot-on;
-                               rohm,dvs-run-voltage = <1000000>;
-                       };
-
-                       buck5: BUCK5 {
-                               regulator-name = "buck5";
-                               regulator-min-microvolt = <700000>;
-                               regulator-max-microvolt = <1350000>;
-                               regulator-boot-on;
-                       };
-
-                       buck6: BUCK6 {
-                               regulator-name = "buck6";
-                               regulator-min-microvolt = <3000000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                       };
-
-                       buck7: BUCK7 {
-                               regulator-name = "buck7";
-                               regulator-min-microvolt = <1605000>;
-                               regulator-max-microvolt = <1995000>;
-                               regulator-boot-on;
-                       };
-
-                       buck8: BUCK8 {
-                               regulator-name = "buck8";
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1400000>;
-                               regulator-boot-on;
-                       };
-
-                       ldo1: LDO1 {
-                               regulator-name = "ldo1";
-                               regulator-min-microvolt = <3000000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo2: LDO2 {
-                               regulator-name = "ldo2";
-                               regulator-min-microvolt = <900000>;
-                               regulator-max-microvolt = <900000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo3: LDO3 {
-                               regulator-name = "ldo3";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                       };
-
-                       ldo4: LDO4 {
-                               regulator-name = "ldo4";
-                               regulator-min-microvolt = <900000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-boot-on;
-                       };
-
-                       ldo5: LDO5 {
-                               regulator-name = "ldo5";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                       };
-
-                       ldo6: LDO6 {
-                               regulator-name = "ldo6";
-                               regulator-min-microvolt = <900000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-boot-on;
-                       };
-
-                       ldo7: LDO7 {
-                               regulator-name = "ldo7";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                       };
-               };
-       };
-};
-
-&i2c2 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2>;
-       status = "okay";
-};
-
-&uart1 { /* console */
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1>;
-       status = "okay";
-};
-
-&usdhc1 {
-       assigned-clocks = <&clk IMX8MQ_CLK_USDHC1>;
-       assigned-clock-rates = <400000000>;
-       pinctrl-names = "default", "state_100mhz", "state_200mhz";
-       pinctrl-0 = <&pinctrl_usdhc1>;
-       pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
-       pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
-       bus-width = <8>;
-       non-removable;
-       status = "okay";
-};
-
-&usdhc2 {
-       assigned-clocks = <&clk IMX8MQ_CLK_USDHC2>;
-       assigned-clock-rates = <200000000>;
-       pinctrl-names = "default", "state_100mhz", "state_200mhz";
-       pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
-       pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>;
-       pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
-       bus-width = <4>;
-       cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
-       status = "okay";
-};
-
-&usb3_phy0 {
-       status = "okay";
-};
-
-&usb3_phy1 {
-       status = "okay";
-};
-
-&usb_dwc3_1 {
-       dr_mode = "host";
-       status = "okay";
-};
-
-&wdog1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_wdog>;
-       fsl,ext-reset-output;
-       status = "okay";
-};
-
-&iomuxc {
-       pinctrl_enet_3v3: enet3v3grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_GPIO1_IO00_GPIO1_IO0       0x19
-               >;
-       };
-
-       pinctrl_fec1: fec1grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_ENET_MDC_ENET1_MDC         0x3
-                       MX8MQ_IOMUXC_ENET_MDIO_ENET1_MDIO       0x23
-                       MX8MQ_IOMUXC_ENET_TD3_ENET1_RGMII_TD3   0x1f
-                       MX8MQ_IOMUXC_ENET_TD2_ENET1_RGMII_TD2   0x1f
-                       MX8MQ_IOMUXC_ENET_TD1_ENET1_RGMII_TD1   0x1f
-                       MX8MQ_IOMUXC_ENET_TD0_ENET1_RGMII_TD0   0x1f
-                       MX8MQ_IOMUXC_ENET_RD3_ENET1_RGMII_RD3   0x91
-                       MX8MQ_IOMUXC_ENET_RD2_ENET1_RGMII_RD2   0x91
-                       MX8MQ_IOMUXC_ENET_RD1_ENET1_RGMII_RD1   0x91
-                       MX8MQ_IOMUXC_ENET_RD0_ENET1_RGMII_RD0   0x91
-                       MX8MQ_IOMUXC_ENET_TXC_ENET1_RGMII_TXC   0x1f
-                       MX8MQ_IOMUXC_ENET_RXC_ENET1_RGMII_RXC   0x91
-                       MX8MQ_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL     0x91
-                       MX8MQ_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL     0x1f
-                       MX8MQ_IOMUXC_GPIO1_IO09_GPIO1_IO9       0x19
-               >;
-       };
-
-       pinctrl_i2c1: i2c1grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_I2C1_SCL_I2C1_SCL                  0x4000007f
-                       MX8MQ_IOMUXC_I2C1_SDA_I2C1_SDA                  0x4000007f
-               >;
-       };
-
-       pinctrl_i2c2: i2c2grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_I2C2_SCL_I2C2_SCL                  0x4000007f
-                       MX8MQ_IOMUXC_I2C2_SDA_I2C2_SDA                  0x4000007f
-               >;
-       };
-
-       pinctrl_otg_vbus: otgvbusgrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_NAND_DQS_GPIO3_IO14                0x19   /* USB OTG VBUS Enable */
-               >;
-       };
-
-       pinctrl_pmic: pmicirqgrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_GPIO1_IO03_GPIO1_IO3       0x41
-               >;
-       };
-
-       pinctrl_uart1: uart1grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_UART1_RXD_UART1_DCE_RX             0x49
-                       MX8MQ_IOMUXC_UART1_TXD_UART1_DCE_TX             0x49
-               >;
-       };
-
-       pinctrl_uart2: uart2grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_UART2_RXD_UART2_DCE_RX             0x49
-                       MX8MQ_IOMUXC_UART2_TXD_UART2_DCE_TX             0x49
-                       MX8MQ_IOMUXC_UART4_RXD_UART2_DCE_CTS_B          0x49
-                       MX8MQ_IOMUXC_UART4_TXD_UART2_DCE_RTS_B          0x49
-               >;
-       };
-
-       pinctrl_usdhc1: usdhc1grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK                 0x83
-                       MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD                 0xc3
-                       MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0             0xc3
-                       MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1             0xc3
-                       MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2             0xc3
-                       MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3             0xc3
-                       MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4             0xc3
-                       MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5             0xc3
-                       MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6             0xc3
-                       MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7             0xc3
-                       MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE           0x83
-               >;
-       };
-
-       pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK                 0x85
-                       MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD                 0xc5
-                       MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0             0xc5
-                       MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1             0xc5
-                       MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2             0xc5
-                       MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3             0xc5
-                       MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4             0xc5
-                       MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5             0xc5
-                       MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6             0xc5
-                       MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7             0xc5
-                       MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE           0x85
-               >;
-       };
-
-       pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK                 0x87
-                       MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD                 0xc7
-                       MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0             0xc7
-                       MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1             0xc7
-                       MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2             0xc7
-                       MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3             0xc7
-                       MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4             0xc7
-                       MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5             0xc7
-                       MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6             0xc7
-                       MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7             0xc7
-                       MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE           0x87
-               >;
-       };
-
-       pinctrl_usdhc2_gpio: usdhc2gpiogrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD2_CD_B_GPIO2_IO12        0x41
-               >;
-       };
-
-       pinctrl_usdhc2: usdhc2grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK                 0x83
-                       MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD                 0xc3
-                       MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0             0xc3
-                       MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1             0xc3
-                       MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2             0xc3
-                       MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3             0xc3
-                       MX8MQ_IOMUXC_GPIO1_IO04_USDHC2_VSELECT          0xc1
-               >;
-       };
-
-       pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK                 0x85
-                       MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD                 0xc5
-                       MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0             0xc5
-                       MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1             0xc5
-                       MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2             0xc5
-                       MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3             0xc5
-                       MX8MQ_IOMUXC_GPIO1_IO04_USDHC2_VSELECT          0xc1
-               >;
-       };
-
-       pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK                 0x87
-                       MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD                 0xc7
-                       MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0             0xc7
-                       MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1             0xc7
-                       MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2             0xc7
-                       MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3             0xc7
-                       MX8MQ_IOMUXC_GPIO1_IO04_USDHC2_VSELECT          0xc1
-               >;
-       };
-
-       pinctrl_wdog: wdoggrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B 0xc6
-               >;
-       };
-};
index ef1146cd7f6759955e1a385ef7a6da8e806c9eea..6b5903104a54b39d4449c4fb95e1d7e8cfa5b7eb 100644 (file)
@@ -310,6 +310,7 @@ config TARGET_PICO_IMX8MQ
        bool "Support Technexion Pico iMX8MQ"
        select IMX8MQ
        select IMX8M_LPDDR4
+       imply OF_UPSTREAM
 
 config TARGET_IMX8MN_VAR_SOM
        bool "Variscite imx8mn_var_som"
index 0cbdc3778b7963d09219f5ba3b4057149723b036..2d5bfffa0935429219390985e69fca410232b857 100644 (file)
@@ -10,7 +10,7 @@ CONFIG_SYS_I2C_MXC_I2C1=y
 CONFIG_SYS_I2C_MXC_I2C2=y
 CONFIG_SYS_I2C_MXC_I2C3=y
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mq-pico-pi"
+CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mq-pico-pi"
 CONFIG_TARGET_PICO_IMX8MQ=y
 CONFIG_DM_RESET=y
 CONFIG_SYS_MONITOR_LEN=524288