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

Commit 2bfd84b3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'uniphier-dt-v5.3' of... 

Merge tag 'uniphier-dt-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into arm/dt

UniPhier ARM SoC DT updates for v5.3

- Migrate to the new binding for the Denali NAND controller

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

:
  ARM: dts: uniphier: update to new Denali NAND binding

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

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

+4 −0
Original line number Diff line number Diff line
@@ -77,4 +77,8 @@ 


&nand {

	status = "okay";



	nand@0 {

		reg = <0>;

	};

};

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

+3 −1
Original line number Diff line number Diff line
@@ -403,9 +403,11 @@ 
			status = "disabled";

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

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

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0 65 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_nand2cs>;

			pinctrl-0 = <&pinctrl_nand>;

			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

+4 −0
Original line number Diff line number Diff line
@@ -90,4 +90,8 @@ 


&nand {

	status = "okay";



	nand@0 {

		reg = <0>;

	};

};

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

+4 −0
Original line number Diff line number Diff line
@@ -98,4 +98,8 @@ 


&nand {

	status = "okay";



	nand@0 {

		reg = <0>;

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -593,6 +593,8 @@ 
			status = "disabled";

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

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

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0 65 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_nand>;