Commit 3a29339b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

UniPhier ARM SoC DT updates for v5.6

- Add pinmux nodes for I2C ch5, ch6

- Add reset-names to NAND controller node

* tag 'uniphier-dt-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add reset-names to NAND controller node
  ARM: dts: uniphier: add pinmux nodes for I2C ch5, ch6

Link: https://lore.kernel.org/r/CAK7LNARYrzv4QU-eXxqYCcC9dziJmx9F02YNZ3mMnF47EfL3fA@mail.gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9b0b308a 37f3e009

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

+2 −1
Original line number Diff line number Diff line
@@ -410,7 +410,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/arm/boot/dts/uniphier-pinctrl.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -106,6 +106,16 @@ 
		function = "i2c4";

	};



	pinctrl_i2c5: i2c5 {

		groups = "i2c5";

		function = "i2c5";

	};



	pinctrl_i2c6: i2c6 {

		groups = "i2c6";

		function = "i2c6";

	};



	pinctrl_nand: nand {

		groups = "nand";

		function = "nand";

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

+2 −1
Original line number Diff line number Diff line
@@ -600,7 +600,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/arm/boot/dts/uniphier-pro5.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -465,7 +465,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>;

		};



		emmc: sdhc@68400000 {

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

+2 −1
Original line number Diff line number Diff line
@@ -773,7 +773,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