Skip to content

Commit e98d502

Browse files
committed
arm64: dts: uniphier: add reset-names to NAND controller node
The Denali NAND controller IP has separate reset control for the controller core and registers. Add the reset-names, and one more phandle accordingly. This is the approved DT-binding. Signed-off-by: Masahiro Yamada <[email protected]>
1 parent e42617b commit e98d502

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,8 @@
633633
pinctrl-0 = <&pinctrl_nand>;
634634
clock-names = "nand", "nand_x", "ecc";
635635
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
636-
resets = <&sys_rst 2>;
636+
reset-names = "nand", "reg";
637+
resets = <&sys_rst 2>, <&sys_rst 2>;
637638
};
638639
};
639640
};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,8 @@
937937
pinctrl-0 = <&pinctrl_nand>;
938938
clock-names = "nand", "nand_x", "ecc";
939939
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
940-
resets = <&sys_rst 2>;
940+
reset-names = "nand", "reg";
941+
resets = <&sys_rst 2>, <&sys_rst 2>;
941942
};
942943
};
943944
};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,8 @@
795795
pinctrl-0 = <&pinctrl_nand>;
796796
clock-names = "nand", "nand_x", "ecc";
797797
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
798-
resets = <&sys_rst 2>;
798+
reset-names = "nand", "reg";
799+
resets = <&sys_rst 2>, <&sys_rst 2>;
799800
};
800801
};
801802
};

0 commit comments

Comments
 (0)