Skip to content

Commit 37f3e00

Browse files
committed
ARM: 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 38dbf2d commit 37f3e00

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,8 @@
410410
pinctrl-0 = <&pinctrl_nand>;
411411
clock-names = "nand", "nand_x", "ecc";
412412
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
413-
resets = <&sys_rst 2>;
413+
reset-names = "nand", "reg";
414+
resets = <&sys_rst 2>, <&sys_rst 2>;
414415
};
415416
};
416417
};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,8 @@
600600
pinctrl-0 = <&pinctrl_nand>;
601601
clock-names = "nand", "nand_x", "ecc";
602602
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
603-
resets = <&sys_rst 2>;
603+
reset-names = "nand", "reg";
604+
resets = <&sys_rst 2>, <&sys_rst 2>;
604605
};
605606
};
606607
};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,8 @@
465465
pinctrl-0 = <&pinctrl_nand>;
466466
clock-names = "nand", "nand_x", "ecc";
467467
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
468-
resets = <&sys_rst 2>;
468+
reset-names = "nand", "reg";
469+
resets = <&sys_rst 2>, <&sys_rst 2>;
469470
};
470471

471472
emmc: sdhc@68400000 {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,8 @@
773773
pinctrl-0 = <&pinctrl_nand>;
774774
clock-names = "nand", "nand_x", "ecc";
775775
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
776-
resets = <&sys_rst 2>;
776+
reset-names = "nand", "reg";
777+
resets = <&sys_rst 2>, <&sys_rst 2>;
777778
};
778779
};
779780
};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,8 @@
414414
pinctrl-0 = <&pinctrl_nand>;
415415
clock-names = "nand", "nand_x", "ecc";
416416
clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
417-
resets = <&sys_rst 2>;
417+
reset-names = "nand", "reg";
418+
resets = <&sys_rst 2>, <&sys_rst 2>;
418419
};
419420
};
420421
};

0 commit comments

Comments
 (0)