Commit e6ecae6b authored by Olof Johansson's avatar Olof Johansson

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.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3a29339b e98d5023
...@@ -633,7 +633,8 @@ nand: nand@68000000 { ...@@ -633,7 +633,8 @@ nand: nand@68000000 {
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
clock-names = "nand", "nand_x", "ecc"; clock-names = "nand", "nand_x", "ecc";
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>; 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>;
}; };
}; };
}; };
......
...@@ -937,7 +937,8 @@ nand: nand@68000000 { ...@@ -937,7 +937,8 @@ nand: nand@68000000 {
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
clock-names = "nand", "nand_x", "ecc"; clock-names = "nand", "nand_x", "ecc";
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>; 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>;
}; };
}; };
}; };
......
...@@ -795,7 +795,8 @@ nand: nand@68000000 { ...@@ -795,7 +795,8 @@ nand: nand@68000000 {
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
clock-names = "nand", "nand_x", "ecc"; clock-names = "nand", "nand_x", "ecc";
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>; 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>;
}; };
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment