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

Commit 86dc4eaf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'uniphier-dt-v4.20' of... 

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

UniPhier ARM SoC DT updates for v4.20

- Add more clocks to NAND controller nodes

- Add SPI controller nodes

- Add SD controller nodes

- Add USB 3.0 and its PHY nodes

- Add PHY nodes for USB 2.0

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

:
  arm64: dts: uniphier: Add USB2 PHY nodes
  arm64: dts: uniphier: Add USB3 controller nodes
  ARM: dts: uniphier: Add USB2 PHY nodes
  ARM: dts: uniphier: Add USB3 controller nodes
  arm64: dts: uniphier: add SD controller nodes
  ARM: dts: uniphier: add SD/eMMC controller nodes
  arm64: dts: uniphier: add SPI node for LD20, LD11 and PXs3
  ARM: dts: uniphier: add SPI node for UniPhier 32bit SoCs
  ARM: dts: uniphier: add SPI pin-mux node
  arm64: uniphier: dts: add more clocks to Denali NAND controller node
  ARM: uniphier: dts: add more clocks to Denali NAND controller node

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b9734c59 546cba06

arch/arm/boot/dts/uniphier-ld4-ref.dts

+4 −0
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ 
	status = "okay";

};



&sd {

	status = "okay";

};



&usb0 {

	status = "okay";

};

arch/arm/boot/dts/uniphier-ld4.dtsi

+47 −1
Original line number Diff line number Diff line
@@ -63,6 +63,17 @@ 
			cache-level = <2>;

		};



		spi: spi@54006000 {

			compatible = "socionext,uniphier-scssi";

			status = "disabled";

			reg = <0x54006000 0x100>;

			interrupts = <0 39 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_spi0>;

			clocks = <&peri_clk 11>;

			resets = <&peri_rst 11>;

		};



		serial0: serial@54006800 {

			compatible = "socionext,uniphier-uart";

			status = "disabled";
@@ -224,6 +235,40 @@ 
			};

		};



		sd: sdhc@5a400000 {

			compatible = "socionext,uniphier-sd-v2.91";

			status = "disabled";

			reg = <0x5a400000 0x200>;

			interrupts = <0 76 4>;

			pinctrl-names = "default", "uhs";

			pinctrl-0 = <&pinctrl_sd>;

			pinctrl-1 = <&pinctrl_sd_uhs>;

			clocks = <&mio_clk 0>;

			reset-names = "host", "bridge";

			resets = <&mio_rst 0>, <&mio_rst 3>;

			bus-width = <4>;

			cap-sd-highspeed;

			sd-uhs-sdr12;

			sd-uhs-sdr25;

			sd-uhs-sdr50;

		};



		emmc: sdhc@5a500000 {

			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", "hw";

			resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;

			bus-width = <8>;

			cap-mmc-highspeed;

			cap-mmc-hw-reset;

			non-removable;

		};



		usb0: usb@5a800100 {

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

			status = "disabled";
@@ -347,7 +392,8 @@ 
			interrupts = <0 65 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_nand2cs>;

			clocks = <&sys_clk 2>;

			clock-names = "nand", "nand_x", "ecc";

			clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;

			resets = <&sys_rst 2>;

		};

	};

arch/arm/boot/dts/uniphier-ld6b-ref.dts

+12 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ 
	status = "okay";

};



&sd {

	status = "okay";

};



&eth {

	status = "okay";

	phy-handle = <&ethphy>;
@@ -76,6 +80,14 @@ 
	};

};



&usb0 {

	status = "okay";

};



&usb1 {

	status = "okay";

};



&nand {

	status = "okay";

};

arch/arm/boot/dts/uniphier-pinctrl.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -121,11 +121,36 @@ 
		function = "sd";

	};



	pinctrl_sd_uhs: sd-uhs {

		groups = "sd";

		function = "sd";

	};



	pinctrl_sd1: sd1 {

		groups = "sd1";

		function = "sd1";

	};



	pinctrl_spi0: spi0 {

		groups = "spi0";

		function = "spi0";

	};



	pinctrl_spi1: spi1 {

		groups = "spi1";

		function = "spi1";

	};



	pinctrl_spi2: spi2 {

		groups = "spi2";

		function = "spi2";

	};



	pinctrl_spi3: spi3 {

		groups = "spi3";

		function = "spi3";

	};



	pinctrl_system_bus: system-bus {

		groups = "system_bus", "system_bus_cs1";

		function = "system_bus";

arch/arm/boot/dts/uniphier-pro4-ace.dts

+12 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ 
	status = "okay";

};



&sd {

	status = "okay";

};



&usb2 {

	status = "okay";

};
@@ -86,3 +90,11 @@ 
		reg = <1>;

	};

};



&usb0 {

	status = "okay";

};



&usb1 {

	status = "okay";

};