diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-09-10 12:58:35 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-09-11 20:37:18 +0900 |
| commit | c3ab1e118fc64b5ac49e949dab40507f6fdbbde3 (patch) | |
| tree | 965fc2c273cfbed8e57c1b76980908c0104953e7 /arch/arm/dts/uniphier-pro5.dtsi | |
| parent | b07f6e9faf3a111bd88a1814f346d56a6d48d215 (diff) | |
mmc: uniphier-sd: sync with Linux
Sync with the driver code and the binding recently merged in Linux.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/dts/uniphier-pro5.dtsi')
| -rw-r--r-- | arch/arm/dts/uniphier-pro5.dtsi | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi index 6aea9af2b6..6e0ea7976e 100644 --- a/arch/arm/dts/uniphier-pro5.dtsi +++ b/arch/arm/dts/uniphier-pro5.dtsi @@ -480,30 +480,29 @@ }; emmc: sdhc@68400000 { - compatible = "socionext,uniphier-sdhc"; + compatible = "socionext,uniphier-sd-v3.1"; status = "disabled"; reg = <0x68400000 0x800>; interrupts = <0 78 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_emmc>; clocks = <&sd_clk 1>; - reset-names = "host"; - resets = <&sd_rst 1>; + reset-names = "host", "hw"; + resets = <&sd_rst 1>, <&sd_rst 6>; bus-width = <8>; - non-removable; cap-mmc-highspeed; cap-mmc-hw-reset; - no-3-3-v; + non-removable; }; sd: sdhc@68800000 { - compatible = "socionext,uniphier-sdhc"; + compatible = "socionext,uniphier-sd-v3.1"; status = "disabled"; reg = <0x68800000 0x800>; interrupts = <0 76 4>; - pinctrl-names = "default", "1.8v"; + pinctrl-names = "default", "uhs"; pinctrl-0 = <&pinctrl_sd>; - pinctrl-1 = <&pinctrl_sd_1v8>; + pinctrl-1 = <&pinctrl_sd_uhs>; clocks = <&sd_clk 0>; reset-names = "host"; resets = <&sd_rst 0>; |