diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-21 09:02:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-21 09:02:35 -0400 |
| commit | dc7df68f21093039b3ab1a1702f5b7cd3e621431 (patch) | |
| tree | 08de60286630dd90c2e581f7ca97b4b72c8cd266 /arch | |
| parent | 8f08dfd133e389f3922fb497d072003893dd120b (diff) | |
| parent | 2c84d5218e7e379dce493080a01938530b477611 (diff) | |
| download | u-boot-dc7df68f21093039b3ab1a1702f5b7cd3e621431.zip u-boot-dc7df68f21093039b3ab1a1702f5b7cd3e621431.tar.gz u-boot-dc7df68f21093039b3ab1a1702f5b7cd3e621431.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/r8a77970-eagle.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/r8a77990-ebisu.dts | 38 |
2 files changed, 39 insertions, 1 deletions
diff --git a/arch/arm/dts/r8a77970-eagle.dts b/arch/arm/dts/r8a77970-eagle.dts index 5b8b2f8..5dcad63 100644 --- a/arch/arm/dts/r8a77970-eagle.dts +++ b/arch/arm/dts/r8a77970-eagle.dts @@ -39,13 +39,13 @@ phy-handle = <&phy0>; phy-mode = "rgmii-id"; status = "okay"; - reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; phy0: ethernet-phy@0 { rxc-skew-ps = <1500>; reg = <0>; interrupt-parent = <&gpio1>; interrupts = <17 IRQ_TYPE_LEVEL_LOW>; + reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; }; }; diff --git a/arch/arm/dts/r8a77990-ebisu.dts b/arch/arm/dts/r8a77990-ebisu.dts index 1946999..8b0d24b 100644 --- a/arch/arm/dts/r8a77990-ebisu.dts +++ b/arch/arm/dts/r8a77990-ebisu.dts @@ -28,6 +28,24 @@ /* first 128MB is reserved for secure area. */ reg = <0x0 0x48000000 0x0 0x38000000>; }; + + reg_1p8v: regulator0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_3p3v: regulator1 { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; }; &avb { @@ -71,6 +89,18 @@ groups = "scif_clk_a"; function = "scif_clk"; }; + + sdhi3_pins: sd2 { + groups = "sdhi3_data8", "sdhi3_ctrl"; + function = "sdhi3"; + power-source = <1800>; + }; + + sdhi3_pins_uhs: sd2_uhs { + groups = "sdhi3_data8", "sdhi3_ctrl"; + function = "sdhi3"; + power-source = <1800>; + }; }; &sdhi0 { @@ -82,7 +112,15 @@ }; &sdhi3 { + /* used for on-board 8bit eMMC */ + pinctrl-0 = <&sdhi3_pins>; + pinctrl-1 = <&sdhi3_pins_uhs>; + pinctrl-names = "default", "state_uhs"; + + vmmc-supply = <®_3p3v>; + vqmmc-supply = <®_1p8v>; bus-width = <8>; + mmc-hs200-1_8v; non-removable; status = "okay"; }; |