Skip to content

Commit 053b8c3

Browse files
committed
overlays: Regularisation and improvements
A few small improvements, with a view to making the updated overlays behave the same before and after the big conversion. Signed-off-by: Phil Elwell <[email protected]>
1 parent a18d9ce commit 053b8c3

8 files changed

+11
-19
lines changed

arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
};
2626

2727
__overrides__ {
28-
i2c0 = <&ts_i2c_frag>,"target:0=",<&i2c0>;
28+
i2c0 = <&ts_i2c_frag>,"target:0=",<&i2c0>,
29+
<0>,"-0-1";
2930
i2c1 = <&ts_i2c_frag>, "target?=0",
3031
<&ts_i2c_frag>, "target-path=i2c1",
3132
<0>,"-0-1";

arch/arm/boot/dts/overlays/i2c-fan-overlay.dts

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
emc2301: emc2301@2f {
1818
compatible = "microchip,emc2301";
1919
reg = <0x2f>;
20-
status = "okay";
2120
#cooling-cells = <0x02>;
2221
};
2322
};

arch/arm/boot/dts/overlays/i2c-mux-overlay.dts

+1-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@
163163
<&pca9545>,"base-nr:0",
164164
<&pca9548>,"base-nr:0";
165165

166-
i2c0 = <&frag100>, "target:0=",<&i2c0>,
167-
<0>,"+101+102";
166+
i2c0 = <&frag100>, "target:0=",<&i2c0>;
168167
i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>,
169168
<0>,"+101+102";
170169
i2c_csi_dsi0 = <&frag100>, "target:0=",<&i2c_csi_dsi0>,

arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545

4646
__overrides__ {
4747
addr = <&pca>,"reg:0";
48-
i2c0 = <&frag100>, "target:0=",<&i2c0>,
49-
<0>,"+101+102";
48+
i2c0 = <&frag100>, "target:0=",<&i2c0>;
5049
i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>,
5150
<0>,"+101+102";
5251
i2c_csi_dsi0 = <&frag100>, "target:0=",<&i2c_csi_dsi0>,

arch/arm/boot/dts/overlays/pca953x-overlay.dts

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
reg = <0x20>;
1818
gpio-controller;
1919
#gpio-cells = <2>;
20-
21-
status = "okay";
2220
};
2321
};
2422
};
@@ -250,8 +248,7 @@
250248
cat9554 = <0>, "+28";
251249
pca9654 = <0>, "+29";
252250
xra1202 = <0>, "+30";
253-
i2c0 = <&frag0>, "target:0=",<&i2c0>,
254-
<0>,"+100+101";
251+
i2c0 = <&frag0>, "target:0=",<&i2c0>;
255252
i2c_csi_dsi = <&frag0>, "target:0=",<&i2c_csi_dsi>,
256253
<0>,"+100+101";
257254
i2c_csi_dsi0 = <&frag0>, "target:0=",<&i2c_csi_dsi0>,

arch/arm/boot/dts/overlays/pcf857x-overlay.dts

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
__overlay__ {
1212
#address-cells = <1>;
1313
#size-cells = <0>;
14+
status = "okay";
1415

1516
pcf857x: pcf857x@0 {
1617
compatible = "";
1718
reg = <0x00>;
1819
gpio-controller;
1920
#gpio-cells = <2>;
20-
status = "okay";
2121
};
2222
};
2323
};
@@ -42,8 +42,7 @@
4242
pcf8575 = <&pcf857x>,"compatible=nxp,pcf8575", <&pcf857x>,"reg:0=0x20";
4343
pca8574 = <&pcf857x>,"compatible=nxp,pca8574", <&pcf857x>,"reg:0=0x20";
4444
addr = <&pcf857x>,"reg:0";
45-
i2c0 = <&frag0>, "target:0=",<&i2c0>,
46-
<0>,"+100+101";
45+
i2c0 = <&frag0>, "target:0=",<&i2c0>;
4746
i2c_csi_dsi = <&frag0>, "target:0=",<&i2c_csi_dsi>,
4847
<0>,"+100+101";
4948
i2c_csi_dsi0 = <&frag0>, "target:0=",<&i2c_csi_dsi0>,

arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
};
2828

2929
fragment@1 {
30-
target-path = "/";
30+
target = <&clocks>;
3131
__overlay__ {
3232
sc16is750_clk: sc16is750_i2c_clk@48 {
3333
compatible = "fixed-clock";
@@ -67,8 +67,7 @@
6767
<&int_pins>,"reg:0";
6868
addr = <&sc16is750>,"reg:0", <&sc16is750_clk>,"name";
6969
xtal = <&sc16is750_clk>,"clock-frequency:0";
70-
i2c0 = <&frag0>, "target:0=",<&i2c0>,
71-
<0>,"+100+101";
70+
i2c0 = <&frag0>, "target:0=",<&i2c0>;
7271
i2c_csi_dsi = <&frag0>, "target:0=",<&i2c_csi_dsi>,
7372
<0>,"+100+101";
7473
i2c_csi_dsi0 = <&frag0>, "target:0=",<&i2c_csi_dsi0>,

arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
};
2828

2929
fragment@1 {
30-
target-path = "/";
30+
target = <&clocks>;
3131
__overlay__ {
3232
sc16is752_clk: sc16is752_i2c_clk@48 {
3333
compatible = "fixed-clock";
@@ -67,8 +67,7 @@
6767
<&int_pins>,"reg:0";
6868
addr = <&sc16is752>,"reg:0",<&sc16is752_clk>,"name";
6969
xtal = <&sc16is752_clk>,"clock-frequency:0";
70-
i2c0 = <&frag0>, "target:0=",<&i2c0>,
71-
<0>,"+100+101";
70+
i2c0 = <&frag0>, "target:0=",<&i2c0>;
7271
i2c_csi_dsi = <&frag0>, "target:0=",<&i2c_csi_dsi>,
7372
<0>,"+100+101";
7473
i2c_csi_dsi0 = <&frag0>, "target:0=",<&i2c_csi_dsi0>,

0 commit comments

Comments
 (0)