From: Wadim Egorov <w.egorov@phytec.de>
To: Primoz Fiser <primoz.fiser@norik.com>,
Tom Rini <trini@konsulko.com>,
Stefano Babic <sbabic@nabladev.com>,
Fabio Estevam <festevam@gmail.com>,
uboot-imx@nxp.com, Mathieu Othacehe <m.othacehe@gmail.com>,
Christoph Stoidner <c.stoidner@phytec.de>
Cc: u-boot@lists.denx.de, upstream@lists.phytec.de
Subject: Re: [Upstream] [PATCH] ARM: dts: imx93-phycore: Migrate to OF_UPSTREAM
Date: Mon, 19 May 2025 08:04:49 +0300 [thread overview]
Message-ID: <f48d6497-2524-4dc7-ae35-2af7d3a295eb@phytec.de> (raw)
In-Reply-To: <20250516104602.2445510-1-primoz.fiser@norik.com>
On 5/16/25 1:46 PM, Primoz Fiser wrote:
> Migrate to OF_UPSTREAM for phyCORE-i.MX93 since board can use upstream
> Linux kernel device-tree for phyBOARD-Segin-i.MX93.
>
> Signed-off-by: Primoz Fiser <primoz.fiser@norik.com>
Reviewed-by: Wadim Egorov <w.egorov@phytec.de>
> ---
> arch/arm/dts/Makefile | 3 +-
> arch/arm/dts/imx93-phyboard-segin.dts | 117 -----------------------
> arch/arm/dts/imx93-phycore-som.dtsi | 126 -------------------------
> arch/arm/mach-imx/imx9/Kconfig | 1 +
> board/phytec/phycore_imx93/MAINTAINERS | 2 -
> configs/imx93-phycore_defconfig | 2 +-
> 6 files changed, 3 insertions(+), 248 deletions(-)
> delete mode 100644 arch/arm/dts/imx93-phyboard-segin.dts
> delete mode 100644 arch/arm/dts/imx93-phycore-som.dtsi
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 32b698a7f411..976dbda48c37 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -918,8 +918,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
> imx8mq-librem5-r4.dtb
>
> dtb-$(CONFIG_ARCH_IMX9) += \
> - imx93-var-som-symphony.dtb \
> - imx93-phyboard-segin.dtb
> + imx93-var-som-symphony.dtb
>
> dtb-$(CONFIG_ARCH_IMXRT) += imxrt1020-evk.dtb \
> imxrt1170-evk.dtb \
> diff --git a/arch/arm/dts/imx93-phyboard-segin.dts b/arch/arm/dts/imx93-phyboard-segin.dts
> deleted file mode 100644
> index 85fb188b057f..000000000000
> --- a/arch/arm/dts/imx93-phyboard-segin.dts
> +++ /dev/null
> @@ -1,117 +0,0 @@
> -// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> -/*
> - * Copyright (C) 2023 PHYTEC Messtechnik GmbH
> - * Author: Wadim Egorov <w.egorov@phytec.de>, Christoph Stoidner <c.stoidner@phytec.de>
> - * Copyright (C) 2024 Mathieu Othacehe <m.othacehe@gmail.com>
> - *
> - * Product homepage:
> - * phyBOARD-Segin carrier board is reused for the i.MX93 design.
> - * https://www.phytec.eu/en/produkte/single-board-computer/phyboard-segin-imx6ul/
> - */
> -/dts-v1/;
> -
> -#include "imx93-phycore-som.dtsi"
> -
> -/{
> - model = "PHYTEC phyBOARD-Segin-i.MX93";
> - compatible = "phytec,imx93-phyboard-segin", "phytec,imx93-phycore-som",
> - "fsl,imx93";
> -
> - chosen {
> - stdout-path = &lpuart1;
> - };
> -
> - reg_usdhc2_vmmc: regulator-usdhc2 {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio3 7 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_reg_usdhc2_vmmc>;
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-name = "VCC_SD";
> - };
> -};
> -
> -/* Console */
> -&lpuart1 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_uart1>;
> - status = "okay";
> -};
> -
> -/* eMMC */
> -&usdhc1 {
> - no-1-8-v;
> -};
> -
> -/* SD-Card */
> -&usdhc2 {
> - pinctrl-names = "default", "state_100mhz", "state_200mhz";
> - pinctrl-0 = <&pinctrl_usdhc2_default>, <&pinctrl_usdhc2_cd>;
> - pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_cd>;
> - pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_cd>;
> - bus-width = <4>;
> - cd-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
> - no-mmc;
> - no-sdio;
> - vmmc-supply = <®_usdhc2_vmmc>;
> - status = "okay";
> -};
> -
> -&iomuxc {
> - pinctrl_uart1: uart1grp {
> - fsl,pins = <
> - MX93_PAD_UART1_RXD__LPUART1_RX 0x31e
> - MX93_PAD_UART1_TXD__LPUART1_TX 0x30e
> - >;
> - };
> -
> - pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp {
> - fsl,pins = <
> - MX93_PAD_SD2_RESET_B__GPIO3_IO07 0x31e
> - >;
> - };
> -
> - pinctrl_usdhc2_cd: usdhc2cdgrp {
> - fsl,pins = <
> - MX93_PAD_SD2_CD_B__GPIO3_IO00 0x31e
> - >;
> - };
> -
> - pinctrl_usdhc2_default: usdhc2grp {
> - fsl,pins = <
> - MX93_PAD_SD2_CLK__USDHC2_CLK 0x179e
> - MX93_PAD_SD2_CMD__USDHC2_CMD 0x139e
> - MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x138e
> - MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x138e
> - MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x138e
> - MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x139e
> - MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e
> - >;
> - };
> -
> - pinctrl_usdhc2_100mhz: usdhc2grp {
> - fsl,pins = <
> - MX93_PAD_SD2_CLK__USDHC2_CLK 0x179e
> - MX93_PAD_SD2_CMD__USDHC2_CMD 0x139e
> - MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x138e
> - MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x138e
> - MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x139e
> - MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x139e
> - MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e
> - >;
> - };
> -
> - pinctrl_usdhc2_200mhz: usdhc2grp {
> - fsl,pins = <
> - MX93_PAD_SD2_CLK__USDHC2_CLK 0x178e
> - MX93_PAD_SD2_CMD__USDHC2_CMD 0x139e
> - MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x139e
> - MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x139e
> - MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x139e
> - MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x139e
> - MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e
> - >;
> - };
> -};
> diff --git a/arch/arm/dts/imx93-phycore-som.dtsi b/arch/arm/dts/imx93-phycore-som.dtsi
> deleted file mode 100644
> index 88c2657b50e6..000000000000
> --- a/arch/arm/dts/imx93-phycore-som.dtsi
> +++ /dev/null
> @@ -1,126 +0,0 @@
> -// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> -/*
> - * Copyright (C) 2023 PHYTEC Messtechnik GmbH
> - * Author: Wadim Egorov <w.egorov@phytec.de>, Christoph Stoidner <c.stoidner@phytec.de>
> - * Copyright (C) 2024 Mathieu Othacehe <m.othacehe@gmail.com>
> - *
> - * Product homepage:
> - * https://www.phytec.eu/en/produkte/system-on-modules/phycore-imx-91-93/
> - */
> -
> -#include <dt-bindings/leds/common.h>
> -
> -#include "imx93.dtsi"
> -
> -/{
> - model = "PHYTEC phyCORE-i.MX93";
> - compatible = "phytec,imx93-phycore-som", "fsl,imx93";
> -
> - reserved-memory {
> - ranges;
> - #address-cells = <2>;
> - #size-cells = <2>;
> -
> - linux,cma {
> - compatible = "shared-dma-pool";
> - reusable;
> - alloc-ranges = <0 0x80000000 0 0x40000000>;
> - size = <0 0x10000000>;
> - linux,cma-default;
> - };
> - };
> -
> - leds {
> - compatible = "gpio-leds";
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_leds>;
> -
> - led-0 {
> - color = <LED_COLOR_ID_GREEN>;
> - function = LED_FUNCTION_HEARTBEAT;
> - gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
> - linux,default-trigger = "heartbeat";
> - };
> - };
> -};
> -
> -/* Ethernet */
> -&fec {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_fec>;
> - phy-mode = "rmii";
> - phy-handle = <ðphy1>;
> - fsl,magic-packet;
> - assigned-clocks = <&clk IMX93_CLK_ENET_TIMER1>,
> - <&clk IMX93_CLK_ENET_REF>,
> - <&clk IMX93_CLK_ENET_REF_PHY>;
> - assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>,
> - <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>,
> - <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>;
> - assigned-clock-rates = <100000000>, <50000000>, <50000000>;
> - status = "okay";
> -
> - mdio: mdio {
> - clock-frequency = <5000000>;
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - ethphy1: ethernet-phy@1 {
> - compatible = "ethernet-phy-ieee802.3-c22";
> - reg = <1>;
> - };
> - };
> -};
> -
> -/* eMMC */
> -&usdhc1 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_usdhc1>;
> - bus-width = <8>;
> - non-removable;
> - status = "okay";
> -};
> -
> -/* Watchdog */
> -&wdog3 {
> - status = "okay";
> -};
> -
> -&iomuxc {
> - pinctrl_fec: fecgrp {
> - fsl,pins = <
> - MX93_PAD_ENET2_MDC__ENET1_MDC 0x50e
> - MX93_PAD_ENET2_MDIO__ENET1_MDIO 0x502
> - MX93_PAD_ENET2_RD0__ENET1_RGMII_RD0 0x57e
> - MX93_PAD_ENET2_RD1__ENET1_RGMII_RD1 0x57e
> - MX93_PAD_ENET2_RXC__ENET1_RX_ER 0x5fe
> - MX93_PAD_ENET2_RX_CTL__ENET1_RGMII_RX_CTL 0x57e
> - MX93_PAD_ENET2_TD0__ENET1_RGMII_TD0 0x50e
> - MX93_PAD_ENET2_TD1__ENET1_RGMII_TD1 0x50e
> - MX93_PAD_ENET2_TX_CTL__ENET1_RGMII_TX_CTL 0x50e
> - MX93_PAD_ENET2_TD2__ENET1_TX_CLK 0x4000050e
> - >;
> - };
> -
> - pinctrl_leds: ledsgrp {
> - fsl,pins = <
> - MX93_PAD_I2C1_SDA__GPIO1_IO01 0x31e
> - >;
> - };
> -
> - pinctrl_usdhc1: usdhc1grp {
> - fsl,pins = <
> - MX93_PAD_SD1_CLK__USDHC1_CLK 0x179e
> - MX93_PAD_SD1_CMD__USDHC1_CMD 0x1386
> - MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x138e
> - MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x1386
> - MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x138e
> - MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x1386
> - MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x1386
> - MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x1386
> - MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x1386
> - MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x1386
> - MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x179e
> - >;
> - };
> -};
> diff --git a/arch/arm/mach-imx/imx9/Kconfig b/arch/arm/mach-imx/imx9/Kconfig
> index 0fd82dc08110..e6cafdcd8133 100644
> --- a/arch/arm/mach-imx/imx9/Kconfig
> +++ b/arch/arm/mach-imx/imx9/Kconfig
> @@ -73,6 +73,7 @@ config TARGET_PHYCORE_IMX93
> bool "phycore_imx93"
> select IMX93
> select IMX9_LPDDR4X
> + imply OF_UPSTREAM
> select OF_BOARD_FIXUP
> select OF_BOARD_SETUP
>
> diff --git a/board/phytec/phycore_imx93/MAINTAINERS b/board/phytec/phycore_imx93/MAINTAINERS
> index 718f89a084a2..7393061707de 100644
> --- a/board/phytec/phycore_imx93/MAINTAINERS
> +++ b/board/phytec/phycore_imx93/MAINTAINERS
> @@ -3,8 +3,6 @@ M: Mathieu Othacehe <m.othacehe@gmail.com>
> R: Christoph Stoidner <c.stoidner@phytec.de>
> W: https://www.phytec.eu/en/produkte/system-on-modules/phycore-imx-91-93/
> S: Maintained
> -F: arch/arm/dts/imx93-phyboard-segin.dts
> -F: arch/arm/dts/imx93-phycore-som.dtsi
> F: arch/arm/dts/imx93-phyboard-segin-u-boot.dtsi
> F: board/phytec/phycore_imx93/
> F: board/phytec/common/imx93_som_detection.c
> diff --git a/configs/imx93-phycore_defconfig b/configs/imx93-phycore_defconfig
> index 7187fd708333..66a431244b0e 100644
> --- a/configs/imx93-phycore_defconfig
> +++ b/configs/imx93-phycore_defconfig
> @@ -12,7 +12,7 @@ CONFIG_ENV_SIZE=0x10000
> CONFIG_ENV_OFFSET=0x700000
> CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg"
> CONFIG_DM_GPIO=y
> -CONFIG_DEFAULT_DEVICE_TREE="imx93-phyboard-segin"
> +CONFIG_DEFAULT_DEVICE_TREE="freescale/imx93-phyboard-segin"
> CONFIG_AHAB_BOOT=y
> CONFIG_TARGET_PHYCORE_IMX93=y
> CONFIG_OF_LIBFDT_OVERLAY=y
next prev parent reply other threads:[~2025-05-19 5:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-16 10:46 [PATCH] ARM: dts: imx93-phycore: Migrate to OF_UPSTREAM Primoz Fiser
2025-05-16 13:18 ` Sumit Garg
2025-05-19 5:04 ` Wadim Egorov [this message]
2025-05-22 13:05 ` Fabio Estevam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f48d6497-2524-4dc7-ae35-2af7d3a295eb@phytec.de \
--to=w.egorov@phytec.de \
--cc=c.stoidner@phytec.de \
--cc=festevam@gmail.com \
--cc=m.othacehe@gmail.com \
--cc=primoz.fiser@norik.com \
--cc=sbabic@nabladev.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=uboot-imx@nxp.com \
--cc=upstream@lists.phytec.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.