| Message ID | 20240521122944.304613-2-patrick.barsanti@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Hi On Tue, May 21, 2024 at 2:30 PM Patrick Barsanti <patrick.barsanti@amarulasolutions.com> wrote: > > Migrate imx8mn_bsh_smm_s2 and imx8mn_bsh_smm_s2pro boards to > OF_UPSTREAM. > > Signed-off-by: Patrick Barsanti <patrick.barsanti@amarulasolutions.com> > --- > arch/arm/dts/Makefile | 2 - > arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi | 426 --------------------- > arch/arm/dts/imx8mn-bsh-smm-s2.dts | 48 --- > arch/arm/dts/imx8mn-bsh-smm-s2pro.dts | 170 -------- > configs/imx8mn_bsh_smm_s2_defconfig | 3 +- > configs/imx8mn_bsh_smm_s2pro_defconfig | 3 +- > 6 files changed, 4 insertions(+), 648 deletions(-) > delete mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi > delete mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2.dts > delete mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2pro.dts > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index a5c82ebf7a..cb58271730 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -928,8 +928,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \ > imx8mm-phg.dtb \ > imx8mm-phyboard-polis-rdk.dtb \ > imx8mm-phygate-tauri-l.dtb \ > - imx8mn-bsh-smm-s2.dtb \ > - imx8mn-bsh-smm-s2pro.dtb \ > imx8mq-cm.dtb \ > imx8mn-var-som-symphony.dtb \ > imx8mq-mnt-reform2.dtb \ > diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi > deleted file mode 100644 > index c11895d9d5..0000000000 > --- a/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi > +++ /dev/null As soon as you get a tested by you can just send upstream Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com> Michael > @@ -1,426 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright 2021 Collabora Ltd. > - * Copyright 2021 BSH Hausgeraete GmbH > - */ > - > -/dts-v1/; > - > -#include "imx8mn.dtsi" > - > -/ { > - chosen { > - stdout-path = &uart4; > - }; > - > - fec_supply: fec-supply-en { > - compatible = "regulator-fixed"; > - vin-supply = <&buck4_reg>; > - regulator-name = "tja1101_en"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - }; > - > - usdhc2_pwrseq: usdhc2-pwrseq { > - compatible = "mmc-pwrseq-simple"; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_usdhc2_pwrseq>; > - reset-gpios = <&gpio4 27 GPIO_ACTIVE_LOW>; > - }; > -}; > - > -&A53_0 { > - cpu-supply = <&buck2_reg>; > -}; > - > -&A53_1 { > - cpu-supply = <&buck2_reg>; > -}; > - > -&A53_2 { > - cpu-supply = <&buck2_reg>; > -}; > - > -&A53_3 { > - cpu-supply = <&buck2_reg>; > -}; > - > -&ecspi2 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_espi2>; > - status = "okay"; > -}; > - > -&fec1 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_fec1>; > - phy-mode = "rmii"; > - phy-handle = <ðphy0>; > - phy-supply = <&fec_supply>; > - 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 29 GPIO_ACTIVE_LOW>; > - reset-assert-us = <20>; > - reset-deassert-us = <2000>; > - }; > - }; > -}; > - > -&i2c1 { > - clock-frequency = <400000>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_i2c1>; > - status = "okay"; > - > - bd71847: pmic@4b { > - compatible = "rohm,bd71847"; > - reg = <0x4b>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_pmic>; > - interrupt-parent = <&gpio1>; > - interrupts = <3 IRQ_TYPE_LEVEL_LOW>; > - rohm,reset-snvs-powered; > - > - #clock-cells = <0>; > - clocks = <&osc_32k 0>; > - clock-output-names = "clk-32k-out"; > - > - regulators { > - buck1_reg: BUCK1 { > - /* PMIC_BUCK1 - VDD_SOC */ > - regulator-name = "buck1"; > - regulator-min-microvolt = <700000>; > - regulator-max-microvolt = <1300000>; > - regulator-boot-on; > - regulator-always-on; > - regulator-ramp-delay = <1250>; > - }; > - > - buck2_reg: BUCK2 { > - /* PMIC_BUCK2 - VDD_ARM */ > - regulator-name = "buck2"; > - regulator-min-microvolt = <700000>; > - regulator-max-microvolt = <1300000>; > - regulator-boot-on; > - regulator-always-on; > - regulator-ramp-delay = <1250>; > - }; > - > - buck3_reg: BUCK3 { > - /* PMIC_BUCK5 - VDD_DRAM_VPU_GPU */ > - regulator-name = "buck3"; > - regulator-min-microvolt = <700000>; > - regulator-max-microvolt = <1350000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - buck4_reg: BUCK4 { > - /* PMIC_BUCK6 - VDD_3V3 */ > - regulator-name = "buck4"; > - regulator-min-microvolt = <3000000>; > - regulator-max-microvolt = <3300000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - buck5_reg: BUCK5 { > - /* PMIC_BUCK7 - VDD_1V8 */ > - regulator-name = "buck5"; > - regulator-min-microvolt = <1605000>; > - regulator-max-microvolt = <1995000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - buck6_reg: BUCK6 { > - /* PMIC_BUCK8 - NVCC_DRAM */ > - regulator-name = "buck6"; > - regulator-min-microvolt = <800000>; > - regulator-max-microvolt = <1400000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - ldo1_reg: LDO1 { > - /* PMIC_LDO1 - NVCC_SNVS_1V8 */ > - regulator-name = "ldo1"; > - regulator-min-microvolt = <1600000>; > - regulator-max-microvolt = <1900000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - ldo2_reg: LDO2 { > - /* PMIC_LDO2 - VDD_SNVS_0V8 */ > - regulator-name = "ldo2"; > - regulator-min-microvolt = <800000>; > - regulator-max-microvolt = <900000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - ldo3_reg: LDO3 { > - /* PMIC_LDO3 - VDDA_1V8 */ > - regulator-name = "ldo3"; > - regulator-min-microvolt = <1800000>; > - regulator-max-microvolt = <3300000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - ldo4_reg: LDO4 { > - /* PMIC_LDO4 - VDD_MIPI_0V9 */ > - regulator-name = "ldo4"; > - regulator-min-microvolt = <900000>; > - regulator-max-microvolt = <1800000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - ldo6_reg: LDO6 { > - /* PMIC_LDO6 - VDD_MIPI_1V2 */ > - regulator-name = "ldo6"; > - regulator-min-microvolt = <900000>; > - regulator-max-microvolt = <1800000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - }; > - }; > -}; > - > -&i2c3 { > - clock-frequency = <400000>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_i2c3>; > - status = "okay"; > -}; > - > -&i2c4 { > - clock-frequency = <400000>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_i2c4>; > - status = "okay"; > -}; > - > -&uart2 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_uart2>; > - status = "okay"; > -}; > - > -&uart3 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_uart3>; > - assigned-clocks = <&clk IMX8MN_CLK_UART3>; > - assigned-clock-parents = <&clk IMX8MN_SYS_PLL1_80M>; > - uart-has-rtscts; > - status = "okay"; > - > - bluetooth { > - compatible = "brcm,bcm43438-bt"; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_bluetooth>; > - shutdown-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; > - device-wakeup-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>; > - host-wakeup-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; > - max-speed = <3000000>; > - }; > -}; > - > -/* Console */ > -&uart4 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_uart4>; > - status = "okay"; > -}; > - > -&usbotg1 { > - dr_mode = "peripheral"; > - disable-over-current; > - status = "okay"; > -}; > - > -&usdhc2 { > - #address-cells = <1>; > - #size-cells = <0>; > - pinctrl-names = "default", "state_100mhz", "state_200mhz"; > - pinctrl-0 = <&pinctrl_usdhc2>; > - pinctrl-1 = <&pinctrl_usdhc2_100mhz>; > - pinctrl-2 = <&pinctrl_usdhc2_200mhz>; > - mmc-pwrseq = <&usdhc2_pwrseq>; > - bus-width = <4>; > - non-removable; > - status = "okay"; > - > - brcmf: bcrmf@1 { > - compatible = "brcm,bcm4329-fmac"; > - reg = <1>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_wlan>; > - interrupt-parent = <&gpio1>; > - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; > - interrupt-names = "host-wake"; > - }; > -}; > - > -&wdog1 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_wdog>; > - fsl,ext-reset-output; > - status = "okay"; > -}; > - > -&iomuxc { > - pinctrl_bluetooth: bluetoothgrp { > - fsl,pins = < > - MX8MN_IOMUXC_GPIO1_IO15_GPIO1_IO15 0x044 /* BT_REG_ON */ > - MX8MN_IOMUXC_ENET_TD3_GPIO1_IO18 0x046 /* BT_DEV_WAKE */ > - MX8MN_IOMUXC_ENET_RD2_GPIO1_IO28 0x090 /* BT_HOST_WAKE */ > - >; > - }; > - > - pinctrl_espi2: espi2grp { > - fsl,pins = < > - MX8MN_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0x082 > - MX8MN_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0x082 > - MX8MN_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x082 > - MX8MN_IOMUXC_ECSPI2_SS0_ECSPI2_SS0 0x040 > - >; > - }; > - > - pinctrl_fec1: fec1grp { > - fsl,pins = < > - MX8MN_IOMUXC_ENET_MDC_ENET1_MDC 0x002 > - MX8MN_IOMUXC_ENET_MDIO_ENET1_MDIO 0x002 > - MX8MN_IOMUXC_ENET_RD0_ENET1_RGMII_RD0 0x090 > - MX8MN_IOMUXC_ENET_RD1_ENET1_RGMII_RD1 0x090 > - MX8MN_IOMUXC_ENET_RXC_ENET1_RX_ER 0x090 > - MX8MN_IOMUXC_ENET_TD0_ENET1_RGMII_TD0 0x016 > - MX8MN_IOMUXC_ENET_TD1_ENET1_RGMII_TD1 0x016 > - MX8MN_IOMUXC_ENET_TD2_ENET1_TX_CLK 0x016 > - MX8MN_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL 0x016 > - MX8MN_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL 0x090 > - MX8MN_IOMUXC_ENET_TXC_ENET1_TX_ER 0x016 > - MX8MN_IOMUXC_SD2_CD_B_GPIO2_IO12 0x150 /* RMII_INT - ENET_INT */ > - MX8MN_IOMUXC_SD2_WP_GPIO2_IO20 0x150 /* RMII_EN - ENET_EN */ > - MX8MN_IOMUXC_SD2_RESET_B_GPIO2_IO19 0x016 /* RMII_WAKE - GPIO_ENET_WAKE */ > - MX8MN_IOMUXC_ENET_RD3_GPIO1_IO29 0x016 /* RMII_RESET - GPIO_ENET_RST */ > - >; > - }; > - > - pinctrl_i2c1: i2c1grp { > - fsl,pins = < > - MX8MN_IOMUXC_I2C1_SCL_I2C1_SCL 0x400000c2 > - MX8MN_IOMUXC_I2C1_SDA_I2C1_SDA 0x400000c2 > - >; > - }; > - > - pinctrl_i2c3: i2c3grp { > - fsl,pins = < > - MX8MN_IOMUXC_I2C3_SCL_I2C3_SCL 0x400000c2 > - MX8MN_IOMUXC_I2C3_SDA_I2C3_SDA 0x400000c2 > - >; > - }; > - > - pinctrl_i2c4: i2c4grp { > - fsl,pins = < > - MX8MN_IOMUXC_I2C4_SCL_I2C4_SCL 0x400000c2 > - MX8MN_IOMUXC_I2C4_SDA_I2C4_SDA 0x400000c2 > - >; > - }; > - > - pinctrl_pmic: pmicirq { > - fsl,pins = < > - MX8MN_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x040 > - >; > - }; > - > - pinctrl_uart2: uart2grp { > - fsl,pins = < > - MX8MN_IOMUXC_UART2_RXD_UART2_DCE_RX 0x040 > - MX8MN_IOMUXC_UART2_TXD_UART2_DCE_TX 0x040 > - >; > - }; > - > - pinctrl_uart3: uart3grp { > - fsl,pins = < > - MX8MN_IOMUXC_UART3_TXD_UART3_DCE_TX 0x040 > - MX8MN_IOMUXC_UART3_RXD_UART3_DCE_RX 0x040 > - MX8MN_IOMUXC_ECSPI1_MISO_UART3_DCE_CTS_B 0x040 > - MX8MN_IOMUXC_ECSPI1_SS0_UART3_DCE_RTS_B 0x040 > - >; > - }; > - > - pinctrl_uart4: uart4grp { > - fsl,pins = < > - MX8MN_IOMUXC_UART4_RXD_UART4_DCE_RX 0x040 > - MX8MN_IOMUXC_UART4_TXD_UART4_DCE_TX 0x040 > - >; > - }; > - > - pinctrl_usdhc2: usdhc2grp { > - fsl,pins = < > - MX8MN_IOMUXC_SD2_CLK_USDHC2_CLK 0x090 > - MX8MN_IOMUXC_SD2_CMD_USDHC2_CMD 0x0d0 > - MX8MN_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x0d0 > - MX8MN_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x0d0 > - MX8MN_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x0d0 > - MX8MN_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x0d0 > - >; > - }; > - > - pinctrl_usdhc2_100mhz: usdhc2grp100mhz { > - fsl,pins = < > - MX8MN_IOMUXC_SD2_CLK_USDHC2_CLK 0x094 > - MX8MN_IOMUXC_SD2_CMD_USDHC2_CMD 0x0d4 > - MX8MN_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x0d4 > - MX8MN_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x0d4 > - MX8MN_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x0d4 > - MX8MN_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x0d4 > - >; > - }; > - > - pinctrl_usdhc2_200mhz: usdhc2grp200mhz { > - fsl,pins = < > - MX8MN_IOMUXC_SD2_CLK_USDHC2_CLK 0x096 > - MX8MN_IOMUXC_SD2_CMD_USDHC2_CMD 0x0d6 > - MX8MN_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x0d6 > - MX8MN_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x0d6 > - MX8MN_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x0d6 > - MX8MN_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x0d6 > - >; > - }; > - > - pinctrl_usdhc2_pwrseq: usdhc2pwrseqgrp { > - fsl,pins = < > - MX8MN_IOMUXC_SAI2_MCLK_GPIO4_IO27 0x040 /* WL_REG_ON */ > - >; > - }; > - > - pinctrl_wdog: wdoggrp { > - fsl,pins = < > - MX8MN_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B 0x046 > - >; > - }; > - > - pinctrl_wlan: wlangrp { > - fsl,pins = < > - MX8MN_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x0d6 /* GPIO_0 - WIFI_GPIO_0 */ > - MX8MN_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x0d6 /* GPIO_1 - WIFI_GPIO_1 */ > - MX8MN_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x0d6 /* BT_GPIO_5 - WIFI_GPIO_5 */ > - MX8MN_IOMUXC_SPDIF_RX_GPIO5_IO4 0x0d6 /* I2S_CLK - WIFI_GPIO_6 */ > - >; > - }; > -}; > diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2.dts b/arch/arm/dts/imx8mn-bsh-smm-s2.dts > deleted file mode 100644 > index 33f98582ea..0000000000 > --- a/arch/arm/dts/imx8mn-bsh-smm-s2.dts > +++ /dev/null > @@ -1,48 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright 2021 Collabora Ltd. > - * Copyright 2021 BSH Hausgeraete GmbH > - */ > - > -/dts-v1/; > - > -#include "imx8mn-bsh-smm-s2-common.dtsi" > - > -/ { > - model = "BSH SMM S2"; > - compatible = "bsh,imx8mn-bsh-smm-s2", "fsl,imx8mn"; > - > - memory@40000000 { > - device_type = "memory"; > - reg = <0x0 0x40000000 0x0 0x10000000>; > - }; > -}; > - > -&gpmi { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_gpmi_nand>; > - nand-on-flash-bbt; > - status = "okay"; > -}; > - > -&iomuxc { > - pinctrl_gpmi_nand: gpmi-nand { > - fsl,pins = < > - MX8MN_IOMUXC_NAND_ALE_RAWNAND_ALE 0x00000096 > - MX8MN_IOMUXC_NAND_CE0_B_RAWNAND_CE0_B 0x00000096 > - MX8MN_IOMUXC_NAND_CLE_RAWNAND_CLE 0x00000096 > - MX8MN_IOMUXC_NAND_DATA00_RAWNAND_DATA00 0x00000096 > - MX8MN_IOMUXC_NAND_DATA01_RAWNAND_DATA01 0x00000096 > - MX8MN_IOMUXC_NAND_DATA02_RAWNAND_DATA02 0x00000096 > - MX8MN_IOMUXC_NAND_DATA03_RAWNAND_DATA03 0x00000096 > - MX8MN_IOMUXC_NAND_DATA04_RAWNAND_DATA04 0x00000096 > - MX8MN_IOMUXC_NAND_DATA05_RAWNAND_DATA05 0x00000096 > - MX8MN_IOMUXC_NAND_DATA06_RAWNAND_DATA06 0x00000096 > - MX8MN_IOMUXC_NAND_DATA07_RAWNAND_DATA07 0x00000096 > - MX8MN_IOMUXC_NAND_RE_B_RAWNAND_RE_B 0x00000096 > - MX8MN_IOMUXC_NAND_READY_B_RAWNAND_READY_B 0x00000056 > - MX8MN_IOMUXC_NAND_WE_B_RAWNAND_WE_B 0x00000096 > - MX8MN_IOMUXC_NAND_WP_B_RAWNAND_WP_B 0x00000096 > - >; > - }; > -}; > diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts b/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts > deleted file mode 100644 > index fbbb336703..0000000000 > --- a/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts > +++ /dev/null > @@ -1,170 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright 2021 Collabora Ltd. > - * Copyright 2021 BSH Hausgeraete GmbH > - */ > - > -/dts-v1/; > - > -#include "imx8mn-bsh-smm-s2-common.dtsi" > -#include <dt-bindings/sound/tlv320aic31xx.h> > - > -/ { > - model = "BSH SMM S2 PRO"; > - compatible = "bsh,imx8mn-bsh-smm-s2pro", "fsl,imx8mn"; > - > - memory@40000000 { > - device_type = "memory"; > - reg = <0x0 0x40000000 0x0 0x20000000>; > - }; > - > - sound-tlv320aic31xx { > - compatible = "fsl,imx-audio-tlv320aic31xx"; > - model = "tlv320aic31xx-hifi"; > - audio-cpu = <&sai3>; > - audio-codec = <&tlv320dac3101>; > - audio-asrc = <&easrc>; > - audio-routing = > - "Ext Spk", "SPL", > - "Ext Spk", "SPR"; > - mclk-id = <PLL_CLKIN_BCLK>; > - }; > - > - vdd_input: vdd_input { > - compatible = "regulator-fixed"; > - regulator-name = "vdd_input"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - }; > -}; > - > -&easrc { > - fsl,asrc-rate = <48000>; > - fsl,asrc-format = <10>; > - status = "okay"; > -}; > - > -&i2c2 { > - clock-frequency = <400000>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_i2c2>; > - status = "okay"; > - > - tlv320dac3101: audio-codec@18 { > - compatible = "ti,tlv320dac3101"; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_dac_rst>; > - reg = <0x18>; > - #sound-dai-cells = <0>; > - HPVDD-supply = <&buck4_reg>; > - SPRVDD-supply = <&vdd_input>; > - SPLVDD-supply = <&vdd_input>; > - AVDD-supply = <&buck4_reg>; > - IOVDD-supply = <&buck4_reg>; > - DVDD-supply = <&buck5_reg>; > - reset-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; > - ai31xx-micbias-vg = <MICBIAS_AVDDV>; > - clocks = <&clk IMX8MN_CLK_SAI3_ROOT>; > - }; > -}; > - > -&sai3 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_sai3>; > - assigned-clocks = <&clk IMX8MN_CLK_SAI3>; > - assigned-clock-parents = <&clk IMX8MN_AUDIO_PLL1_OUT>; > - assigned-clock-rates = <24576000>; > - fsl,sai-mclk-direction-output; > - status = "okay"; > -}; > - > -/* eMMC */ > -&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"; > -}; > - > -&iomuxc { > - pinctrl_dac_rst: dacrstgrp { > - fsl,pins = < > - MX8MN_IOMUXC_GPIO1_IO06_GPIO1_IO6 0x19 /* DAC_RST */ > - >; > - }; > - > - pinctrl_espi2: espi2grp { > - fsl,pins = < > - MX8MN_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0x082 > - MX8MN_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0x082 > - MX8MN_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x082 > - MX8MN_IOMUXC_ECSPI2_SS0_ECSPI2_SS0 0x040 > - >; > - }; > - > - pinctrl_i2c2: i2c2grp { > - fsl,pins = < > - MX8MN_IOMUXC_I2C2_SCL_I2C2_SCL 0x400000c3 > - MX8MN_IOMUXC_I2C2_SDA_I2C2_SDA 0x400000c3 > - >; > - }; > - > - pinctrl_sai3: sai3grp { > - fsl,pins = < > - MX8MN_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0xd6 > - MX8MN_IOMUXC_SAI3_TXC_SAI3_TX_BCLK 0xd6 > - MX8MN_IOMUXC_SAI3_TXD_SAI3_TX_DATA0 0xd6 > - >; > - }; > - > - pinctrl_usdhc1: usdhc1grp { > - fsl,pins = < > - MX8MN_IOMUXC_SD1_CLK_USDHC1_CLK 0x40000090 > - MX8MN_IOMUXC_SD1_CMD_USDHC1_CMD 0x0d0 > - MX8MN_IOMUXC_SD1_DATA0_USDHC1_DATA0 0x0d0 > - MX8MN_IOMUXC_SD1_DATA1_USDHC1_DATA1 0x0d0 > - MX8MN_IOMUXC_SD1_DATA2_USDHC1_DATA2 0x0d0 > - MX8MN_IOMUXC_SD1_DATA3_USDHC1_DATA3 0x0d0 > - MX8MN_IOMUXC_SD1_DATA4_USDHC1_DATA4 0x0d0 > - MX8MN_IOMUXC_SD1_DATA5_USDHC1_DATA5 0x0d0 > - MX8MN_IOMUXC_SD1_DATA6_USDHC1_DATA6 0x0d0 > - MX8MN_IOMUXC_SD1_DATA7_USDHC1_DATA7 0x0d0 > - MX8MN_IOMUXC_SD1_STROBE_USDHC1_STROBE 0x090 > - >; > - }; > - > - pinctrl_usdhc1_100mhz: usdhc1grp100mhz { > - fsl,pins = < > - MX8MN_IOMUXC_SD1_CLK_USDHC1_CLK 0x40000094 > - MX8MN_IOMUXC_SD1_CMD_USDHC1_CMD 0x0d4 > - MX8MN_IOMUXC_SD1_DATA0_USDHC1_DATA0 0x0d4 > - MX8MN_IOMUXC_SD1_DATA1_USDHC1_DATA1 0x0d4 > - MX8MN_IOMUXC_SD1_DATA2_USDHC1_DATA2 0x0d4 > - MX8MN_IOMUXC_SD1_DATA3_USDHC1_DATA3 0x0d4 > - MX8MN_IOMUXC_SD1_DATA4_USDHC1_DATA4 0x0d4 > - MX8MN_IOMUXC_SD1_DATA5_USDHC1_DATA5 0x0d4 > - MX8MN_IOMUXC_SD1_DATA6_USDHC1_DATA6 0x0d4 > - MX8MN_IOMUXC_SD1_DATA7_USDHC1_DATA7 0x0d4 > - MX8MN_IOMUXC_SD1_STROBE_USDHC1_STROBE 0x094 > - >; > - }; > - > - pinctrl_usdhc1_200mhz: usdhc1grp200mhz { > - fsl,pins = < > - MX8MN_IOMUXC_SD1_CLK_USDHC1_CLK 0x40000096 > - MX8MN_IOMUXC_SD1_CMD_USDHC1_CMD 0x0d6 > - MX8MN_IOMUXC_SD1_DATA0_USDHC1_DATA0 0x0d6 > - MX8MN_IOMUXC_SD1_DATA1_USDHC1_DATA1 0x0d6 > - MX8MN_IOMUXC_SD1_DATA2_USDHC1_DATA2 0x0d6 > - MX8MN_IOMUXC_SD1_DATA3_USDHC1_DATA3 0x0d6 > - MX8MN_IOMUXC_SD1_DATA4_USDHC1_DATA4 0x0d6 > - MX8MN_IOMUXC_SD1_DATA5_USDHC1_DATA5 0x0d6 > - MX8MN_IOMUXC_SD1_DATA6_USDHC1_DATA6 0x0d6 > - MX8MN_IOMUXC_SD1_DATA7_USDHC1_DATA7 0x0d6 > - MX8MN_IOMUXC_SD1_STROBE_USDHC1_STROBE 0x096 > - >; > - }; > -}; > diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig > index 0e0a548a57..45ff45047f 100644 > --- a/configs/imx8mn_bsh_smm_s2_defconfig > +++ b/configs/imx8mn_bsh_smm_s2_defconfig > @@ -8,7 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_DM_GPIO=y > -CONFIG_DEFAULT_DEVICE_TREE="imx8mn-bsh-smm-s2" > +CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mn-bsh-smm-s2" > CONFIG_SPL_TEXT_BASE=0x912000 > CONFIG_TARGET_IMX8MN_BSH_SMM_S2=y > CONFIG_OF_LIBFDT_OVERLAY=y > @@ -62,6 +62,7 @@ CONFIG_MTDPARTS_DEFAULT="gpmi-nand:64m(nandboot),16m(nandfit),32m(nandkernel),1m > CONFIG_CMD_UBI=y > CONFIG_OF_CONTROL=y > CONFIG_SPL_OF_CONTROL=y > +CONFIG_OF_UPSTREAM=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y > CONFIG_SPL_DM=y > diff --git a/configs/imx8mn_bsh_smm_s2pro_defconfig b/configs/imx8mn_bsh_smm_s2pro_defconfig > index f739569dde..cd5cabfc90 100644 > --- a/configs/imx8mn_bsh_smm_s2pro_defconfig > +++ b/configs/imx8mn_bsh_smm_s2pro_defconfig > @@ -8,7 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_DM_GPIO=y > -CONFIG_DEFAULT_DEVICE_TREE="imx8mn-bsh-smm-s2pro" > +CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mn-bsh-smm-s2pro" > CONFIG_SPL_TEXT_BASE=0x912000 > CONFIG_TARGET_IMX8MN_BSH_SMM_S2PRO=y > CONFIG_OF_LIBFDT_OVERLAY=y > @@ -55,6 +55,7 @@ CONFIG_CMD_USB=y > CONFIG_CMD_USB_MASS_STORAGE=y > CONFIG_OF_CONTROL=y > CONFIG_SPL_OF_CONTROL=y > +CONFIG_OF_UPSTREAM=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y > CONFIG_SPL_DM=y > -- > 2.43.0 >
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index a5c82ebf7a..cb58271730 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -928,8 +928,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \ imx8mm-phg.dtb \ imx8mm-phyboard-polis-rdk.dtb \ imx8mm-phygate-tauri-l.dtb \ - imx8mn-bsh-smm-s2.dtb \ - imx8mn-bsh-smm-s2pro.dtb \ imx8mq-cm.dtb \ imx8mn-var-som-symphony.dtb \ imx8mq-mnt-reform2.dtb \ diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi deleted file mode 100644 index c11895d9d5..0000000000 --- a/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi +++ /dev/null @@ -1,426 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2021 Collabora Ltd. - * Copyright 2021 BSH Hausgeraete GmbH - */ - -/dts-v1/; - -#include "imx8mn.dtsi" - -/ { - chosen { - stdout-path = &uart4; - }; - - fec_supply: fec-supply-en { - compatible = "regulator-fixed"; - vin-supply = <&buck4_reg>; - regulator-name = "tja1101_en"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - usdhc2_pwrseq: usdhc2-pwrseq { - compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc2_pwrseq>; - reset-gpios = <&gpio4 27 GPIO_ACTIVE_LOW>; - }; -}; - -&A53_0 { - cpu-supply = <&buck2_reg>; -}; - -&A53_1 { - cpu-supply = <&buck2_reg>; -}; - -&A53_2 { - cpu-supply = <&buck2_reg>; -}; - -&A53_3 { - cpu-supply = <&buck2_reg>; -}; - -&ecspi2 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_espi2>; - status = "okay"; -}; - -&fec1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_fec1>; - phy-mode = "rmii"; - phy-handle = <ðphy0>; - phy-supply = <&fec_supply>; - 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 29 GPIO_ACTIVE_LOW>; - reset-assert-us = <20>; - reset-deassert-us = <2000>; - }; - }; -}; - -&i2c1 { - clock-frequency = <400000>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c1>; - status = "okay"; - - bd71847: pmic@4b { - compatible = "rohm,bd71847"; - reg = <0x4b>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pmic>; - interrupt-parent = <&gpio1>; - interrupts = <3 IRQ_TYPE_LEVEL_LOW>; - rohm,reset-snvs-powered; - - #clock-cells = <0>; - clocks = <&osc_32k 0>; - clock-output-names = "clk-32k-out"; - - regulators { - buck1_reg: BUCK1 { - /* PMIC_BUCK1 - VDD_SOC */ - regulator-name = "buck1"; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1300000>; - regulator-boot-on; - regulator-always-on; - regulator-ramp-delay = <1250>; - }; - - buck2_reg: BUCK2 { - /* PMIC_BUCK2 - VDD_ARM */ - regulator-name = "buck2"; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1300000>; - regulator-boot-on; - regulator-always-on; - regulator-ramp-delay = <1250>; - }; - - buck3_reg: BUCK3 { - /* PMIC_BUCK5 - VDD_DRAM_VPU_GPU */ - regulator-name = "buck3"; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1350000>; - regulator-boot-on; - regulator-always-on; - }; - - buck4_reg: BUCK4 { - /* PMIC_BUCK6 - VDD_3V3 */ - regulator-name = "buck4"; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - - buck5_reg: BUCK5 { - /* PMIC_BUCK7 - VDD_1V8 */ - regulator-name = "buck5"; - regulator-min-microvolt = <1605000>; - regulator-max-microvolt = <1995000>; - regulator-boot-on; - regulator-always-on; - }; - - buck6_reg: BUCK6 { - /* PMIC_BUCK8 - NVCC_DRAM */ - regulator-name = "buck6"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo1_reg: LDO1 { - /* PMIC_LDO1 - NVCC_SNVS_1V8 */ - regulator-name = "ldo1"; - regulator-min-microvolt = <1600000>; - regulator-max-microvolt = <1900000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo2_reg: LDO2 { - /* PMIC_LDO2 - VDD_SNVS_0V8 */ - regulator-name = "ldo2"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <900000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo3_reg: LDO3 { - /* PMIC_LDO3 - VDDA_1V8 */ - regulator-name = "ldo3"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo4_reg: LDO4 { - /* PMIC_LDO4 - VDD_MIPI_0V9 */ - regulator-name = "ldo4"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1800000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo6_reg: LDO6 { - /* PMIC_LDO6 - VDD_MIPI_1V2 */ - regulator-name = "ldo6"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1800000>; - regulator-boot-on; - regulator-always-on; - }; - }; - }; -}; - -&i2c3 { - clock-frequency = <400000>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c3>; - status = "okay"; -}; - -&i2c4 { - clock-frequency = <400000>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c4>; - status = "okay"; -}; - -&uart2 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart2>; - status = "okay"; -}; - -&uart3 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart3>; - assigned-clocks = <&clk IMX8MN_CLK_UART3>; - assigned-clock-parents = <&clk IMX8MN_SYS_PLL1_80M>; - uart-has-rtscts; - status = "okay"; - - bluetooth { - compatible = "brcm,bcm43438-bt"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_bluetooth>; - shutdown-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; - device-wakeup-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>; - host-wakeup-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; - max-speed = <3000000>; - }; -}; - -/* Console */ -&uart4 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart4>; - status = "okay"; -}; - -&usbotg1 { - dr_mode = "peripheral"; - disable-over-current; - status = "okay"; -}; - -&usdhc2 { - #address-cells = <1>; - #size-cells = <0>; - pinctrl-names = "default", "state_100mhz", "state_200mhz"; - pinctrl-0 = <&pinctrl_usdhc2>; - pinctrl-1 = <&pinctrl_usdhc2_100mhz>; - pinctrl-2 = <&pinctrl_usdhc2_200mhz>; - mmc-pwrseq = <&usdhc2_pwrseq>; - bus-width = <4>; - non-removable; - status = "okay"; - - brcmf: bcrmf@1 { - compatible = "brcm,bcm4329-fmac"; - reg = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_wlan>; - interrupt-parent = <&gpio1>; - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "host-wake"; - }; -}; - -&wdog1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_wdog>; - fsl,ext-reset-output; - status = "okay"; -}; - -&iomuxc { - pinctrl_bluetooth: bluetoothgrp { - fsl,pins = < - MX8MN_IOMUXC_GPIO1_IO15_GPIO1_IO15 0x044 /* BT_REG_ON */ - MX8MN_IOMUXC_ENET_TD3_GPIO1_IO18 0x046 /* BT_DEV_WAKE */ - MX8MN_IOMUXC_ENET_RD2_GPIO1_IO28 0x090 /* BT_HOST_WAKE */ - >; - }; - - pinctrl_espi2: espi2grp { - fsl,pins = < - MX8MN_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0x082 - MX8MN_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0x082 - MX8MN_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x082 - MX8MN_IOMUXC_ECSPI2_SS0_ECSPI2_SS0 0x040 - >; - }; - - pinctrl_fec1: fec1grp { - fsl,pins = < - MX8MN_IOMUXC_ENET_MDC_ENET1_MDC 0x002 - MX8MN_IOMUXC_ENET_MDIO_ENET1_MDIO 0x002 - MX8MN_IOMUXC_ENET_RD0_ENET1_RGMII_RD0 0x090 - MX8MN_IOMUXC_ENET_RD1_ENET1_RGMII_RD1 0x090 - MX8MN_IOMUXC_ENET_RXC_ENET1_RX_ER 0x090 - MX8MN_IOMUXC_ENET_TD0_ENET1_RGMII_TD0 0x016 - MX8MN_IOMUXC_ENET_TD1_ENET1_RGMII_TD1 0x016 - MX8MN_IOMUXC_ENET_TD2_ENET1_TX_CLK 0x016 - MX8MN_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL 0x016 - MX8MN_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL 0x090 - MX8MN_IOMUXC_ENET_TXC_ENET1_TX_ER 0x016 - MX8MN_IOMUXC_SD2_CD_B_GPIO2_IO12 0x150 /* RMII_INT - ENET_INT */ - MX8MN_IOMUXC_SD2_WP_GPIO2_IO20 0x150 /* RMII_EN - ENET_EN */ - MX8MN_IOMUXC_SD2_RESET_B_GPIO2_IO19 0x016 /* RMII_WAKE - GPIO_ENET_WAKE */ - MX8MN_IOMUXC_ENET_RD3_GPIO1_IO29 0x016 /* RMII_RESET - GPIO_ENET_RST */ - >; - }; - - pinctrl_i2c1: i2c1grp { - fsl,pins = < - MX8MN_IOMUXC_I2C1_SCL_I2C1_SCL 0x400000c2 - MX8MN_IOMUXC_I2C1_SDA_I2C1_SDA 0x400000c2 - >; - }; - - pinctrl_i2c3: i2c3grp { - fsl,pins = < - MX8MN_IOMUXC_I2C3_SCL_I2C3_SCL 0x400000c2 - MX8MN_IOMUXC_I2C3_SDA_I2C3_SDA 0x400000c2 - >; - }; - - pinctrl_i2c4: i2c4grp { - fsl,pins = < - MX8MN_IOMUXC_I2C4_SCL_I2C4_SCL 0x400000c2 - MX8MN_IOMUXC_I2C4_SDA_I2C4_SDA 0x400000c2 - >; - }; - - pinctrl_pmic: pmicirq { - fsl,pins = < - MX8MN_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x040 - >; - }; - - pinctrl_uart2: uart2grp { - fsl,pins = < - MX8MN_IOMUXC_UART2_RXD_UART2_DCE_RX 0x040 - MX8MN_IOMUXC_UART2_TXD_UART2_DCE_TX 0x040 - >; - }; - - pinctrl_uart3: uart3grp { - fsl,pins = < - MX8MN_IOMUXC_UART3_TXD_UART3_DCE_TX 0x040 - MX8MN_IOMUXC_UART3_RXD_UART3_DCE_RX 0x040 - MX8MN_IOMUXC_ECSPI1_MISO_UART3_DCE_CTS_B 0x040 - MX8MN_IOMUXC_ECSPI1_SS0_UART3_DCE_RTS_B 0x040 - >; - }; - - pinctrl_uart4: uart4grp { - fsl,pins = < - MX8MN_IOMUXC_UART4_RXD_UART4_DCE_RX 0x040 - MX8MN_IOMUXC_UART4_TXD_UART4_DCE_TX 0x040 - >; - }; - - pinctrl_usdhc2: usdhc2grp { - fsl,pins = < - MX8MN_IOMUXC_SD2_CLK_USDHC2_CLK 0x090 - MX8MN_IOMUXC_SD2_CMD_USDHC2_CMD 0x0d0 - MX8MN_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x0d0 - MX8MN_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x0d0 - MX8MN_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x0d0 - MX8MN_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x0d0 - >; - }; - - pinctrl_usdhc2_100mhz: usdhc2grp100mhz { - fsl,pins = < - MX8MN_IOMUXC_SD2_CLK_USDHC2_CLK 0x094 - MX8MN_IOMUXC_SD2_CMD_USDHC2_CMD 0x0d4 - MX8MN_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x0d4 - MX8MN_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x0d4 - MX8MN_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x0d4 - MX8MN_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x0d4 - >; - }; - - pinctrl_usdhc2_200mhz: usdhc2grp200mhz { - fsl,pins = < - MX8MN_IOMUXC_SD2_CLK_USDHC2_CLK 0x096 - MX8MN_IOMUXC_SD2_CMD_USDHC2_CMD 0x0d6 - MX8MN_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x0d6 - MX8MN_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x0d6 - MX8MN_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x0d6 - MX8MN_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x0d6 - >; - }; - - pinctrl_usdhc2_pwrseq: usdhc2pwrseqgrp { - fsl,pins = < - MX8MN_IOMUXC_SAI2_MCLK_GPIO4_IO27 0x040 /* WL_REG_ON */ - >; - }; - - pinctrl_wdog: wdoggrp { - fsl,pins = < - MX8MN_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B 0x046 - >; - }; - - pinctrl_wlan: wlangrp { - fsl,pins = < - MX8MN_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x0d6 /* GPIO_0 - WIFI_GPIO_0 */ - MX8MN_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x0d6 /* GPIO_1 - WIFI_GPIO_1 */ - MX8MN_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x0d6 /* BT_GPIO_5 - WIFI_GPIO_5 */ - MX8MN_IOMUXC_SPDIF_RX_GPIO5_IO4 0x0d6 /* I2S_CLK - WIFI_GPIO_6 */ - >; - }; -}; diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2.dts b/arch/arm/dts/imx8mn-bsh-smm-s2.dts deleted file mode 100644 index 33f98582ea..0000000000 --- a/arch/arm/dts/imx8mn-bsh-smm-s2.dts +++ /dev/null @@ -1,48 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2021 Collabora Ltd. - * Copyright 2021 BSH Hausgeraete GmbH - */ - -/dts-v1/; - -#include "imx8mn-bsh-smm-s2-common.dtsi" - -/ { - model = "BSH SMM S2"; - compatible = "bsh,imx8mn-bsh-smm-s2", "fsl,imx8mn"; - - memory@40000000 { - device_type = "memory"; - reg = <0x0 0x40000000 0x0 0x10000000>; - }; -}; - -&gpmi { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpmi_nand>; - nand-on-flash-bbt; - status = "okay"; -}; - -&iomuxc { - pinctrl_gpmi_nand: gpmi-nand { - fsl,pins = < - MX8MN_IOMUXC_NAND_ALE_RAWNAND_ALE 0x00000096 - MX8MN_IOMUXC_NAND_CE0_B_RAWNAND_CE0_B 0x00000096 - MX8MN_IOMUXC_NAND_CLE_RAWNAND_CLE 0x00000096 - MX8MN_IOMUXC_NAND_DATA00_RAWNAND_DATA00 0x00000096 - MX8MN_IOMUXC_NAND_DATA01_RAWNAND_DATA01 0x00000096 - MX8MN_IOMUXC_NAND_DATA02_RAWNAND_DATA02 0x00000096 - MX8MN_IOMUXC_NAND_DATA03_RAWNAND_DATA03 0x00000096 - MX8MN_IOMUXC_NAND_DATA04_RAWNAND_DATA04 0x00000096 - MX8MN_IOMUXC_NAND_DATA05_RAWNAND_DATA05 0x00000096 - MX8MN_IOMUXC_NAND_DATA06_RAWNAND_DATA06 0x00000096 - MX8MN_IOMUXC_NAND_DATA07_RAWNAND_DATA07 0x00000096 - MX8MN_IOMUXC_NAND_RE_B_RAWNAND_RE_B 0x00000096 - MX8MN_IOMUXC_NAND_READY_B_RAWNAND_READY_B 0x00000056 - MX8MN_IOMUXC_NAND_WE_B_RAWNAND_WE_B 0x00000096 - MX8MN_IOMUXC_NAND_WP_B_RAWNAND_WP_B 0x00000096 - >; - }; -}; diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts b/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts deleted file mode 100644 index fbbb336703..0000000000 --- a/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts +++ /dev/null @@ -1,170 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2021 Collabora Ltd. - * Copyright 2021 BSH Hausgeraete GmbH - */ - -/dts-v1/; - -#include "imx8mn-bsh-smm-s2-common.dtsi" -#include <dt-bindings/sound/tlv320aic31xx.h> - -/ { - model = "BSH SMM S2 PRO"; - compatible = "bsh,imx8mn-bsh-smm-s2pro", "fsl,imx8mn"; - - memory@40000000 { - device_type = "memory"; - reg = <0x0 0x40000000 0x0 0x20000000>; - }; - - sound-tlv320aic31xx { - compatible = "fsl,imx-audio-tlv320aic31xx"; - model = "tlv320aic31xx-hifi"; - audio-cpu = <&sai3>; - audio-codec = <&tlv320dac3101>; - audio-asrc = <&easrc>; - audio-routing = - "Ext Spk", "SPL", - "Ext Spk", "SPR"; - mclk-id = <PLL_CLKIN_BCLK>; - }; - - vdd_input: vdd_input { - compatible = "regulator-fixed"; - regulator-name = "vdd_input"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; -}; - -&easrc { - fsl,asrc-rate = <48000>; - fsl,asrc-format = <10>; - status = "okay"; -}; - -&i2c2 { - clock-frequency = <400000>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c2>; - status = "okay"; - - tlv320dac3101: audio-codec@18 { - compatible = "ti,tlv320dac3101"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_dac_rst>; - reg = <0x18>; - #sound-dai-cells = <0>; - HPVDD-supply = <&buck4_reg>; - SPRVDD-supply = <&vdd_input>; - SPLVDD-supply = <&vdd_input>; - AVDD-supply = <&buck4_reg>; - IOVDD-supply = <&buck4_reg>; - DVDD-supply = <&buck5_reg>; - reset-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; - ai31xx-micbias-vg = <MICBIAS_AVDDV>; - clocks = <&clk IMX8MN_CLK_SAI3_ROOT>; - }; -}; - -&sai3 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_sai3>; - assigned-clocks = <&clk IMX8MN_CLK_SAI3>; - assigned-clock-parents = <&clk IMX8MN_AUDIO_PLL1_OUT>; - assigned-clock-rates = <24576000>; - fsl,sai-mclk-direction-output; - status = "okay"; -}; - -/* eMMC */ -&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"; -}; - -&iomuxc { - pinctrl_dac_rst: dacrstgrp { - fsl,pins = < - MX8MN_IOMUXC_GPIO1_IO06_GPIO1_IO6 0x19 /* DAC_RST */ - >; - }; - - pinctrl_espi2: espi2grp { - fsl,pins = < - MX8MN_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0x082 - MX8MN_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0x082 - MX8MN_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x082 - MX8MN_IOMUXC_ECSPI2_SS0_ECSPI2_SS0 0x040 - >; - }; - - pinctrl_i2c2: i2c2grp { - fsl,pins = < - MX8MN_IOMUXC_I2C2_SCL_I2C2_SCL 0x400000c3 - MX8MN_IOMUXC_I2C2_SDA_I2C2_SDA 0x400000c3 - >; - }; - - pinctrl_sai3: sai3grp { - fsl,pins = < - MX8MN_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0xd6 - MX8MN_IOMUXC_SAI3_TXC_SAI3_TX_BCLK 0xd6 - MX8MN_IOMUXC_SAI3_TXD_SAI3_TX_DATA0 0xd6 - >; - }; - - pinctrl_usdhc1: usdhc1grp { - fsl,pins = < - MX8MN_IOMUXC_SD1_CLK_USDHC1_CLK 0x40000090 - MX8MN_IOMUXC_SD1_CMD_USDHC1_CMD 0x0d0 - MX8MN_IOMUXC_SD1_DATA0_USDHC1_DATA0 0x0d0 - MX8MN_IOMUXC_SD1_DATA1_USDHC1_DATA1 0x0d0 - MX8MN_IOMUXC_SD1_DATA2_USDHC1_DATA2 0x0d0 - MX8MN_IOMUXC_SD1_DATA3_USDHC1_DATA3 0x0d0 - MX8MN_IOMUXC_SD1_DATA4_USDHC1_DATA4 0x0d0 - MX8MN_IOMUXC_SD1_DATA5_USDHC1_DATA5 0x0d0 - MX8MN_IOMUXC_SD1_DATA6_USDHC1_DATA6 0x0d0 - MX8MN_IOMUXC_SD1_DATA7_USDHC1_DATA7 0x0d0 - MX8MN_IOMUXC_SD1_STROBE_USDHC1_STROBE 0x090 - >; - }; - - pinctrl_usdhc1_100mhz: usdhc1grp100mhz { - fsl,pins = < - MX8MN_IOMUXC_SD1_CLK_USDHC1_CLK 0x40000094 - MX8MN_IOMUXC_SD1_CMD_USDHC1_CMD 0x0d4 - MX8MN_IOMUXC_SD1_DATA0_USDHC1_DATA0 0x0d4 - MX8MN_IOMUXC_SD1_DATA1_USDHC1_DATA1 0x0d4 - MX8MN_IOMUXC_SD1_DATA2_USDHC1_DATA2 0x0d4 - MX8MN_IOMUXC_SD1_DATA3_USDHC1_DATA3 0x0d4 - MX8MN_IOMUXC_SD1_DATA4_USDHC1_DATA4 0x0d4 - MX8MN_IOMUXC_SD1_DATA5_USDHC1_DATA5 0x0d4 - MX8MN_IOMUXC_SD1_DATA6_USDHC1_DATA6 0x0d4 - MX8MN_IOMUXC_SD1_DATA7_USDHC1_DATA7 0x0d4 - MX8MN_IOMUXC_SD1_STROBE_USDHC1_STROBE 0x094 - >; - }; - - pinctrl_usdhc1_200mhz: usdhc1grp200mhz { - fsl,pins = < - MX8MN_IOMUXC_SD1_CLK_USDHC1_CLK 0x40000096 - MX8MN_IOMUXC_SD1_CMD_USDHC1_CMD 0x0d6 - MX8MN_IOMUXC_SD1_DATA0_USDHC1_DATA0 0x0d6 - MX8MN_IOMUXC_SD1_DATA1_USDHC1_DATA1 0x0d6 - MX8MN_IOMUXC_SD1_DATA2_USDHC1_DATA2 0x0d6 - MX8MN_IOMUXC_SD1_DATA3_USDHC1_DATA3 0x0d6 - MX8MN_IOMUXC_SD1_DATA4_USDHC1_DATA4 0x0d6 - MX8MN_IOMUXC_SD1_DATA5_USDHC1_DATA5 0x0d6 - MX8MN_IOMUXC_SD1_DATA6_USDHC1_DATA6 0x0d6 - MX8MN_IOMUXC_SD1_DATA7_USDHC1_DATA7 0x0d6 - MX8MN_IOMUXC_SD1_STROBE_USDHC1_STROBE 0x096 - >; - }; -}; diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 0e0a548a57..45ff45047f 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -8,7 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx8mn-bsh-smm-s2" +CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mn-bsh-smm-s2" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BSH_SMM_S2=y CONFIG_OF_LIBFDT_OVERLAY=y @@ -62,6 +62,7 @@ CONFIG_MTDPARTS_DEFAULT="gpmi-nand:64m(nandboot),16m(nandfit),32m(nandkernel),1m CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM=y diff --git a/configs/imx8mn_bsh_smm_s2pro_defconfig b/configs/imx8mn_bsh_smm_s2pro_defconfig index f739569dde..cd5cabfc90 100644 --- a/configs/imx8mn_bsh_smm_s2pro_defconfig +++ b/configs/imx8mn_bsh_smm_s2pro_defconfig @@ -8,7 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx8mn-bsh-smm-s2pro" +CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mn-bsh-smm-s2pro" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BSH_SMM_S2PRO=y CONFIG_OF_LIBFDT_OVERLAY=y @@ -55,6 +55,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM=y
Migrate imx8mn_bsh_smm_s2 and imx8mn_bsh_smm_s2pro boards to OF_UPSTREAM. Signed-off-by: Patrick Barsanti <patrick.barsanti@amarulasolutions.com> --- arch/arm/dts/Makefile | 2 - arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi | 426 --------------------- arch/arm/dts/imx8mn-bsh-smm-s2.dts | 48 --- arch/arm/dts/imx8mn-bsh-smm-s2pro.dts | 170 -------- configs/imx8mn_bsh_smm_s2_defconfig | 3 +- configs/imx8mn_bsh_smm_s2pro_defconfig | 3 +- 6 files changed, 4 insertions(+), 648 deletions(-) delete mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi delete mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2.dts delete mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2pro.dts