Merge branch 'arm-dts-imx6ul-extend-var-som-6ul-and-add-dart-6ul-support'

Stefano Radaelli says:

====================
ARM: dts: imx6ul: Extend VAR-SOM-6UL and add DART-6UL support [part]

[...]

The Micrel binding change in patch 5 is needed by the Ethernet PHY
descriptions in this series. The existing boolean definition of
micrel,rmii-reference-clock-select-25-mhz conflicts with the dt-schema
unit check for properties ending in -mhz. The binding now accepts <1>
for 25 MHz selection and limits the property to the applicable PHYs.
Patch 4 changes the Micrel driver to test for property presence without
warning about the numeric value. This preserves its runtime behavior.
====================

Link: https://patch.msgid.link/cover.1791487179.git.stefano.r@variscite.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2026-10-16 16:46:29 -07:00
commit 1286f6b486
2 changed files with 21 additions and 8 deletions

View File

@ -63,6 +63,14 @@ properties:
minimum: 0
maximum: 3
micrel,rmii-reference-clock-select-25-mhz:
enum: [ 1 ]
description: |
RMII Reference Clock Select bit selects 25 MHz mode.
Setting the RMII Reference Clock Select bit enables 25 MHz rather
than 50 MHz clock mode.
allOf:
- $ref: ethernet-phy.yaml#
- if:
@ -90,6 +98,18 @@ allOf:
then:
properties:
micrel,led-mode: false
- if:
not:
properties:
compatible:
contains:
enum:
- ethernet-phy-id0022.1555
- ethernet-phy-id0022.1556
- ethernet-phy-id0022.1560
then:
properties:
micrel,rmii-reference-clock-select-25-mhz: false
- if:
properties:
compatible:
@ -105,13 +125,6 @@ allOf:
description:
The RMII reference input clock. Used to determine the XI input
clock.
micrel,rmii-reference-clock-select-25-mhz:
type: boolean
description: |
RMII Reference Clock Select bit selects 25 MHz mode
Setting the RMII Reference Clock Select bit enables 25 MHz rather
than 50 MHz clock mode.
dependentRequired:
micrel,rmii-reference-clock-select-25-mhz: [ clock-names ]

View File

@ -2791,7 +2791,7 @@ static int kszphy_probe(struct phy_device *phydev)
if (type)
priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel;
rmii_ref_clk_sel_25_mhz = of_property_read_bool(np,
rmii_ref_clk_sel_25_mhz = of_property_present(np,
"micrel,rmii-reference-clock-select-25-mhz");
if (rate > 24500000 && rate < 25500000) {