diff options
| author | Tom Rini <trini@konsulko.com> | 2024-02-28 19:20:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-02-28 19:20:00 -0500 |
| commit | cfc3e1db499d7d4307559cc911aa914dd131f945 (patch) | |
| tree | f6a54d49134d05934a041500c5e866e4e00010cf | |
| parent | 463a3162dd661a53e2eb735fe63582874076f73f (diff) | |
| parent | 9885161469c3cd56b3632c8fcb414e9b3d0b8cf8 (diff) | |
| download | u-boot-WIP/28Feb2024-next.tar.gz | |
Merge patch series "mux: Drop usage of "u-boot,mux-autoprobe""WIP/28Feb2024-next
Roger Quadros <rogerq@kernel.org> says:
MUX driver should autoprobe if the device tree has "idle-states"
property. Drop using the custom "u-boot,mux-autoprobe" property
in TI device trees.
| -rw-r--r-- | arch/arm/dts/k3-am642-sk-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/k3-j721e-sk-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | drivers/mux/mux-uclass.c | 3 |
5 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi index 2eb227c1d00..ea200a1ee1c 100644 --- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi @@ -185,7 +185,7 @@ }; &serdes_ln_ctrl { - u-boot,mux-autoprobe; + bootph-all; }; &usbss0 { diff --git a/arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi b/arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi index 017a5a722e0..f83caf79988 100644 --- a/arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi +++ b/arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi @@ -165,7 +165,6 @@ &serdes_ln_ctrl { bootph-all; - u-boot,mux-autoprobe; }; &serdes2_usb_link { @@ -174,7 +173,6 @@ &usb_serdes_mux { bootph-all; - u-boot,mux-autoprobe; }; &serdes_wiz2 { diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi index 7ae7cf3d4c9..9433f3bafae 100644 --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi @@ -94,11 +94,11 @@ }; &serdes_ln_ctrl { - u-boot,mux-autoprobe; + bootph-all; }; &usb_serdes_mux { - u-boot,mux-autoprobe; + bootph-all; }; &main_usbss0_pins_default { diff --git a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi index 479b7bcd6f8..fff447094ae 100644 --- a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi @@ -90,11 +90,11 @@ }; &serdes_ln_ctrl { - u-boot,mux-autoprobe; + bootph-all; }; &usb_serdes_mux { - u-boot,mux-autoprobe; + bootph-all; }; &main_usbss0_pins_default { diff --git a/drivers/mux/mux-uclass.c b/drivers/mux/mux-uclass.c index c98576ceb81..8833888ded3 100644 --- a/drivers/mux/mux-uclass.c +++ b/drivers/mux/mux-uclass.c @@ -318,7 +318,8 @@ int dm_mux_init(void) return ret; } uclass_foreach_dev(dev, uc) { - if (dev_read_bool(dev, "u-boot,mux-autoprobe")) { + if (dev_read_bool(dev, "u-boot,mux-autoprobe") || + dev_read_bool(dev, "idle-states")) { ret = device_probe(dev); if (ret) log_debug("unable to probe device %s\n", |