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

index 19112d0e98bcb148350790912a7f79a419c716a7..0f4f6c986f03e9cd3693dc6eea744b986a63ded5 100644 (file)
@@ -888,8 +888,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mp-dhcom-pdk3-overlay-rev100.dtbo \
        imx8mp-dhcom-picoitx.dtb \
        imx8mp-icore-mx8mp-edimm2.2.dtb \
-       imx8mp-msc-sm2s.dtb \
-       imx8mq-kontron-pitx-imx8m.dtb
+       imx8mp-msc-sm2s.dtb
 
 dtb-$(CONFIG_ARCH_IMX9) += \
        imx93-11x11-frdm.dtb \
diff --git a/arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts b/arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts
deleted file mode 100644 (file)
index a91c136..0000000
+++ /dev/null
@@ -1,613 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Device Tree File for the Kontron pitx-imx8m board.
- *
- * Copyright (C) 2021 Heiko Thiery <heiko.thiery@gmail.com>
- */
-
-/dts-v1/;
-
-#include "imx8mq.dtsi"
-#include <dt-bindings/net/ti-dp83867.h>
-
-/ {
-       model = "Kontron pITX-imx8m";
-       compatible = "kontron,pitx-imx8m", "fsl,imx8mq";
-
-       aliases {
-               i2c0 = &i2c1;
-               i2c1 = &i2c2;
-               i2c2 = &i2c3;
-               mmc0 = &usdhc1;
-               mmc1 = &usdhc2;
-               serial0 = &uart1;
-               serial1 = &uart2;
-               serial2 = &uart3;
-               spi0 = &qspi0;
-               spi1 = &ecspi2;
-       };
-
-       chosen {
-               stdout-path = "serial2:115200n8";
-       };
-
-       pcie0_refclk: pcie0-clock {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <100000000>;
-       };
-
-       pcie1_refclk: pcie1-clock {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <100000000>;
-       };
-
-       reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_reg_usdhc2>;
-               regulator-name = "V_3V3_SD";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
-               off-on-delay-us = <20000>;
-               enable-active-high;
-       };
-};
-
-&ecspi2 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_ecspi2_cs>;
-       cs-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>;
-       status = "okay";
-
-       tpm@0 {
-               compatible = "infineon,slb9670";
-               reg = <0>;
-               spi-max-frequency = <43000000>;
-       };
-};
-
-&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>;
-                       ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
-                       ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_75_NS>;
-                       ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-                       reset-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
-                       reset-assert-us = <10>;
-                       reset-deassert-us = <280>;
-               };
-       };
-};
-
-&i2c1 {
-       clock-frequency = <400000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1>;
-       status = "okay";
-
-       pmic@8 {
-               compatible = "fsl,pfuze100";
-               fsl,pfuze-support-disable-sw;
-               reg = <0x8>;
-
-               regulators {
-                       sw1a_reg: sw1ab {
-                               regulator-name = "V_0V9_GPU";
-                               regulator-min-microvolt = <825000>;
-                               regulator-max-microvolt = <1100000>;
-                       };
-
-                       sw1c_reg: sw1c {
-                               regulator-name = "V_0V9_VPU";
-                               regulator-min-microvolt = <825000>;
-                               regulator-max-microvolt = <1100000>;
-                       };
-
-                       sw2_reg: sw2 {
-                               regulator-name = "V_1V1_NVCC_DRAM";
-                               regulator-min-microvolt = <1100000>;
-                               regulator-max-microvolt = <1100000>;
-                               regulator-always-on;
-                       };
-
-                       sw3a_reg: sw3ab {
-                               regulator-name = "V_1V0_DRAM";
-                               regulator-min-microvolt = <825000>;
-                               regulator-max-microvolt = <1100000>;
-                               regulator-always-on;
-                       };
-
-                       sw4_reg: sw4 {
-                               regulator-name = "V_1V8_S0";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                       };
-
-                       swbst_reg: swbst {
-                               regulator-name = "NC";
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5150000>;
-                       };
-
-                       snvs_reg: vsnvs {
-                               regulator-name = "V_0V9_SNVS";
-                               regulator-min-microvolt = <1000000>;
-                               regulator-max-microvolt = <3000000>;
-                               regulator-always-on;
-                       };
-
-                       vref_reg: vrefddr {
-                               regulator-name = "V_0V55_VREF_DDR";
-                               regulator-always-on;
-                       };
-
-                       vgen1_reg: vgen1 {
-                               regulator-name = "V_1V5_CSI";
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1550000>;
-                       };
-
-                       vgen2_reg: vgen2 {
-                               regulator-name = "V_0V9_PHY";
-                               regulator-min-microvolt = <850000>;
-                               regulator-max-microvolt = <975000>;
-                               regulator-always-on;
-                       };
-
-                       vgen3_reg: vgen3 {
-                               regulator-name = "V_1V8_PHY";
-                               regulator-min-microvolt = <1675000>;
-                               regulator-max-microvolt = <1975000>;
-                               regulator-always-on;
-                       };
-
-                       vgen4_reg: vgen4 {
-                               regulator-name = "V_1V8_VDDA";
-                               regulator-min-microvolt = <1625000>;
-                               regulator-max-microvolt = <1875000>;
-                               regulator-always-on;
-                       };
-
-                       vgen5_reg: vgen5 {
-                               regulator-name = "V_3V3_PHY";
-                               regulator-min-microvolt = <3075000>;
-                               regulator-max-microvolt = <3625000>;
-                               regulator-always-on;
-                       };
-
-                       vgen6_reg: vgen6 {
-                               regulator-name = "V_2V8_CAM";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-               };
-       };
-
-       fan-controller@1b {
-               compatible = "maxim,max6650";
-               reg = <0x1b>;
-               maxim,fan-microvolt = <5000000>;
-       };
-
-       rtc@32 {
-               compatible = "microcrystal,rv8803";
-               reg = <0x32>;
-       };
-
-       sensor@4b {
-               compatible = "national,lm75b";
-               reg = <0x4b>;
-       };
-
-       eeprom@51 {
-               compatible = "atmel,24c32";
-               reg = <0x51>;
-               pagesize = <32>;
-       };
-};
-
-&i2c2 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2>;
-       status = "okay";
-};
-
-&i2c3 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c3>;
-       status = "okay";
-};
-
-/* M.2 B-key slot */
-&pcie0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_pcie0>;
-       reset-gpio = <&gpio1 9 GPIO_ACTIVE_LOW>;
-       clocks = <&clk IMX8MQ_CLK_PCIE1_ROOT>,
-                <&clk IMX8MQ_CLK_PCIE1_AUX>,
-                <&clk IMX8MQ_CLK_PCIE1_PHY>,
-                <&pcie0_refclk>;
-       clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
-       status = "okay";
-};
-
-/* Intel Ethernet Controller I210/I211 */
-&pcie1 {
-       clocks = <&clk IMX8MQ_CLK_PCIE2_ROOT>,
-                <&clk IMX8MQ_CLK_PCIE2_AUX>,
-                <&clk IMX8MQ_CLK_PCIE2_PHY>,
-                <&pcie1_refclk>;
-       clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
-       fsl,max-link-speed = <1>;
-       status = "okay";
-};
-
-&pgc_gpu {
-       power-supply = <&sw1a_reg>;
-};
-
-&pgc_vpu {
-       power-supply = <&sw1c_reg>;
-};
-
-&qspi0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_qspi>;
-       status = "okay";
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               #address-cells = <1>;
-               #size-cells = <1>;
-               reg = <0>;
-               spi-tx-bus-width = <1>;
-               spi-rx-bus-width = <4>;
-               m25p,fast-read;
-               spi-max-frequency = <50000000>;
-       };
-};
-
-&snvs_pwrkey {
-       status = "okay";
-};
-
-&uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1>;
-       assigned-clocks = <&clk IMX8MQ_CLK_UART1>;
-       assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_80M>;
-       status = "okay";
-};
-
-&uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2>;
-       assigned-clocks = <&clk IMX8MQ_CLK_UART2>;
-       assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_80M>;
-       status = "okay";
-};
-
-&uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart3>;
-       uart-has-rtscts;
-       assigned-clocks = <&clk IMX8MQ_CLK_UART3>;
-       assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_80M>;
-       status = "okay";
-};
-
-&usb3_phy0 {
-       status = "okay";
-};
-
-&usb3_phy1 {
-       status = "okay";
-};
-
-&usb_dwc3_0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb0>;
-       dr_mode = "otg";
-       hnp-disable;
-       srp-disable;
-       adp-disable;
-       maximum-speed = "high-speed";
-       status = "okay";
-};
-
-&usb_dwc3_1 {
-       dr_mode = "host";
-       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>;
-       vqmmc-supply = <&sw4_reg>;
-       bus-width = <8>;
-       non-removable;
-       no-sd;
-       no-sdio;
-       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>;
-       wp-gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;
-       vmmc-supply = <&reg_usdhc2_vmmc>;
-       status = "okay";
-};
-
-&wdog1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_wdog>;
-       fsl,ext-reset-output;
-       status = "okay";
-};
-
-&iomuxc {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_hog>;
-
-       pinctrl_hog: hoggrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_NAND_CE1_B_GPIO3_IO2               0x19 /* TPM Reset */
-                       MX8MQ_IOMUXC_NAND_CE3_B_GPIO3_IO4               0x19 /* USB2 Hub Reset */
-               >;
-       };
-
-       pinctrl_gpio: gpiogrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_NAND_CLE_GPIO3_IO5                 0x19 /* GPIO0 */
-                       MX8MQ_IOMUXC_NAND_RE_B_GPIO3_IO15               0x19 /* GPIO1 */
-                       MX8MQ_IOMUXC_NAND_WE_B_GPIO3_IO17               0x19 /* GPIO2 */
-                       MX8MQ_IOMUXC_NAND_WP_B_GPIO3_IO18               0x19 /* GPIO3 */
-                       MX8MQ_IOMUXC_NAND_READY_B_GPIO3_IO16            0x19 /* GPIO4 */
-                       MX8MQ_IOMUXC_NAND_DATA04_GPIO3_IO10             0x19 /* GPIO5 */
-                       MX8MQ_IOMUXC_NAND_DATA05_GPIO3_IO11             0x19 /* GPIO6 */
-                       MX8MQ_IOMUXC_NAND_DATA06_GPIO3_IO12             0x19 /* GPIO7 */
-               >;
-       };
-
-       pinctrl_pcie0: pcie0grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_GPIO1_IO09_GPIO1_IO9               0x16 /* PCIE_PERST */
-                       MX8MQ_IOMUXC_UART4_TXD_GPIO5_IO29               0x16 /* W_DISABLE */
-               >;
-       };
-
-       pinctrl_reg_usdhc2: regusdhc2gpiogrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD2_RESET_B_GPIO2_IO19             0x41
-               >;
-       };
-
-       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_IO11_GPIO1_IO11              0x16
-                       MX8MQ_IOMUXC_GPIO1_IO15_GPIO1_IO15              0x16
-               >;
-       };
-
-       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_i2c3: i2c3grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_I2C3_SCL_I2C3_SCL                  0x4000007f
-                       MX8MQ_IOMUXC_I2C3_SDA_I2C3_SDA                  0x4000007f
-               >;
-       };
-
-       pinctrl_qspi: qspigrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_NAND_ALE_QSPI_A_SCLK               0x82
-                       MX8MQ_IOMUXC_NAND_CE0_B_QSPI_A_SS0_B            0x82
-                       MX8MQ_IOMUXC_NAND_DATA00_QSPI_A_DATA0           0x82
-                       MX8MQ_IOMUXC_NAND_DATA01_QSPI_A_DATA1           0x82
-                       MX8MQ_IOMUXC_NAND_DATA02_QSPI_A_DATA2           0x82
-                       MX8MQ_IOMUXC_NAND_DATA03_QSPI_A_DATA3           0x82
-               >;
-       };
-
-       pinctrl_ecspi2: ecspi2grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI            0x19
-                       MX8MQ_IOMUXC_ECSPI2_MISO_ECSPI2_MISO            0x19
-                       MX8MQ_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK            0x19
-               >;
-       };
-
-       pinctrl_ecspi2_cs: ecspi2csgrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_ECSPI2_SS0_GPIO5_IO13              0x19
-               >;
-       };
-
-       pinctrl_uart1: uart1grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_UART1_TXD_UART1_DCE_TX             0x49
-                       MX8MQ_IOMUXC_UART1_RXD_UART1_DCE_RX             0x49
-               >;
-       };
-
-       pinctrl_uart2: uart2grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_UART2_TXD_UART2_DCE_TX             0x49
-                       MX8MQ_IOMUXC_UART2_RXD_UART2_DCE_RX             0x49
-               >;
-       };
-
-       pinctrl_uart3: uart3grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_UART3_TXD_UART3_DCE_TX             0x49
-                       MX8MQ_IOMUXC_UART3_RXD_UART3_DCE_RX             0x49
-                       MX8MQ_IOMUXC_ECSPI1_SS0_UART3_DCE_RTS_B         0x49
-                       MX8MQ_IOMUXC_ECSPI1_MISO_UART3_DCE_CTS_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
-                       MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B         0xc1
-               >;
-       };
-
-       pinctrl_usdhc1_100mhz: usdhc1-100grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK                 0x8d
-                       MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD                 0xcd
-                       MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0             0xcd
-                       MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1             0xcd
-                       MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2             0xcd
-                       MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3             0xcd
-                       MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4             0xcd
-                       MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5             0xcd
-                       MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6             0xcd
-                       MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7             0xcd
-                       MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE           0x8d
-                       MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B         0xc1
-               >;
-       };
-
-       pinctrl_usdhc1_200mhz: usdhc1-200grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK                 0x9f
-                       MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD                 0xdf
-                       MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0             0xdf
-                       MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1             0xdf
-                       MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2             0xdf
-                       MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3             0xdf
-                       MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4             0xdf
-                       MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5             0xdf
-                       MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6             0xdf
-                       MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7             0xdf
-                       MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE           0x9f
-                       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_WP_GPIO2_IO20                  0x19
-               >;
-       };
-
-       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-100grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK                 0x8d
-                       MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD                 0xcd
-                       MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0             0xcd
-                       MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1             0xcd
-                       MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2             0xcd
-                       MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3             0xcd
-                       MX8MQ_IOMUXC_GPIO1_IO04_USDHC2_VSELECT          0xc1
-               >;
-       };
-
-       pinctrl_usdhc2_200mhz: usdhc2-200grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK                 0x9f
-                       MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD                 0xdf
-                       MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0             0xdf
-                       MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1             0xdf
-                       MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2             0xdf
-                       MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3             0xdf
-                       MX8MQ_IOMUXC_GPIO1_IO04_USDHC2_VSELECT          0xc1
-               >;
-       };
-
-       pinctrl_usb0: usb0grp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_GPIO1_IO12_USB1_OTG_PWR            0x19
-                       MX8MQ_IOMUXC_GPIO1_IO13_USB1_OTG_OC             0x19
-               >;
-       };
-
-       pinctrl_wdog: wdoggrp {
-               fsl,pins = <
-                       MX8MQ_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B            0xc6
-               >;
-       };
-};
index dd720b819db0079810ceff574a6e4a0f8400b5d1..0e885f97e63b46832231d15e047f5dd5a1832f3f 100644 (file)
@@ -327,6 +327,7 @@ config TARGET_KONTRON_PITX_IMX8M
        bool "Support Kontron pITX-imx8m"
        select IMX8MQ
        select IMX8M_LPDDR4
+       imply OF_UPSTREAM
 
 config TARGET_TORADEX_SMARC_IMX8MP
        bool "Support Toradex SMARC iMX8M Plus module"
index aad84528e33be5a24ac0152b989c8352b8589cfd..8c43526691b9cfd073af730871c1f537ffbb2128 100644 (file)
@@ -1,7 +1,6 @@
 Kontron pITX-imx8m Board
 M:     Heiko Thiery <heiko.thiery@gmail.com>
 S:     Maintained
-F:     arch/arm/dts/imx8mq-kontron-pitx-imx8m*
 F:     board/kontron/pitx_imx8m/*
 F:     include/configs/kontron_pitx_imx8m.h
 F:     configs/kontron_pitx_imx8m_defconfig
index 792bdd7494a3dafc2b6591d9662ca2148b873081..b216a0bb27065b65966a3d5ceb1205b0a1198452 100644 (file)
@@ -7,7 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x300000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mq-kontron-pitx-imx8m"
+CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mq-kontron-pitx-imx8m"
 CONFIG_TARGET_KONTRON_PITX_IMX8M=y
 CONFIG_DM_RESET=y
 CONFIG_SYS_MONITOR_LEN=524288