Commit bc8841f0 authored by Masahiro Yamada's avatar Masahiro Yamada

ARM: dts: uniphier: update to new Denali NAND binding

With commit d8e8fd0e ("mtd: rawnand: denali: decouple controller
and NAND chips"), the Denali NAND controller driver migrated to the
new controller/chip representation.

Update DT for it.

In the new binding, the number of connected chips are described in
DT instead of run-time probed.

I added just one chip to the reference boards, where we do not know
if the on-board NAND device is a single chip or multiple chips.
If we added too many chips into DT, it would end up with the timeout
error in nand_scan_ident().

I changed all the pinctrl properties to use the single CS.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent a188339c
...@@ -77,4 +77,8 @@ &usb1 { ...@@ -77,4 +77,8 @@ &usb1 {
&nand { &nand {
status = "okay"; status = "okay";
nand@0 {
reg = <0>;
};
}; };
...@@ -403,9 +403,11 @@ nand: nand@68000000 { ...@@ -403,9 +403,11 @@ nand: nand@68000000 {
status = "disabled"; status = "disabled";
reg-names = "nand_data", "denali_reg"; reg-names = "nand_data", "denali_reg";
reg = <0x68000000 0x20>, <0x68100000 0x1000>; reg = <0x68000000 0x20>, <0x68100000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <0 65 4>; interrupts = <0 65 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand2cs>; 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>; resets = <&sys_rst 2>;
......
...@@ -90,4 +90,8 @@ &usb1 { ...@@ -90,4 +90,8 @@ &usb1 {
&nand { &nand {
status = "okay"; status = "okay";
nand@0 {
reg = <0>;
};
}; };
...@@ -98,4 +98,8 @@ &usb1 { ...@@ -98,4 +98,8 @@ &usb1 {
&nand { &nand {
status = "okay"; status = "okay";
nand@0 {
reg = <0>;
};
}; };
...@@ -593,6 +593,8 @@ nand: nand@68000000 { ...@@ -593,6 +593,8 @@ nand: nand@68000000 {
status = "disabled"; status = "disabled";
reg-names = "nand_data", "denali_reg"; reg-names = "nand_data", "denali_reg";
reg = <0x68000000 0x20>, <0x68100000 0x1000>; reg = <0x68000000 0x20>, <0x68100000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <0 65 4>; interrupts = <0 65 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
......
...@@ -458,9 +458,11 @@ nand: nand@68000000 { ...@@ -458,9 +458,11 @@ nand: nand@68000000 {
status = "disabled"; status = "disabled";
reg-names = "nand_data", "denali_reg"; reg-names = "nand_data", "denali_reg";
reg = <0x68000000 0x20>, <0x68100000 0x1000>; reg = <0x68000000 0x20>, <0x68100000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <0 65 4>; interrupts = <0 65 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand2cs>; 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>; resets = <&sys_rst 2>;
......
...@@ -766,9 +766,11 @@ nand: nand@68000000 { ...@@ -766,9 +766,11 @@ nand: nand@68000000 {
status = "disabled"; status = "disabled";
reg-names = "nand_data", "denali_reg"; reg-names = "nand_data", "denali_reg";
reg = <0x68000000 0x20>, <0x68100000 0x1000>; reg = <0x68000000 0x20>, <0x68100000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <0 65 4>; interrupts = <0 65 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand2cs>; 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>; resets = <&sys_rst 2>;
......
...@@ -81,4 +81,8 @@ &usb2 { ...@@ -81,4 +81,8 @@ &usb2 {
&nand { &nand {
status = "okay"; status = "okay";
nand@0 {
reg = <0>;
};
}; };
...@@ -407,9 +407,11 @@ nand: nand@68000000 { ...@@ -407,9 +407,11 @@ nand: nand@68000000 {
status = "disabled"; status = "disabled";
reg-names = "nand_data", "denali_reg"; reg-names = "nand_data", "denali_reg";
reg = <0x68000000 0x20>, <0x68100000 0x1000>; reg = <0x68000000 0x20>, <0x68100000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <0 65 4>; interrupts = <0 65 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand2cs>; 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>; resets = <&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