Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f41afa53 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'uniphier-dt64-v4.11' of... 

Merge tag 'uniphier-dt64-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt64

UniPhier ARM64 SoC DT updates for v4.11

- Add an SD reset controller node for LD11 SoC
- Add an eMMC controller node for LD11/LD20 SoC

* tag 'uniphier-dt64-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier

:
  arm64: dts: uniphier: add eMMC controller node for LD11/LD20
  arm64: dts: uniphier: add SD-ctrl node for LD11 SoC

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dc6328fe 3a93cc26

arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -273,6 +273,17 @@ 
			reg = <0x59801000 0x400>;

		};



		sdctrl@59810000 {

			compatible = "socionext,uniphier-ld11-sdctrl",

				     "simple-mfd", "syscon";

			reg = <0x59810000 0x400>;



			sd_rst: reset {

				compatible = "socionext,uniphier-ld11-sd-reset";

				#reset-cells = <1>;

			};

		};



		perictrl@59820000 {

			compatible = "socionext,uniphier-ld11-perictrl",

				     "simple-mfd", "syscon";
@@ -289,6 +300,16 @@ 
			};

		};



		emmc: sdhc@5a000000 {

			compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";

			reg = <0x5a000000 0x400>;

			interrupts = <0 78 4>;

			clocks = <&sys_clk 4>;

			bus-width = <8>;

			mmc-ddr-1_8v;

			mmc-hs200-1_8v;

		};



		usb0: usb@5a800100 {

			compatible = "socionext,uniphier-ehci", "generic-ehci";

			status = "disabled";

arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -374,6 +374,16 @@ 
			};

		};



		emmc: sdhc@5a000000 {

			compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";

			reg = <0x5a000000 0x400>;

			interrupts = <0 78 4>;

			clocks = <&sys_clk 4>;

			bus-width = <8>;

			mmc-ddr-1_8v;

			mmc-hs200-1_8v;

		};



		soc-glue@5f800000 {

			compatible = "socionext,uniphier-ld20-soc-glue",

				     "simple-mfd", "syscon";