diff mbox series

[1/2] arm64: armada-37xx: dts: sync armada-3720-espressobin.dts with u-boot-marvell

Message ID CAGwvh_PFPBcnbtt6RT3h+eQgQQpP7Kyq6bBDhwAkTTsyEeSA-Q@mail.gmail.com
State Superseded
Delegated to: Stefan Roese
Headers show
Series fixes for basic espressobin support | expand

Commit Message

Peter Vollmer April 30, 2020, 1:12 p.m. UTC 
from https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/blob/u-boot-2018.03-armada-18.12/arch/arm/dts/armada-3720-espressobin.dts

fix comphy mode settings for USB3 (working)
fix comphy mode setting for network (working)
fix comphy mode setting for SATA (not yet working)
add config for SD card (working)
add voltage regulator for SDHC/SDXC SD cards (not yet tested)
add config for EMMC flash (working)

Signed-off-by: Peter Vollmer <peter.vollmer@gmail.com>
---
 arch/arm/dts/armada-3720-espressobin.dts | 49 +++++++++++++++++++++---
 1 file changed, 44 insertions(+), 5 deletions(-)

--
2.20.1
diff mbox series

Patch

diff --git a/arch/arm/dts/armada-3720-espressobin.dts
b/arch/arm/dts/armada-3720-espressobin.dts
index 84e2c2adba..393feb0c23 100644
--- a/arch/arm/dts/armada-3720-espressobin.dts
+++ b/arch/arm/dts/armada-3720-espressobin.dts
@@ -67,23 +67,34 @@ 
                device_type = "memory";
                reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
        };
+
+       vcc_sd_reg0: regulator@0 {
+               compatible = "regulator-gpio";
+               regulator-name = "vcc_sd0";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-type = "voltage";
+               states = <1800000 0x1
+                       3300000 0x0>;
+               gpios = <&gpionb 4 GPIO_ACTIVE_HIGH>;
+       };
 };

 &comphy {
        max-lanes = <3>;
        phy0 {
-               phy-type = <PHY_TYPE_PEX0>;
-               phy-speed = <PHY_SPEED_2_5G>;
+               phy-type = <PHY_TYPE_USB3_HOST0>;
+               phy-speed = <PHY_SPEED_5G>;
        };

        phy1 {
-               phy-type = <PHY_TYPE_USB3_HOST0>;
-               phy-speed = <PHY_SPEED_5G>;
+               phy-type = <PHY_TYPE_PEX0>;
+               phy-speed = <PHY_SPEED_2_5G>;
        };

        phy2 {
                phy-type = <PHY_TYPE_SATA0>;
-               phy-speed = <PHY_SPEED_5G>;
+               phy-speed = <PHY_SPEED_6G>;
        };
 };

@@ -110,6 +121,34 @@ 
        status = "okay";
 };

+/* SD card */
+&sdhci0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdio_pins>;
+       bus-width = <4>;
+       vqmmc-supply = <&vcc_sd_reg0>;
+       status = "okay";
+};
+
+/* enable if EMMC present on board */
+&sdhci1 {
+       non-removable;
+       bus-width = <8>;
+       mmc-ddr-1_8v;
+       mmc-hs400-1_8v;
+       marvell,pad-type = "fixed-1-8v";
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc_pins>;
+       status = "okay";
+
+       #address-cells = <1>;
+       #size-cells = <0>;
+       mmccard: mmccard@0 {
+               compatible = "mmc-card";
+               reg = <0>;
+       };
+};
+
 &spi0 {
        status = "okay";
        pinctrl-names = "default";