Skip to content

Commit 5536d6a

Browse files
kamel-bouharaCodrin Ciubotariu
authored andcommitted
ARM: dts: at91: rearrange kizbox dts using aliases nodes
Use aliases nodes to easy kizbox dts readability. Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> Link: https://lore.kernel.org/r/20191205223021.1370083-1-kamel.bouhara@bootlin.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent e84be23 commit 5536d6a

2 files changed

Lines changed: 86 additions & 90 deletions

File tree

arch/arm/boot/dts/at91-kizbox.dts

Lines changed: 84 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -28,85 +28,6 @@
2828
};
2929
};
3030

31-
ahb {
32-
apb {
33-
tcb0: timer@fffa0000 {
34-
timer@0 {
35-
compatible = "atmel,tcb-timer";
36-
reg = <0>, <1>;
37-
};
38-
39-
timer@2 {
40-
compatible = "atmel,tcb-timer";
41-
reg = <2>;
42-
};
43-
};
44-
45-
macb0: ethernet@fffc4000 {
46-
phy-mode = "mii";
47-
pinctrl-0 = <&pinctrl_macb_rmii
48-
&pinctrl_macb_rmii_mii_alt>;
49-
status = "okay";
50-
};
51-
52-
usart3: serial@fffd0000 {
53-
status = "okay";
54-
};
55-
56-
dbgu: serial@fffff200 {
57-
status = "okay";
58-
};
59-
60-
watchdog@fffffd40 {
61-
timeout-sec = <15>;
62-
atmel,max-heartbeat-sec = <16>;
63-
atmel,min-heartbeat-sec = <0>;
64-
status = "okay";
65-
};
66-
};
67-
68-
usb0: ohci@500000 {
69-
num-ports = <1>;
70-
status = "okay";
71-
};
72-
73-
ebi: ebi@10000000 {
74-
status = "okay";
75-
76-
nand_controller: nand-controller {
77-
status = "okay";
78-
pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;
79-
pinctrl-names = "default";
80-
81-
nand@3 {
82-
reg = <0x3 0x0 0x800000>;
83-
rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;
84-
cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;
85-
nand-bus-width = <8>;
86-
nand-ecc-mode = "soft";
87-
nand-on-flash-bbt;
88-
label = "atmel_nand";
89-
90-
partitions {
91-
compatible = "fixed-partitions";
92-
#address-cells = <1>;
93-
#size-cells = <1>;
94-
95-
bootstrap@0 {
96-
label = "bootstrap";
97-
reg = <0x0 0x20000>;
98-
};
99-
100-
ubi@20000 {
101-
label = "ubi";
102-
reg = <0x20000 0x7fe0000>;
103-
};
104-
};
105-
};
106-
};
107-
};
108-
};
109-
11031
gpio_keys {
11132
compatible = "gpio-keys";
11233
#address-cells = <1>;
@@ -127,15 +48,6 @@
12748
};
12849
};
12950

130-
i2c-gpio-0 {
131-
status = "okay";
132-
133-
rtc: pcf8563@51 {
134-
compatible = "nxp,pcf8563";
135-
reg = <0x51>;
136-
};
137-
};
138-
13951
pwm_leds {
14052
compatible = "pwm-leds";
14153

@@ -179,3 +91,87 @@
17991
&pinctrl_tcb1_tiob0>;
18092
};
18193
};
94+
95+
&tcb0 {
96+
timer@0 {
97+
compatible = "atmel,tcb-timer";
98+
reg = <0>, <1>;
99+
};
100+
101+
timer@2 {
102+
compatible = "atmel,tcb-timer";
103+
reg = <2>;
104+
};
105+
};
106+
107+
&ebi {
108+
status = "okay";
109+
};
110+
111+
&nand_controller {
112+
status = "okay";
113+
pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;
114+
pinctrl-names = "default";
115+
116+
nand@3 {
117+
reg = <0x3 0x0 0x800000>;
118+
rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;
119+
cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;
120+
nand-bus-width = <8>;
121+
nand-ecc-mode = "soft";
122+
nand-on-flash-bbt;
123+
label = "atmel_nand";
124+
125+
partitions {
126+
compatible = "fixed-partitions";
127+
#address-cells = <1>;
128+
#size-cells = <1>;
129+
130+
bootstrap@0 {
131+
label = "bootstrap";
132+
reg = <0x0 0x20000>;
133+
};
134+
135+
ubi@20000 {
136+
label = "ubi";
137+
reg = <0x20000 0x7fe0000>;
138+
};
139+
};
140+
};
141+
};
142+
143+
&macb0 {
144+
phy-mode = "mii";
145+
pinctrl-0 = <&pinctrl_macb_rmii
146+
&pinctrl_macb_rmii_mii_alt>;
147+
status = "okay";
148+
};
149+
150+
&usart3 {
151+
status = "okay";
152+
};
153+
154+
&dbgu {
155+
status = "okay";
156+
};
157+
158+
&watchdog {
159+
timeout-sec = <15>;
160+
atmel,max-heartbeat-sec = <16>;
161+
atmel,min-heartbeat-sec = <0>;
162+
status = "okay";
163+
};
164+
165+
&usb0 {
166+
num-ports = <1>;
167+
status = "okay";
168+
};
169+
170+
&i2c_gpio0 {
171+
status = "okay";
172+
173+
rtc: pcf8563@51 {
174+
compatible = "nxp,pcf8563";
175+
reg = <0x51>;
176+
};
177+
};

arch/arm/boot/dts/at91sam9260.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@
738738
status = "disabled";
739739
};
740740

741-
watchdog@fffffd40 {
741+
watchdog: watchdog@fffffd40 {
742742
compatible = "atmel,at91sam9260-wdt";
743743
reg = <0xfffffd40 0x10>;
744744
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -793,7 +793,7 @@
793793
};
794794
};
795795

796-
i2c-gpio-0 {
796+
i2c_gpio0: i2c-gpio-0 {
797797
compatible = "i2c-gpio";
798798
gpios = <&pioA 23 GPIO_ACTIVE_HIGH /* sda */
799799
&pioA 24 GPIO_ACTIVE_HIGH /* scl */

0 commit comments

Comments
 (0)