diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-02-28 21:57:20 +0900 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-02-29 14:11:36 +0900 |
commit | 5ad159623fb0eee2bca46683935d7aa0cecef60a (patch) | |
tree | bb68a4347f64e6442ce49def30b1ca2169051ad4 /arch/arm/dts/uniphier-pxs3.dtsi | |
parent | 44ebaa8e13e5b9cb88e8dd61535e2a6ffe16631a (diff) | |
download | u-boot-5ad159623fb0eee2bca46683935d7aa0cecef60a.tar.gz u-boot-5ad159623fb0eee2bca46683935d7aa0cecef60a.tar.xz u-boot-5ad159623fb0eee2bca46683935d7aa0cecef60a.zip |
ARM: dts: uniphier: add reset-names to NAND controller node
Import Linux commits:
37f3e0096f71 ("ARM: dts: uniphier: add reset-names to NAND controller node")
e98d5023fe1f ("arm64: dts: uniphier: add reset-names to NAND controller node")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/dts/uniphier-pxs3.dtsi')
-rw-r--r-- | arch/arm/dts/uniphier-pxs3.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi index f830cef894..ed079c1711 100644 --- a/arch/arm/dts/uniphier-pxs3.dtsi +++ b/arch/arm/dts/uniphier-pxs3.dtsi @@ -831,7 +831,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>; }; }; }; |