From 33aae6b5ed54168b763f60021ef38423e45f72ca Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 10 Sep 2018 12:58:32 +0900 Subject: ARM: dts: uniphier: sync DT with Linux 4.19-rc1 Signed-off-by: Masahiro Yamada --- arch/arm/dts/uniphier-sld8.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/dts/uniphier-sld8.dtsi') diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi index f20926e4a9..35c2f856f0 100644 --- a/arch/arm/dts/uniphier-sld8.dtsi +++ b/arch/arm/dts/uniphier-sld8.dtsi @@ -251,9 +251,8 @@ status = "disabled"; reg = <0x5a500000 0x200>; interrupts = <0 78 4>; - pinctrl-names = "default", "1.8v"; + pinctrl-names = "default"; pinctrl-0 = <&pinctrl_emmc>; - pinctrl-1 = <&pinctrl_emmc_1v8>; clocks = <&mio_clk 1>; reset-names = "host", "bridge"; resets = <&mio_rst 1>, <&mio_rst 4>; -- cgit From c3ab1e118fc64b5ac49e949dab40507f6fdbbde3 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 10 Sep 2018 12:58:35 +0900 Subject: mmc: uniphier-sd: sync with Linux Sync with the driver code and the binding recently merged in Linux. Signed-off-by: Masahiro Yamada --- arch/arm/dts/uniphier-sld8.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'arch/arm/dts/uniphier-sld8.dtsi') diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi index 35c2f856f0..437265bb73 100644 --- a/arch/arm/dts/uniphier-sld8.dtsi +++ b/arch/arm/dts/uniphier-sld8.dtsi @@ -229,13 +229,13 @@ }; sd: sdhc@5a400000 { - compatible = "socionext,uniphier-sdhc"; + compatible = "socionext,uniphier-sd-v2.91"; status = "disabled"; reg = <0x5a400000 0x200>; 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 = <&mio_clk 0>; reset-names = "host", "bridge"; resets = <&mio_rst 0>, <&mio_rst 3>; @@ -247,19 +247,19 @@ }; emmc: sdhc@5a500000 { - compatible = "socionext,uniphier-sdhc"; + compatible = "socionext,uniphier-sd-v2.91"; status = "disabled"; reg = <0x5a500000 0x200>; interrupts = <0 78 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_emmc>; clocks = <&mio_clk 1>; - reset-names = "host", "bridge"; - resets = <&mio_rst 1>, <&mio_rst 4>; + reset-names = "host", "bridge", "hw"; + resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>; bus-width = <8>; - non-removable; cap-mmc-highspeed; cap-mmc-hw-reset; + non-removable; }; usb0: usb@5a800100 { -- cgit