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

Merge tag 'uniphier-dt64-v5.6' of... 

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

UniPhier ARM64 SoC DT updates for v5.6

- Add reset-names to NAND controller node

* tag 'uniphier-dt64-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: add reset-names to NAND controller node

Link: https://lore.kernel.org/r/CAK7LNASehDHWgOug=Rz0uBBSP2ntJnNLiarfSdj97tZu+OXLkA@mail.gmail.com


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

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

+2 −1
Original line number Diff line number Diff line
@@ -633,7 +633,8 @@ 
			pinctrl-0 = <&pinctrl_nand>;

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

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

			resets = <&sys_rst 2>;

			reset-names = "nand", "reg";

			resets = <&sys_rst 2>, <&sys_rst 2>;

		};

	};

};

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

+2 −1
Original line number Diff line number Diff line
@@ -937,7 +937,8 @@ 
			pinctrl-0 = <&pinctrl_nand>;

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

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

			resets = <&sys_rst 2>;

			reset-names = "nand", "reg";

			resets = <&sys_rst 2>, <&sys_rst 2>;

		};

	};

};

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

+2 −1
Original line number Diff line number Diff line
@@ -795,7 +795,8 @@ 
			pinctrl-0 = <&pinctrl_nand>;

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

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

			resets = <&sys_rst 2>;

			reset-names = "nand", "reg";

			resets = <&sys_rst 2>, <&sys_rst 2>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE