linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3] ARM: dts: dove.dtsi: Move ethphy to fix schema error
@ 2022-12-29 18:01 Michał Grzelak
  2022-12-30 16:00 ` Andrew Lunn
  2023-01-31 14:39 ` Gregory CLEMENT
  0 siblings, 2 replies; 3+ messages in thread
From: Michał Grzelak @ 2022-12-29 18:01 UTC (permalink / raw)
  To: linux-kernel
  Cc: andrew, sebastian.hesselbarth, gregory.clement, robh+dt,
	krzysztof.kozlowski+dt, linux-arm-kernel, devicetree, mw,
	upstream, mchl.grzlk, Michał Grzelak

Running 'make dtbs_check' with schema in net/marvell,orion-mdio.yaml
gives following warnings:
mdio-bus@72004: Unevaluated properties are not allowed
('ethernet-phy' was unexpected)
	arch/arm/boot/dts/dove-cubox.dtb
	arch/arm/boot/dts/dove-cubox-es.dtb
	arch/arm/boot/dts/dove-d2plug.dtb
	arch/arm/boot/dts/dove-d2plug.dtb
	arch/arm/boot/dts/dove-dove-db.dtb
	arch/arm/boot/dts/dove-d3plug.dtb
	arch/arm/boot/dts/dove-sbc-a510.dtb
As every subnode of mdio is expected to have an @X, ethernet-phy subnode
in dove.dtsi doesn't have one. Fix these errors by moving ethernet-phy
into relevant .dts files with correct @<reg address>.

Signed-off-by: Michał Grzelak <mig@semihalf.com>
---
Changelog:
v2->v3
- edit commit message according to
  https://lore.kernel.org/all/Y6zuJrb+8j+XCksN@lunn.ch/

v1->v2
- remove patternProperties: from .yaml
- move ethphy from dove.dtsi into relevant .dts files

 arch/arm/boot/dts/dove-cm-a510.dtsi | 14 +++++++++++---
 arch/arm/boot/dts/dove-cubox.dts    | 15 +++++++++++----
 arch/arm/boot/dts/dove.dtsi         |  5 -----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/dove-cm-a510.dtsi b/arch/arm/boot/dts/dove-cm-a510.dtsi
index 9b9dfbe07be4..2f2f0a4bf004 100644
--- a/arch/arm/boot/dts/dove-cm-a510.dtsi
+++ b/arch/arm/boot/dts/dove-cm-a510.dtsi
@@ -124,9 +124,17 @@ wifi_power: regulator@1 {
 };
 
 /* Optional RTL8211D GbE PHY on SMI address 0x03 */
-&ethphy {
-	reg = <3>;
-	status = "disabled";
+&mdio {
+	ethphy: ethernet-phy@3 {
+		reg = <3>;
+		status = "disabled";
+	};
+};
+
+&eth {
+	ethernet-port@0 {
+		phy-handle = <&ethphy>;
+	};
 };
 
 &i2c0 {
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index 2639b9fe0ab4..170c14d7f5c8 100644
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -72,11 +72,18 @@ gpu-subsystem {
 &uart0 { status = "okay"; };
 &sata0 { status = "okay"; };
 &mdio { status = "okay"; };
-&eth { status = "okay"; };
+&eth {
+	status = "okay";
+	ethernet-port@0 {
+		phy-handle = <&ethphy>;
+	};
+};
 
-&ethphy {
-	compatible = "marvell,88e1310";
-	reg = <1>;
+&mdio {
+	ethphy: ethernet-phy@1 {
+		compatible = "marvell,88e1310";
+		reg = <1>;
+	};
 };
 
 &gpu {
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 00a36fba2fd2..c7a3fa33c56e 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -382,7 +382,6 @@ ethernet-port@0 {
 					interrupts = <29>;
 					/* overwrite MAC address in bootloader */
 					local-mac-address = [00 00 00 00 00 00];
-					phy-handle = <&ethphy>;
 				};
 			};
 
@@ -394,10 +393,6 @@ mdio: mdio-bus@72004 {
 				interrupts = <30>;
 				clocks = <&gate_clk 2>;
 				status = "disabled";
-
-				ethphy: ethernet-phy {
-					/* set phy address in board file */
-				};
 			};
 
 			sdio0: sdio-host@92000 {
-- 
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH v3] ARM: dts: dove.dtsi: Move ethphy to fix schema error
  2022-12-29 18:01 [PATCH v3] ARM: dts: dove.dtsi: Move ethphy to fix schema error Michał Grzelak
@ 2022-12-30 16:00 ` Andrew Lunn
  2023-01-31 14:39 ` Gregory CLEMENT
  1 sibling, 0 replies; 3+ messages in thread
From: Andrew Lunn @ 2022-12-30 16:00 UTC (permalink / raw)
  To: Michał Grzelak
  Cc: linux-kernel, sebastian.hesselbarth, gregory.clement, robh+dt,
	krzysztof.kozlowski+dt, linux-arm-kernel, devicetree, mw,
	upstream, mchl.grzlk

On Thu, Dec 29, 2022 at 07:01:55PM +0100, Michał Grzelak wrote:
> Running 'make dtbs_check' with schema in net/marvell,orion-mdio.yaml
> gives following warnings:
> mdio-bus@72004: Unevaluated properties are not allowed
> ('ethernet-phy' was unexpected)
> 	arch/arm/boot/dts/dove-cubox.dtb
> 	arch/arm/boot/dts/dove-cubox-es.dtb
> 	arch/arm/boot/dts/dove-d2plug.dtb
> 	arch/arm/boot/dts/dove-d2plug.dtb
> 	arch/arm/boot/dts/dove-dove-db.dtb
> 	arch/arm/boot/dts/dove-d3plug.dtb
> 	arch/arm/boot/dts/dove-sbc-a510.dtb
> As every subnode of mdio is expected to have an @X, ethernet-phy subnode
> in dove.dtsi doesn't have one. Fix these errors by moving ethernet-phy
> into relevant .dts files with correct @<reg address>.
> 
> Signed-off-by: Michał Grzelak <mig@semihalf.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH v3] ARM: dts: dove.dtsi: Move ethphy to fix schema error
  2022-12-29 18:01 [PATCH v3] ARM: dts: dove.dtsi: Move ethphy to fix schema error Michał Grzelak
  2022-12-30 16:00 ` Andrew Lunn
@ 2023-01-31 14:39 ` Gregory CLEMENT
  1 sibling, 0 replies; 3+ messages in thread
From: Gregory CLEMENT @ 2023-01-31 14:39 UTC (permalink / raw)
  To: Michał Grzelak, linux-kernel
  Cc: andrew, sebastian.hesselbarth, robh+dt, krzysztof.kozlowski+dt,
	linux-arm-kernel, devicetree, mw, upstream, mchl.grzlk,
	Michał Grzelak

Michał Grzelak <mig@semihalf.com> writes:

> Running 'make dtbs_check' with schema in net/marvell,orion-mdio.yaml
> gives following warnings:
> mdio-bus@72004: Unevaluated properties are not allowed
> ('ethernet-phy' was unexpected)
> 	arch/arm/boot/dts/dove-cubox.dtb
> 	arch/arm/boot/dts/dove-cubox-es.dtb
> 	arch/arm/boot/dts/dove-d2plug.dtb
> 	arch/arm/boot/dts/dove-d2plug.dtb
> 	arch/arm/boot/dts/dove-dove-db.dtb
> 	arch/arm/boot/dts/dove-d3plug.dtb
> 	arch/arm/boot/dts/dove-sbc-a510.dtb
> As every subnode of mdio is expected to have an @X, ethernet-phy subnode
> in dove.dtsi doesn't have one. Fix these errors by moving ethernet-phy
> into relevant .dts files with correct @<reg address>.
>
> Signed-off-by: Michał Grzelak <mig@semihalf.com>

Applied on mvebu/dt

Thanks,

Gregory

> ---
> Changelog:
> v2->v3
> - edit commit message according to
>   https://lore.kernel.org/all/Y6zuJrb+8j+XCksN@lunn.ch/
>
> v1->v2
> - remove patternProperties: from .yaml
> - move ethphy from dove.dtsi into relevant .dts files
>
>  arch/arm/boot/dts/dove-cm-a510.dtsi | 14 +++++++++++---
>  arch/arm/boot/dts/dove-cubox.dts    | 15 +++++++++++----
>  arch/arm/boot/dts/dove.dtsi         |  5 -----
>  3 files changed, 22 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/dove-cm-a510.dtsi b/arch/arm/boot/dts/dove-cm-a510.dtsi
> index 9b9dfbe07be4..2f2f0a4bf004 100644
> --- a/arch/arm/boot/dts/dove-cm-a510.dtsi
> +++ b/arch/arm/boot/dts/dove-cm-a510.dtsi
> @@ -124,9 +124,17 @@ wifi_power: regulator@1 {
>  };
>  
>  /* Optional RTL8211D GbE PHY on SMI address 0x03 */
> -&ethphy {
> -	reg = <3>;
> -	status = "disabled";
> +&mdio {
> +	ethphy: ethernet-phy@3 {
> +		reg = <3>;
> +		status = "disabled";
> +	};
> +};
> +
> +&eth {
> +	ethernet-port@0 {
> +		phy-handle = <&ethphy>;
> +	};
>  };
>  
>  &i2c0 {
> diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
> index 2639b9fe0ab4..170c14d7f5c8 100644
> --- a/arch/arm/boot/dts/dove-cubox.dts
> +++ b/arch/arm/boot/dts/dove-cubox.dts
> @@ -72,11 +72,18 @@ gpu-subsystem {
>  &uart0 { status = "okay"; };
>  &sata0 { status = "okay"; };
>  &mdio { status = "okay"; };
> -&eth { status = "okay"; };
> +&eth {
> +	status = "okay";
> +	ethernet-port@0 {
> +		phy-handle = <&ethphy>;
> +	};
> +};
>  
> -&ethphy {
> -	compatible = "marvell,88e1310";
> -	reg = <1>;
> +&mdio {
> +	ethphy: ethernet-phy@1 {
> +		compatible = "marvell,88e1310";
> +		reg = <1>;
> +	};
>  };
>  
>  &gpu {
> diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
> index 00a36fba2fd2..c7a3fa33c56e 100644
> --- a/arch/arm/boot/dts/dove.dtsi
> +++ b/arch/arm/boot/dts/dove.dtsi
> @@ -382,7 +382,6 @@ ethernet-port@0 {
>  					interrupts = <29>;
>  					/* overwrite MAC address in bootloader */
>  					local-mac-address = [00 00 00 00 00 00];
> -					phy-handle = <&ethphy>;
>  				};
>  			};
>  
> @@ -394,10 +393,6 @@ mdio: mdio-bus@72004 {
>  				interrupts = <30>;
>  				clocks = <&gate_clk 2>;
>  				status = "disabled";
> -
> -				ethphy: ethernet-phy {
> -					/* set phy address in board file */
> -				};
>  			};
>  
>  			sdio0: sdio-host@92000 {
> -- 
> 2.34.1
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-31 14:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-29 18:01 [PATCH v3] ARM: dts: dove.dtsi: Move ethphy to fix schema error Michał Grzelak
2022-12-30 16:00 ` Andrew Lunn
2023-01-31 14:39 ` Gregory CLEMENT

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).