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

Commit a74c7494 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

- complete migrating to SPDX License Identifier
- remove support for old SoC
- add nodes for NAND, Audio pinctrl
- replace /include/ with #include

* tag 'uniphier-dt-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add Denali NAND controller node
  ARM: dts: uniphier use #include instead of /include/
  ARM: dts: uniphier: remove sLD3 SoC support
  ARM: dts: uniphier: add audio out pin-mux node
  ARM: dts: uniphier: use SPDX-License-Identifier (2nd)
parents 146d8cd9 69f9cdc6

arch/arm/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -974,7 +974,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \ 
	uniphier-pro4-sanji.dtb \

	uniphier-pxs2-gentil.dtb \

	uniphier-pxs2-vodka.dtb \

	uniphier-sld3-ref.dtb \

	uniphier-sld8-ref.dtb

dtb-$(CONFIG_ARCH_VERSATILE) += \

	versatile-ab.dtb \

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

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



/dts-v1/;

/include/ "uniphier-ld4.dtsi"

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

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

#include "uniphier-ld4.dtsi"

#include "uniphier-ref-daughter.dtsi"

#include "uniphier-support-card.dtsi"



/ {

	model = "UniPhier LD4 Reference Board";
@@ -64,3 +64,7 @@ 
&usb1 {

	status = "okay";

};



&nand {

	status = "okay";

};

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

+12 −1
Original line number Diff line number Diff line
@@ -285,7 +285,18 @@ 
				#reset-cells = <1>;

			};

		};



		nand: nand@68000000 {

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

			status = "disabled";

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

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

			interrupts = <0 65 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_nand2cs>;

			clocks = <&sys_clk 2>;

		};

	};

};



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

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

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



/dts-v1/;

/include/ "uniphier-ld6b.dtsi"

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

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

#include "uniphier-ld6b.dtsi"

#include "uniphier-ref-daughter.dtsi"

#include "uniphier-support-card.dtsi"



/ {

	model = "UniPhier LD6b Reference Board";
@@ -58,3 +58,7 @@ 
&i2c0 {

	status = "okay";

};



&nand {

	status = "okay";

};

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * The D-chip (digital chip) is the same as the PXs2 die.

 * Reuse the PXs2 device tree with some properties overridden.

 */

/include/ "uniphier-pxs2.dtsi"

#include "uniphier-pxs2.dtsi"



/ {

	compatible = "socionext,uniphier-ld6b";