diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-16 13:13:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-16 13:13:45 -0400 |
| commit | a9fa70b7b7167487affc5d919e541872c99e814b (patch) | |
| tree | ffe16fdcecb3afe742d730f3c6aa87a3caf8647c /arch/arm/dts | |
| parent | 0d6160a340cee36813438484dd9f5766c250f22e (diff) | |
| parent | 737c016d25d6c45e9c003fca9df2ca75f0b1e772 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Add emmc hs200 support
- Few bug fixes related to serdes, I2C, ethernet, etc
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/fsl-ls1012a-rdb.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/fsl-ls1028a-qds.dts | 56 | ||||
| -rw-r--r-- | arch/arm/dts/fsl-ls1028a-rdb.dts | 1 | ||||
| -rw-r--r-- | arch/arm/dts/fsl-lx2160a-rdb.dts | 1 |
4 files changed, 59 insertions, 3 deletions
diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dtsi b/arch/arm/dts/fsl-ls1012a-rdb.dtsi index f053e789c2..55155fd321 100644 --- a/arch/arm/dts/fsl-ls1012a-rdb.dtsi +++ b/arch/arm/dts/fsl-ls1012a-rdb.dtsi @@ -14,6 +14,10 @@ }; }; +&esdhc1 { + mmc-hs200-1_8v; +}; + &qspi { bus-num = <0>; status = "okay"; diff --git a/arch/arm/dts/fsl-ls1028a-qds.dts b/arch/arm/dts/fsl-ls1028a-qds.dts index 3fb35f186d..5d143ba077 100644 --- a/arch/arm/dts/fsl-ls1028a-qds.dts +++ b/arch/arm/dts/fsl-ls1028a-qds.dts @@ -33,12 +33,65 @@ &esdhc1 { status = "okay"; + }; &i2c0 { status = "okay"; u-boot,dm-pre-reloc; + fpga@66 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "simple-mfd"; + reg = <0x66>; + + mux-mdio@54 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "mdio-mux-i2creg"; + reg = <0x54>; + #mux-control-cells = <1>; + mux-reg-masks = <0x54 0xf0>; + mdio-parent-bus = <&mdio0>; + + /* on-board MDIO with a single RGMII PHY */ + mdio@00 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x00>; + + qds_phy0: phy@5 { + reg = <5>; + }; + }; + /* slot 1 */ + slot1: mdio@40 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x40>; + }; + /* slot 2 */ + slot2: mdio@50 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x50>; + }; + /* slot 3 */ + slot3: mdio@60 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x60>; + }; + /* slot 4 */ + slot4: mdio@70 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x70>; + }; + }; + }; + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; @@ -108,7 +161,4 @@ &mdio0 { status = "okay"; - qds_phy0: phy@5 { - reg = <5>; - }; }; diff --git a/arch/arm/dts/fsl-ls1028a-rdb.dts b/arch/arm/dts/fsl-ls1028a-rdb.dts index d18cf6d5ae..3d5e8ade21 100644 --- a/arch/arm/dts/fsl-ls1028a-rdb.dts +++ b/arch/arm/dts/fsl-ls1028a-rdb.dts @@ -33,6 +33,7 @@ &esdhc1 { status = "okay"; + mmc-hs200-1_8v; }; &i2c0 { diff --git a/arch/arm/dts/fsl-lx2160a-rdb.dts b/arch/arm/dts/fsl-lx2160a-rdb.dts index 7b6608b1d6..46a9239c25 100644 --- a/arch/arm/dts/fsl-lx2160a-rdb.dts +++ b/arch/arm/dts/fsl-lx2160a-rdb.dts @@ -25,6 +25,7 @@ &esdhc1 { status = "okay"; + mmc-hs200-1_8v; }; &i2c0 { |