]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
imx8mq: phanbell: Switch OF_UPSTREAM
authorPeng Fan <peng.fan@nxp.com>
Sat, 25 Apr 2026 00:36:54 +0000 (08:36 +0800)
committerFabio Estevam <festevam@gmail.com>
Fri, 15 May 2026 20:31:39 +0000 (17:31 -0300)
arch/arm/dts/imx8mq-phanbell.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-phanbell.dts [deleted file]
arch/arm/mach-imx/imx8m/Kconfig
configs/imx8mq_phanbell_defconfig

index 3f651e30f89aa7d853c8cd9c0e9791cd88ee6f3d..51f5edcf49fad7bc7fcc04998e86e20c4aff2b8c 100644 (file)
@@ -879,7 +879,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mm-mx8menlo.dtb \
        imx8mm-phg.dtb \
        imx8mq-cm.dtb \
-       imx8mq-phanbell.dtb \
        imx8mp-data-modul-edm-sbc.dtb \
        imx8mp-dhcom-som-overlay-rev100.dtbo \
        imx8mp-dhcom-som-overlay-eth1xfast.dtbo \
diff --git a/arch/arm/dts/imx8mq-phanbell.dts b/arch/arm/dts/imx8mq-phanbell.dts
deleted file mode 100644 (file)
index a3b9d61..0000000
+++ /dev/null
@@ -1,481 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2017-2019 NXP
- */
-
-/dts-v1/;
-
-#include "imx8mq.dtsi"
-#include <dt-bindings/interrupt-controller/irq.h>
-
-/ {
-       model = "Google i.MX8MQ Phanbell";
-       compatible = "google,imx8mq-phanbell", "fsl,imx8mq";
-
-       chosen {
-               stdout-path = &uart1;
-       };
-
-       memory@40000000 {
-               device_type = "memory";
-               reg = <0x00000000 0x40000000 0 0x40000000>;
-       };
-
-       pmic_osc: clock-pmic {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               clock-output-names = "pmic_osc";
-       };
-
-       reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
-               compatible = "regulator-fixed";
-               regulator-name = "VSD_3V3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
-       fan: gpio-fan {
-               compatible = "gpio-fan";
-               gpio-fan,speed-map = <0 0 8600 1>;
-               gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>;
-               #cooling-cells = <2>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_gpio_fan>;
-               status = "okay";
-       };
-};
-
-&A53_0 {
-       cpu-supply = <&buck2>;
-};
-
-&A53_1 {
-       cpu-supply = <&buck2>;
-};
-
-&A53_2 {
-       cpu-supply = <&buck2>;
-};
-
-&A53_3 {
-       cpu-supply = <&buck2>;
-};
-
-&cpu_thermal {
-       trips {
-               cpu_alert0: trip0 {
-                       temperature = <75000>;
-                       hysteresis = <2000>;
-                       type = "passive";
-               };
-
-               cpu_alert1: trip1 {
-                       temperature = <80000>;
-                       hysteresis = <2000>;
-                       type = "passive";
-               };
-
-               cpu_crit0: trip3 {
-                       temperature = <90000>;
-                       hysteresis = <2000>;
-                       type = "critical";
-               };
-
-               fan_toggle0: trip4 {
-                       temperature = <65000>;
-                       hysteresis = <10000>;
-                       type = "active";
-               };
-       };
-
-       cooling-maps {
-               map0 {
-                       trip = <&cpu_alert0>;
-                       cooling-device =
-                       <&A53_0 0 1>; /* Exclude highest OPP */
-               };
-
-               map1 {
-                       trip = <&cpu_alert1>;
-                       cooling-device =
-                       <&A53_0 0 2>; /* Exclude two highest OPPs */
-               };
-
-               map4 {
-                       trip = <&fan_toggle0>;
-                       cooling-device = <&fan 0 1>;
-               };
-       };
-};
-
-&i2c1 {
-       clock-frequency = <400000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1>;
-       status = "okay";
-
-       pmic: pmic@4b {
-               compatible = "rohm,bd71837";
-               reg = <0x4b>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_pmic>;
-               #clock-cells = <0>;
-               clocks = <&pmic_osc>;
-               clock-output-names = "pmic_clk";
-               interrupt-parent = <&gpio1>;
-               interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
-
-               regulators {
-                       buck1: BUCK1 {
-                               regulator-name = "buck1";
-                               regulator-min-microvolt = <700000>;
-                               regulator-max-microvolt = <1300000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                               regulator-ramp-delay = <1250>;
-                               rohm,dvs-run-voltage = <900000>;
-                               rohm,dvs-idle-voltage = <900000>;
-                               rohm,dvs-suspend-voltage = <800000>;
-                       };
-
-                       buck2: BUCK2 {
-                               regulator-name = "buck2";
-                               regulator-min-microvolt = <850000>;
-                               regulator-max-microvolt = <1000000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                               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 = <900000>;
-                       };
-
-                       buck4: BUCK4 {
-                               regulator-name = "buck4";
-                               regulator-min-microvolt = <700000>;
-                               regulator-max-microvolt = <1300000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                               rohm,dvs-run-voltage = <900000>;
-                       };
-
-                       buck5: BUCK5 {
-                               regulator-name = "buck5";
-                               regulator-min-microvolt = <700000>;
-                               regulator-max-microvolt = <1350000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       buck6: BUCK6 {
-                               regulator-name = "buck6";
-                               regulator-min-microvolt = <3000000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       buck7: BUCK7 {
-                               regulator-name = "buck7";
-                               regulator-min-microvolt = <1605000>;
-                               regulator-max-microvolt = <1995000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       buck8: BUCK8 {
-                               regulator-name = "buck8";
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1400000>;
-                               regulator-boot-on;
-                               regulator-always-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;
-                               regulator-always-on;
-                       };
-
-                       ldo4: LDO4 {
-                               regulator-name = "ldo4";
-                               regulator-min-microvolt = <900000>;
-                               regulator-max-microvolt = <1800000>;
-                               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;
-                       };
-
-                       ldo6: LDO6 {
-                               regulator-name = "ldo6";
-                               regulator-min-microvolt = <900000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo7: LDO7 {
-                               regulator-name = "ldo7";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-               };
-       };
-};
-
-&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>;
-                       reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
-                       reset-assert-us = <10000>;
-                       reset-deassert-us = <50000>;
-               };
-       };
-};
-
-&uart1 {
-       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_100mhz>;
-       pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
-       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_100mhz>, <&pinctrl_usdhc2_gpio>;
-       pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
-       bus-width = <4>;
-       cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
-       vmmc-supply = <&reg_usdhc2_vmmc>;
-       status = "okay";
-};
-
-&usb3_phy0 {
-       status = "okay";
-};
-
-&usb_dwc3_0 {
-       dr_mode = "otg";
-       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_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_gpio_fan: gpiofangrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_NAND_CLE_GPIO3_IO5                 0x16
-               >;
-       };
-
-       pinctrl_i2c1: i2c1grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_I2C1_SCL_I2C1_SCL                  0x4000007f
-                       MX8MQ_IOMUXC_I2C1_SDA_I2C1_SDA                  0x4000007f
-               >;
-       };
-
-       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_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
-                       MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B         0xc1
-               >;
-       };
-
-       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
-                       MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B         0xc1
-               >;
-       };
-
-       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
-                       MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B         0xc1
-               >;
-       };
-
-       pinctrl_usdhc2_gpio: usdhc2gpiogrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD2_CD_B_GPIO2_IO12        0x41
-                       MX8MQ_IOMUXC_SD2_RESET_B_GPIO2_IO19     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 40b5de47cfb122d225bafdb023dc7bbed9732527..ef1146cd7f6759955e1a385ef7a6da8e806c9eea 100644 (file)
@@ -79,6 +79,7 @@ config TARGET_IMX8MQ_PHANBELL
        bool "imx8mq_phanbell"
        select IMX8MQ
        select IMX8M_LPDDR4
+       imply OF_UPSTREAM
 
 config TARGET_IMX8MQ_REFORM2
        bool "imx8mq_reform2"
index 9200557ca37e2324409b3a616da9418b606c63ff..64e3ee0429343cf78a190084cd569d0fce634f10 100644 (file)
@@ -7,7 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x400000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mq-phanbell"
+CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mq-phanbell"
 CONFIG_TARGET_IMX8MQ_PHANBELL=y
 CONFIG_DM_RESET=y
 CONFIG_SYS_MONITOR_LEN=524288