Skip to content

Commit 0e1550b

Browse files
author
deooi
committed
ARM: dts: ni-coralreef: Update AMBA and GPIO bindings
zynq-7000.dtsi contains updated AMBA and GPIO device tree node phandles. Adopt these changes by referencing i2c0 phandle instead of amba node for overriding i2c bindings, and refer to gpio0 phandle instead of gpio. Signed-off-by: deooi <[email protected]>
1 parent 9b9c5c2 commit 0e1550b

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

arch/arm/boot/dts/xilinx/ni-coralreef.dts

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,20 @@
77
model = "NI Coral Reef";
88
compatible = "ni,zynq", "xlnx,zynq-7000";
99

10-
amba@0 {
11-
i2c0: i2c@e0004000 {
12-
/* Override ni-zynq.dtsi; we do not have a CPLD at 0x40. */
13-
nicpld@40 {
14-
status = "disabled";
15-
};
16-
17-
tmp451@4C {
18-
compatible = "ti,tmp451";
19-
reg = <0x4C>;
20-
vcc-supply = <&regulator_vccpint>;
21-
};
22-
};
23-
};
24-
2510
leds {
2611
compatible = "gpio-leds";
2712

2813
/* LED_STATUSy on GPIO46 */
2914
status {
3015
label = "nilrt:status:yellow";
31-
gpios = <&gpio 46 0>;
16+
gpios = <&gpio0 46 0>;
3217
default-state = "on";
3318
};
3419

3520
/* LED_POWERb on GPIO47 */
3621
active {
3722
label = "nilrt:status:blue";
38-
gpios = <&gpio 47 0>;
23+
gpios = <&gpio0 47 0>;
3924
default-state = "off";
4025
};
4126
};
@@ -48,7 +33,7 @@
4833
/* Reset switch is on GPIO48 */
4934
reset_sw@0 {
5035
label = "reset_sw";
51-
gpios = <&gpio 48 1 /* GPIO_ACTIVE_LOW */>;
36+
gpios = <&gpio0 48 1 /* GPIO_ACTIVE_LOW */>;
5237
linux,code = <408>; /* KEY_RESTART */
5338
gpio-key,wakeup;
5439
};
@@ -58,7 +43,7 @@
5843
compatible = "gpio-restart";
5944

6045
/* ~PS_FORCE_RESET is on GPIO44 */
61-
gpios = <&gpio 44 1 /* GPIO_ACTIVE_LOW */>;
46+
gpios = <&gpio0 44 1 /* GPIO_ACTIVE_LOW */>;
6247
priority = <200>;
6348
};
6449

@@ -104,10 +89,23 @@
10489
};
10590
};
10691

92+
&i2c0 {
93+
/* Override ni-zynq.dtsi; we do not have a CPLD at 0x40. */
94+
nicpld@40 {
95+
status = "disabled";
96+
};
97+
98+
tmp451@4C {
99+
compatible = "ti,tmp451";
100+
reg = <0x4C>;
101+
vcc-supply = <&regulator_vccpint>;
102+
};
103+
};
104+
107105
&gem0 {
108106
status = "okay";
109107
emio-speed-gpios = <0>,
110-
<&gpio 54 0>;
108+
<&gpio0 54 0>;
111109

112110
#address-cells = <0x1>;
113111
#size-cells = <0x0>;

0 commit comments

Comments
 (0)