[PATCH 1/2] imx: kontron-sl-mx8mm: Sync dts files and fix ethernet
From: Frieder Schrempf frieder.schrempf@kontron.de
This syncs the devicetree files with the latest Linux kernel (5.19-rc2). This also fixes the currently broken ethernet support:
Before:
Net: Could not get PHY for FEC0: addr 0
After:
Net: eth0: ethernet@30be0000
Signed-off-by: Frieder Schrempf frieder.schrempf@kontron.de --- arch/arm/dts/imx8mm-kontron-n801x-s.dts | 48 +++------------------- arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 6 +-- 2 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s.dts b/arch/arm/dts/imx8mm-kontron-n801x-s.dts index c796d144e22..23be1ec538b 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-s.dts +++ b/arch/arm/dts/imx8mm-kontron-n801x-s.dts @@ -6,7 +6,6 @@ /dts-v1/;
#include "imx8mm-kontron-n801x-som.dtsi" -#include <dt-bindings/net/mscc-phy-vsc8531.h>
/ { model = "Kontron i.MX8MM N801X S"; @@ -81,7 +80,6 @@ regulator-name = "vdd-5v"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - regulator-always-on; }; };
@@ -124,38 +122,14 @@ #size-cells = <0>;
ethphy: ethernet-phy@0 { - compatible = "ethernet-phy-id0007.0570"; reg = <0>; - reset-assert-us = <100>; - reset-deassert-us = <100>; + reset-assert-us = <1>; + reset-deassert-us = <15000>; reset-gpios = <&gpio4 27 GPIO_ACTIVE_LOW>; - vsc8531,led-0-mode = <VSC8531_LINK_100_1000_ACTIVITY>; - vsc8531,led-1-mode = <VSC8531_LINK_ACTIVITY>; - vsc8531,led-0-combine-disable; }; }; };
-&gpio4 { - dsi_mux_sel: dsi_mux_sel { - gpio-hog; - gpios = <14 GPIO_ACTIVE_HIGH>; - output-high; - line-name = "dsi-mux-sel"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_dsi_sel>; - }; - - dsi_mux_oe { - gpio-hog; - gpios = <15 GPIO_ACTIVE_LOW>; - output-high; - line-name = "dsi-mux-oe"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_dsi_oe>; - }; -}; - &i2c4 { clock-frequency = <100000>; pinctrl-names = "default"; @@ -208,7 +182,7 @@ #address-cells = <1>; #size-cells = <0>;
- usbnet: usbether@1 { + usbnet: ethernet@1 { compatible = "usb424,ec00"; reg = <1>; local-mac-address = [ 00 00 00 00 00 00 ]; @@ -237,18 +211,6 @@ >; };
- pinctrl_dsi_sel: dsiselgrp { - fsl,pins = < - MX8MM_IOMUXC_SAI1_TXD2_GPIO4_IO14 0x19 - >; - }; - - pinctrl_dsi_oe: dsioegrp { - fsl,pins = < - MX8MM_IOMUXC_SAI1_TXD3_GPIO4_IO15 0x19 - >; - }; - pinctrl_ecspi2: ecspi2grp { fsl,pins = < MX8MM_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x82 @@ -362,7 +324,7 @@ >; };
- pinctrl_usdhc2_100mhz: usdhc2grp100mhz { + pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp { fsl,pins = < MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x194 MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d4 @@ -374,7 +336,7 @@ >; };
- pinctrl_usdhc2_200mhz: usdhc2grp200mhz { + pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp { fsl,pins = < MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x196 MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d6 diff --git a/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi index c3418d263eb..8f90eb02550 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi @@ -63,10 +63,10 @@ &ecspi1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ecspi1>; - cs-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; + cs-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; status = "okay";
- spi-flash@0 { + flash@0 { compatible = "mxicy,mx25r1635f", "jedec,spi-nor"; spi-max-frequency = <80000000>; reg = <0>; @@ -154,7 +154,7 @@ reg_vdd_snvs: LDO2 { regulator-name = "ldo2"; regulator-min-microvolt = <800000>; - regulator-max-microvolt = <800000>; + regulator-max-microvolt = <900000>; regulator-boot-on; regulator-always-on; };
From: Frieder Schrempf frieder.schrempf@kontron.de
This was previously needed, but U-Boot is now capable of parsing the new "phy-connection-type" property that is already used in the main devicetree.
Signed-off-by: Frieder Schrempf frieder.schrempf@kontron.de --- arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi index 6fdc1968158..2c62f05cec1 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi @@ -41,10 +41,6 @@ u-boot,dm-spl; };
-&fec1 { - phy-mode = "rgmii-rxid"; -}; - &i2c1 { u-boot,dm-spl; u-boot,dm-pre-reloc;
Hi Frieder,
On 14/06/2022 10:03, Frieder Schrempf wrote:
From: Frieder Schrempf frieder.schrempf@kontron.de
This was previously needed, but U-Boot is now capable of parsing the new "phy-connection-type" property that is already used in the main devicetree.
Signed-off-by: Frieder Schrempf frieder.schrempf@kontron.de
Should the Subject say "unneeded" instead of "deprecated"?
Reviewed-by: Fabio Estevam festevam@denx.de
Am 14.06.22 um 15:13 schrieb Fabio Estevam:
Hi Frieder,
On 14/06/2022 10:03, Frieder Schrempf wrote:
From: Frieder Schrempf frieder.schrempf@kontron.de
This was previously needed, but U-Boot is now capable of parsing the new "phy-connection-type" property that is already used in the main devicetree.
Signed-off-by: Frieder Schrempf frieder.schrempf@kontron.de
Should the Subject say "unneeded" instead of "deprecated"?
Maybe that would be more appropriate, yes. I just checked the kernel bindings and it seems like in contrast to what I memorized, "phy-mode" is actually not (yet?) marked as deprecated.
On Tue, Jun 14, 2022 at 03:03:19PM +0200, Frieder Schrempf wrote:
From: Frieder Schrempf frieder.schrempf@kontron.de
This was previously needed, but U-Boot is now capable of parsing the new "phy-connection-type" property that is already used in the main devicetree.
Signed-off-by: Frieder Schrempf frieder.schrempf@kontron.de Reviewed-by: Fabio Estevam festevam@denx.de
Applied to u-boot/master, thanks!
Hi Tom,
Am 14.06.22 um 15:03 schrieb Frieder Schrempf:
From: Frieder Schrempf frieder.schrempf@kontron.de
This syncs the devicetree files with the latest Linux kernel (5.19-rc2). This also fixes the currently broken ethernet support:
Before:
Net: Could not get PHY for FEC0: addr 0
After:
Net: eth0: ethernet@30be0000
Signed-off-by: Frieder Schrempf frieder.schrempf@kontron.de
I only posted this last week and there haven't been any responses yet. But as the 2022.07 release is approaching and you were asking for pending fixes, this is one you might consider.
Thanks Frieder
arch/arm/dts/imx8mm-kontron-n801x-s.dts | 48 +++------------------- arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 6 +-- 2 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s.dts b/arch/arm/dts/imx8mm-kontron-n801x-s.dts index c796d144e22..23be1ec538b 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-s.dts +++ b/arch/arm/dts/imx8mm-kontron-n801x-s.dts @@ -6,7 +6,6 @@ /dts-v1/;
#include "imx8mm-kontron-n801x-som.dtsi" -#include <dt-bindings/net/mscc-phy-vsc8531.h>
/ { model = "Kontron i.MX8MM N801X S"; @@ -81,7 +80,6 @@ regulator-name = "vdd-5v"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-always-on;};
@@ -124,38 +122,14 @@ #size-cells = <0>;
ethphy: ethernet-phy@0 {
compatible = "ethernet-phy-id0007.0570"; reg = <0>;reset-assert-us = <100>;reset-deassert-us = <100>;
reset-assert-us = <1>;reset-deassert-us = <15000>; reset-gpios = <&gpio4 27 GPIO_ACTIVE_LOW>;
vsc8531,led-0-mode = <VSC8531_LINK_100_1000_ACTIVITY>;vsc8531,led-1-mode = <VSC8531_LINK_ACTIVITY>;vsc8531,led-0-combine-disable;};
-&gpio4 {
- dsi_mux_sel: dsi_mux_sel {
gpio-hog;gpios = <14 GPIO_ACTIVE_HIGH>;output-high;line-name = "dsi-mux-sel";pinctrl-names = "default";pinctrl-0 = <&pinctrl_dsi_sel>;- };
- dsi_mux_oe {
gpio-hog;gpios = <15 GPIO_ACTIVE_LOW>;output-high;line-name = "dsi-mux-oe";pinctrl-names = "default";pinctrl-0 = <&pinctrl_dsi_oe>;- };
-};
&i2c4 { clock-frequency = <100000>; pinctrl-names = "default"; @@ -208,7 +182,7 @@ #address-cells = <1>; #size-cells = <0>;
usbnet: usbether@1 {
usbnet: ethernet@1 { compatible = "usb424,ec00"; reg = <1>; local-mac-address = [ 00 00 00 00 00 00 ];@@ -237,18 +211,6 @@ >; };
- pinctrl_dsi_sel: dsiselgrp {
fsl,pins = <MX8MM_IOMUXC_SAI1_TXD2_GPIO4_IO14 0x19>;- };
- pinctrl_dsi_oe: dsioegrp {
fsl,pins = <MX8MM_IOMUXC_SAI1_TXD3_GPIO4_IO15 0x19>;- };
- pinctrl_ecspi2: ecspi2grp { fsl,pins = < MX8MM_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x82
@@ -362,7 +324,7 @@ >; };
- pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
- pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp { fsl,pins = < MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x194 MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d4
@@ -374,7 +336,7 @@ >; };
- pinctrl_usdhc2_200mhz: usdhc2grp200mhz {
- pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp { fsl,pins = < MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x196 MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d6
diff --git a/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi index c3418d263eb..8f90eb02550 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi @@ -63,10 +63,10 @@ &ecspi1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ecspi1>;
- cs-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;
- cs-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; status = "okay";
- spi-flash@0 {
- flash@0 { compatible = "mxicy,mx25r1635f", "jedec,spi-nor"; spi-max-frequency = <80000000>; reg = <0>;
@@ -154,7 +154,7 @@ reg_vdd_snvs: LDO2 { regulator-name = "ldo2"; regulator-min-microvolt = <800000>;
regulator-max-microvolt = <800000>;
regulator-max-microvolt = <900000>; regulator-boot-on; regulator-always-on; };
Hi Frieder,
On Thu, Jun 23, 2022 at 4:22 AM Frieder Schrempf frieder.schrempf@kontron.de wrote:
Hi Tom,
Am 14.06.22 um 15:03 schrieb Frieder Schrempf:
From: Frieder Schrempf frieder.schrempf@kontron.de
This syncs the devicetree files with the latest Linux kernel (5.19-rc2). This also fixes the currently broken ethernet support:
Before:
Net: Could not get PHY for FEC0: addr 0
After:
Net: eth0: ethernet@30be0000
Signed-off-by: Frieder Schrempf frieder.schrempf@kontron.de
I only posted this last week and there haven't been any responses yet. But as the 2022.07 release is approaching and you were asking for pending fixes, this is one you might consider.
Yes, this one is a bug fix, so it should go to 2022.07 final.
Reviewed-by: Fabio Estevam festevam@denx.de
On Tue, Jun 14, 2022 at 03:03:18PM +0200, Frieder Schrempf wrote:
From: Frieder Schrempf frieder.schrempf@kontron.de
This syncs the devicetree files with the latest Linux kernel (5.19-rc2). This also fixes the currently broken ethernet support:
Before:
Net: Could not get PHY for FEC0: addr 0
After:
Net: eth0: ethernet@30be0000
Signed-off-by: Frieder Schrempf frieder.schrempf@kontron.de Reviewed-by: Fabio Estevam festevam@denx.de
Applied to u-boot/master, thanks!
participants (5)
-
Fabio Estevam -
Fabio Estevam -
Frieder Schrempf -
Frieder Schrempf -
Tom Rini