diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-18 20:32:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-18 20:32:07 -0400 |
| commit | 62a09f45ab824c5fdebf0217c774bededf223232 (patch) | |
| tree | 32ad59e054f8c1640374b0eee25eb4e6695e2a16 /arch | |
| parent | 0de815356474912ef5bef9a69f0327a5a93bb2c2 (diff) | |
| parent | bbfc562719c463ba6e7b03125aedd5720a325d2d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 23 |
2 files changed, 23 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index a946af816f..949eb28dfa 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -125,6 +125,7 @@ config SANDBOX imply PCH imply PHYLIB imply DM_MDIO + imply DM_MDIO_MUX config SH bool "SuperH architecture" diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 531c1afc97..a0856764f6 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -824,7 +824,28 @@ dma-names = "m2m", "tx0", "rx0"; }; - mdio-test { + /* + * keep mdio-mux ahead of mdio so that the mux is removed first at the + * end of the test. If parent mdio is removed first, clean-up of the + * mux will trigger a 2nd probe of parent-mdio, leaving parent-mdio + * active at the end of the test. That it turn doesn't allow the mdio + * class to be destroyed, triggering an error. + */ + mdio-mux-test { + compatible = "sandbox,mdio-mux"; + #address-cells = <1>; + #size-cells = <0>; + mdio-parent-bus = <&mdio>; + + mdio-ch-test@0 { + reg = <0>; + }; + mdio-ch-test@1 { + reg = <1>; + }; + }; + + mdio: mdio-test { compatible = "sandbox,mdio"; }; }; |