| Message ID | 20220226033637.95486-1-marex@denx.de |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | ARM: dts: net: dwc_eth_qos: Fix i.MX8MP compatible string | expand |
Hi Marek, On 26/02/2022 00:36, Marek Vasut wrote: > The correct compatible string for i.MX8MP variant of DWC EQoS MAC > is "nxp,imx8mp-dwmac-eqos", use it. Drop the two current users of > the current wrong compatible string to avoid breaking them. Yes, "nxp,imx8mp-dwmac-eqos" is the documented property in the upstream kernel: Reviewed-by: Fabio Estevam <festevam@denx.de>
On Sat, 2022-02-26 at 04:36 +0100, Marek Vasut wrote: > The correct compatible string for i.MX8MP variant of DWC EQoS MAC > is "nxp,imx8mp-dwmac-eqos", use it. Drop the two current users of > the current wrong compatible string to avoid breaking them. Thanks, Marek, for fixing this. > Signed-off-by: Marek Vasut <marex@denx.de> Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Cc: Fabio Estevam <festevam@denx.de> > Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Cc: Peng Fan <peng.fan@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > --- > arch/arm/dts/imx8mp-evk-u-boot.dtsi | 1 - > arch/arm/dts/imx8mp-verdin-u-boot.dtsi | 1 - > drivers/net/dwc_eth_qos.c | 2 +- > 3 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi > index ab849ebaaca..7c3789273da 100644 > --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi > +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi > @@ -112,7 +112,6 @@ > }; > > &eqos { > - compatible = "fsl,imx-eqos"; > /delete-property/ assigned-clocks; > /delete-property/ assigned-clock-parents; > /delete-property/ assigned-clock-rates; > diff --git a/arch/arm/dts/imx8mp-verdin-u-boot.dtsi b/arch/arm/dts/imx8mp-verdin-u-boot.dtsi > index a57ad45ed63..26140a79ebe 100644 > --- a/arch/arm/dts/imx8mp-verdin-u-boot.dtsi > +++ b/arch/arm/dts/imx8mp-verdin-u-boot.dtsi > @@ -30,7 +30,6 @@ > }; > > &eqos { > - compatible = "fsl,imx-eqos"; > /delete-property/ assigned-clocks; > /delete-property/ assigned-clock-parents; > /delete-property/ assigned-clock-rates; > diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c > index 22dad5b2030..ea0c2cfa5b2 100644 > --- a/drivers/net/dwc_eth_qos.c > +++ b/drivers/net/dwc_eth_qos.c > @@ -2032,7 +2032,7 @@ static const struct udevice_id eqos_ids[] = { > #endif > #if IS_ENABLED(CONFIG_DWC_ETH_QOS_IMX) > { > - .compatible = "fsl,imx-eqos", > + .compatible = "nxp,imx8mp-dwmac-eqos", > .data = (ulong)&eqos_imx_config > }, > #endif
On Mon, Feb 28, 2022 at 1:31 AM Marcel Ziswiler <marcel.ziswiler@toradex.com> wrote: > > On Sat, 2022-02-26 at 04:36 +0100, Marek Vasut wrote: > > The correct compatible string for i.MX8MP variant of DWC EQoS MAC > > is "nxp,imx8mp-dwmac-eqos", use it. Drop the two current users of > > the current wrong compatible string to avoid breaking them. > > Thanks, Marek, for fixing this. > > > Signed-off-by: Marek Vasut <marex@denx.de> > > Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > > Cc: Fabio Estevam <festevam@denx.de> > > Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > Cc: Peng Fan <peng.fan@nxp.com> > > Cc: Stefano Babic <sbabic@denx.de> > > --- > > arch/arm/dts/imx8mp-evk-u-boot.dtsi | 1 - > > arch/arm/dts/imx8mp-verdin-u-boot.dtsi | 1 - > > drivers/net/dwc_eth_qos.c | 2 +- > > 3 files changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi > > index ab849ebaaca..7c3789273da 100644 > > --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi > > +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi > > @@ -112,7 +112,6 @@ > > }; > > > > &eqos { > > - compatible = "fsl,imx-eqos"; > > /delete-property/ assigned-clocks; > > /delete-property/ assigned-clock-parents; > > /delete-property/ assigned-clock-rates; > > diff --git a/arch/arm/dts/imx8mp-verdin-u-boot.dtsi b/arch/arm/dts/imx8mp-verdin-u-boot.dtsi > > index a57ad45ed63..26140a79ebe 100644 > > --- a/arch/arm/dts/imx8mp-verdin-u-boot.dtsi > > +++ b/arch/arm/dts/imx8mp-verdin-u-boot.dtsi > > @@ -30,7 +30,6 @@ > > }; > > > > &eqos { > > - compatible = "fsl,imx-eqos"; > > /delete-property/ assigned-clocks; > > /delete-property/ assigned-clock-parents; > > /delete-property/ assigned-clock-rates; > > diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c > > index 22dad5b2030..ea0c2cfa5b2 100644 > > --- a/drivers/net/dwc_eth_qos.c > > +++ b/drivers/net/dwc_eth_qos.c > > @@ -2032,7 +2032,7 @@ static const struct udevice_id eqos_ids[] = { > > #endif > > #if IS_ENABLED(CONFIG_DWC_ETH_QOS_IMX) > > { > > - .compatible = "fsl,imx-eqos", > > + .compatible = "nxp,imx8mp-dwmac-eqos", > > .data = (ulong)&eqos_imx_config > > }, > > #endif Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
> The correct compatible string for i.MX8MP variant of DWC EQoS MAC > is "nxp,imx8mp-dwmac-eqos", use it. Drop the two current users of > the current wrong compatible string to avoid breaking them. > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <festevam@denx.de> > Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Cc: Peng Fan <peng.fan@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Reviewed-by: Fabio Estevam <festevam@denx.de> > Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Reviewed-by: Ramon Fried <rfried.dev@gmail.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index ab849ebaaca..7c3789273da 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -112,7 +112,6 @@ }; &eqos { - compatible = "fsl,imx-eqos"; /delete-property/ assigned-clocks; /delete-property/ assigned-clock-parents; /delete-property/ assigned-clock-rates; diff --git a/arch/arm/dts/imx8mp-verdin-u-boot.dtsi b/arch/arm/dts/imx8mp-verdin-u-boot.dtsi index a57ad45ed63..26140a79ebe 100644 --- a/arch/arm/dts/imx8mp-verdin-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-verdin-u-boot.dtsi @@ -30,7 +30,6 @@ }; &eqos { - compatible = "fsl,imx-eqos"; /delete-property/ assigned-clocks; /delete-property/ assigned-clock-parents; /delete-property/ assigned-clock-rates; diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index 22dad5b2030..ea0c2cfa5b2 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -2032,7 +2032,7 @@ static const struct udevice_id eqos_ids[] = { #endif #if IS_ENABLED(CONFIG_DWC_ETH_QOS_IMX) { - .compatible = "fsl,imx-eqos", + .compatible = "nxp,imx8mp-dwmac-eqos", .data = (ulong)&eqos_imx_config }, #endif
The correct compatible string for i.MX8MP variant of DWC EQoS MAC is "nxp,imx8mp-dwmac-eqos", use it. Drop the two current users of the current wrong compatible string to avoid breaking them. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <festevam@denx.de> Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com> Cc: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de> --- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 1 - arch/arm/dts/imx8mp-verdin-u-boot.dtsi | 1 - drivers/net/dwc_eth_qos.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-)