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

Commit 029fb7c2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "UniPhier ARM64 SoC DT updates for v4.14" from Masahiro Yamada:

- add nodes for NAND, Watchdog
- replace /include/ with #include
- use #include <arm/...> instead of symlinks

* tag 'uniphier-dt64-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: add Denali NAND controller nodes
  arm64: dts: uniphier: use cross-arch include instead of symlinks
  arm64: dts: uniphier: use #include instead of /include/
  arm64: dts: uniphier: add watchdog node for LD11 and LD20
parents 23f8f601 e5aefb38

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

+5 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



/dts-v1/;

/include/ "uniphier-ld11.dtsi"

#include "uniphier-ld11.dtsi"



/ {

	model = "UniPhier LD11 Global Board (REF_LD11_GP)";
@@ -68,3 +68,7 @@ 
&usb2 {

	status = "okay";

};



&nand {

	status = "okay";

};

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

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
 */



/dts-v1/;

/include/ "uniphier-ld11.dtsi"

/include/ "uniphier-ref-daughter.dtsi"

/include/ "uniphier-support-card.dtsi"

#include "uniphier-ld11.dtsi"

#include "uniphier-ref-daughter.dtsi"

#include "uniphier-support-card.dtsi"



/ {

	model = "UniPhier LD11 Reference Board";

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

+16 −1
Original line number Diff line number Diff line
@@ -367,8 +367,23 @@ 
				compatible = "socionext,uniphier-ld11-reset";

				#reset-cells = <1>;

			};



			watchdog {

				compatible = "socionext,uniphier-wdt";

			};

		};



		nand: nand@68000000 {

			compatible = "socionext,uniphier-denali-nand-v5b";

			status = "disabled";

			reg-names = "nand_data", "denali_reg";

			reg = <0x68000000 0x20>, <0x68100000 0x1000>;

			interrupts = <0 65 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_nand>;

			clocks = <&sys_clk 2>;

		};

	};

};



/include/ "uniphier-pinctrl.dtsi"
 
#include "uniphier-pinctrl.dtsi"

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

+5 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



/dts-v1/;

/include/ "uniphier-ld20.dtsi"

#include "uniphier-ld20.dtsi"



/ {

	model = "UniPhier LD20 Global Board (REF_LD20_GP)";
@@ -50,3 +50,7 @@ 
&i2c0 {

	status = "okay";

};



&nand {

	status = "okay";

};

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

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
 */



/dts-v1/;

/include/ "uniphier-ld20.dtsi"

/include/ "uniphier-ref-daughter.dtsi"

/include/ "uniphier-support-card.dtsi"

#include "uniphier-ld20.dtsi"

#include "uniphier-ref-daughter.dtsi"

#include "uniphier-support-card.dtsi"



/ {

	model = "UniPhier LD20 Reference Board";