Skip to content

Commit 9d8c354

Browse files
krzkPaolo Abeni
authored andcommitted
dt-bindings: net: Correct indentation and style in DTS example
DTS example in the bindings should be indented with 2- or 4-spaces and aligned with opening '- |', so correct any differences like 3-spaces or mixtures 2- and 4-spaces in one binding. No functional changes here, but saves some comments during reviews of new patches built on existing code. Signed-off-by: Krzysztof Kozlowski <[email protected]> Acked-by: Marc Kleine-Budde <[email protected]> # for net/can Reviewed-by: Roger Quadros <[email protected]> # for ti,k3-am654-* Acked-by: Florian Fainelli <[email protected]> # net/brcm,* Reviewed-by: Martin Blumenstingl <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent 33d97a0 commit 9d8c354

11 files changed

+154
-155
lines changed

Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ unevaluatedProperties: false
166166
examples:
167167
- |
168168
ethmac: ethernet@c9410000 {
169-
compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";
170-
reg = <0xc9410000 0x10000>, <0xc8834540 0x8>;
171-
interrupts = <8>;
172-
interrupt-names = "macirq";
173-
clocks = <&clk_eth>, <&clk_fclk_div2>, <&clk_mpll2>, <&clk_fclk_div2>;
174-
clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
175-
phy-mode = "rgmii";
169+
compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";
170+
reg = <0xc9410000 0x10000>, <0xc8834540 0x8>;
171+
interrupts = <8>;
172+
interrupt-names = "macirq";
173+
clocks = <&clk_eth>, <&clk_fclk_div2>, <&clk_mpll2>, <&clk_fclk_div2>;
174+
clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
175+
phy-mode = "rgmii";
176176
};

Documentation/devicetree/bindings/net/asix,ax88178.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ examples:
6363
#size-cells = <0>;
6464
6565
ethernet@1 {
66-
compatible = "usbb95,772b";
67-
reg = <1>;
66+
compatible = "usbb95,772b";
67+
reg = <1>;
6868
};
6969
};
7070
};

Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,16 @@ examples:
8585
#size-cells = <1>;
8686
8787
mdio0: mdio@e14 {
88-
compatible = "brcm,genet-mdio-v4";
89-
#address-cells = <1>;
90-
#size-cells = <0>;
91-
reg = <0xe14 0x8>;
88+
compatible = "brcm,genet-mdio-v4";
89+
#address-cells = <1>;
90+
#size-cells = <0>;
91+
reg = <0xe14 0x8>;
9292
93-
phy1: ethernet-phy@1 {
93+
phy1: ethernet-phy@1 {
9494
max-speed = <1000>;
9595
reg = <1>;
9696
compatible = "ethernet-phy-ieee802.3-c22";
97-
};
97+
};
9898
};
9999
};
100100
@@ -110,10 +110,10 @@ examples:
110110
interrupts = <0x0 0x16 0x0>, <0x0 0x17 0x0>;
111111
112112
mdio1: mdio@e14 {
113-
compatible = "brcm,genet-mdio-v4";
114-
#address-cells = <1>;
115-
#size-cells = <0>;
116-
reg = <0xe14 0x8>;
113+
compatible = "brcm,genet-mdio-v4";
114+
#address-cells = <1>;
115+
#size-cells = <0>;
116+
reg = <0xe14 0x8>;
117117
};
118118
};
119119
@@ -129,15 +129,15 @@ examples:
129129
interrupts = <0x0 0x18 0x0>, <0x0 0x19 0x0>;
130130
131131
mdio2: mdio@e14 {
132-
compatible = "brcm,genet-mdio-v4";
133-
#address-cells = <1>;
134-
#size-cells = <0>;
135-
reg = <0xe14 0x8>;
132+
compatible = "brcm,genet-mdio-v4";
133+
#address-cells = <1>;
134+
#size-cells = <0>;
135+
reg = <0xe14 0x8>;
136136
137-
phy0: ethernet-phy@0 {
137+
phy0: ethernet-phy@0 {
138138
max-speed = <1000>;
139139
reg = <0>;
140140
compatible = "ethernet-phy-ieee802.3-c22";
141-
};
141+
};
142142
};
143143
};

Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.yaml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,43 +38,43 @@ unevaluatedProperties: false
3838

3939
examples:
4040
- |
41-
mdio_mux_iproc: mdio-mux@66020000 {
41+
mdio-mux@66020000 {
4242
compatible = "brcm,mdio-mux-iproc";
4343
reg = <0x66020000 0x250>;
4444
#address-cells = <1>;
4545
#size-cells = <0>;
4646
4747
mdio@0 {
48-
reg = <0x0>;
49-
#address-cells = <1>;
50-
#size-cells = <0>;
51-
52-
pci_phy0: pci-phy@0 {
53-
compatible = "brcm,ns2-pcie-phy";
54-
reg = <0x0>;
55-
#phy-cells = <0>;
56-
};
48+
reg = <0x0>;
49+
#address-cells = <1>;
50+
#size-cells = <0>;
51+
52+
pci-phy@0 {
53+
compatible = "brcm,ns2-pcie-phy";
54+
reg = <0x0>;
55+
#phy-cells = <0>;
56+
};
5757
};
5858
5959
mdio@7 {
60-
reg = <0x7>;
61-
#address-cells = <1>;
62-
#size-cells = <0>;
63-
64-
pci_phy1: pci-phy@0 {
65-
compatible = "brcm,ns2-pcie-phy";
66-
reg = <0x0>;
67-
#phy-cells = <0>;
68-
};
60+
reg = <0x7>;
61+
#address-cells = <1>;
62+
#size-cells = <0>;
63+
64+
pci-phy@0 {
65+
compatible = "brcm,ns2-pcie-phy";
66+
reg = <0x0>;
67+
#phy-cells = <0>;
68+
};
6969
};
7070
7171
mdio@10 {
72-
reg = <0x10>;
73-
#address-cells = <1>;
74-
#size-cells = <0>;
72+
reg = <0x10>;
73+
#address-cells = <1>;
74+
#size-cells = <0>;
7575
76-
gphy0: eth-phy@10 {
77-
reg = <0x10>;
78-
};
76+
eth-phy@10 {
77+
reg = <0x10>;
78+
};
7979
};
8080
};

Documentation/devicetree/bindings/net/can/bosch,c_can.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ examples:
9999
#include <dt-bindings/reset/altr,rst-mgr.h>
100100
101101
can@ffc00000 {
102-
compatible = "bosch,d_can";
103-
reg = <0xffc00000 0x1000>;
104-
interrupts = <0 131 4>, <0 132 4>, <0 133 4>, <0 134 4>;
105-
clocks = <&can0_clk>;
106-
resets = <&rst CAN0_RESET>;
102+
compatible = "bosch,d_can";
103+
reg = <0xffc00000 0x1000>;
104+
interrupts = <0 131 4>, <0 132 4>, <0 133 4>, <0 134 4>;
105+
clocks = <&can0_clk>;
106+
resets = <&rst CAN0_RESET>;
107107
};
108108
- |
109109
can@0 {

Documentation/devicetree/bindings/net/can/microchip,mcp2510.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ examples:
5656
#size-cells = <0>;
5757
5858
can@1 {
59-
compatible = "microchip,mcp2515";
60-
reg = <1>;
61-
clocks = <&clk24m>;
62-
interrupt-parent = <&gpio4>;
63-
interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
64-
vdd-supply = <&reg5v0>;
65-
xceiver-supply = <&reg5v0>;
66-
gpio-controller;
67-
#gpio-cells = <2>;
59+
compatible = "microchip,mcp2515";
60+
reg = <1>;
61+
clocks = <&clk24m>;
62+
interrupt-parent = <&gpio4>;
63+
interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
64+
vdd-supply = <&reg5v0>;
65+
xceiver-supply = <&reg5v0>;
66+
gpio-controller;
67+
#gpio-cells = <2>;
6868
};
6969
};
7070

Documentation/devicetree/bindings/net/stm32-dwmac.yaml

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -154,56 +154,56 @@ examples:
154154
#include <dt-bindings/interrupt-controller/arm-gic.h>
155155
#include <dt-bindings/clock/stm32mp1-clks.h>
156156
//Example 1
157-
ethernet0: ethernet@5800a000 {
158-
compatible = "st,stm32mp1-dwmac", "snps,dwmac-4.20a";
159-
reg = <0x5800a000 0x2000>;
160-
reg-names = "stmmaceth";
161-
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
162-
interrupt-names = "macirq";
163-
clock-names = "stmmaceth",
164-
"mac-clk-tx",
165-
"mac-clk-rx",
166-
"ethstp",
167-
"eth-ck";
168-
clocks = <&rcc ETHMAC>,
169-
<&rcc ETHTX>,
170-
<&rcc ETHRX>,
171-
<&rcc ETHSTP>,
172-
<&rcc ETHCK_K>;
173-
st,syscon = <&syscfg 0x4>;
174-
snps,pbl = <2>;
175-
snps,axi-config = <&stmmac_axi_config_0>;
176-
snps,tso;
177-
phy-mode = "rgmii";
178-
};
157+
ethernet0: ethernet@5800a000 {
158+
compatible = "st,stm32mp1-dwmac", "snps,dwmac-4.20a";
159+
reg = <0x5800a000 0x2000>;
160+
reg-names = "stmmaceth";
161+
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
162+
interrupt-names = "macirq";
163+
clock-names = "stmmaceth",
164+
"mac-clk-tx",
165+
"mac-clk-rx",
166+
"ethstp",
167+
"eth-ck";
168+
clocks = <&rcc ETHMAC>,
169+
<&rcc ETHTX>,
170+
<&rcc ETHRX>,
171+
<&rcc ETHSTP>,
172+
<&rcc ETHCK_K>;
173+
st,syscon = <&syscfg 0x4>;
174+
snps,pbl = <2>;
175+
snps,axi-config = <&stmmac_axi_config_0>;
176+
snps,tso;
177+
phy-mode = "rgmii";
178+
};
179179
180180
- |
181181
//Example 2 (MCU example)
182-
ethernet1: ethernet@40028000 {
183-
compatible = "st,stm32-dwmac", "snps,dwmac-3.50a";
184-
reg = <0x40028000 0x8000>;
185-
reg-names = "stmmaceth";
186-
interrupts = <0 61 0>, <0 62 0>;
187-
interrupt-names = "macirq", "eth_wake_irq";
188-
clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";
189-
clocks = <&rcc 0 25>, <&rcc 0 26>, <&rcc 0 27>;
190-
st,syscon = <&syscfg 0x4>;
191-
snps,pbl = <8>;
192-
snps,mixed-burst;
193-
phy-mode = "mii";
194-
};
182+
ethernet1: ethernet@40028000 {
183+
compatible = "st,stm32-dwmac", "snps,dwmac-3.50a";
184+
reg = <0x40028000 0x8000>;
185+
reg-names = "stmmaceth";
186+
interrupts = <0 61 0>, <0 62 0>;
187+
interrupt-names = "macirq", "eth_wake_irq";
188+
clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";
189+
clocks = <&rcc 0 25>, <&rcc 0 26>, <&rcc 0 27>;
190+
st,syscon = <&syscfg 0x4>;
191+
snps,pbl = <8>;
192+
snps,mixed-burst;
193+
phy-mode = "mii";
194+
};
195195
196196
- |
197197
//Example 3
198-
ethernet2: ethernet@40027000 {
199-
compatible = "st,stm32-dwmac", "snps,dwmac-4.10a";
200-
reg = <0x40028000 0x8000>;
201-
reg-names = "stmmaceth";
202-
interrupts = <61>;
203-
interrupt-names = "macirq";
204-
clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";
205-
clocks = <&rcc 62>, <&rcc 61>, <&rcc 60>;
206-
st,syscon = <&syscfg 0x4>;
207-
snps,pbl = <8>;
208-
phy-mode = "mii";
209-
};
198+
ethernet2: ethernet@40027000 {
199+
compatible = "st,stm32-dwmac", "snps,dwmac-4.10a";
200+
reg = <0x40028000 0x8000>;
201+
reg-names = "stmmaceth";
202+
interrupts = <61>;
203+
interrupt-names = "macirq";
204+
clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";
205+
clocks = <&rcc 62>, <&rcc 61>, <&rcc 60>;
206+
st,syscon = <&syscfg 0x4>;
207+
snps,pbl = <8>;
208+
phy-mode = "mii";
209+
};

Documentation/devicetree/bindings/net/ti,davinci-mdio.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ unevaluatedProperties: false
7272
examples:
7373
- |
7474
davinci_mdio: mdio@4a101000 {
75-
compatible = "ti,davinci_mdio";
76-
#address-cells = <1>;
77-
#size-cells = <0>;
78-
reg = <0x4a101000 0x1000>;
79-
bus_freq = <1000000>;
75+
compatible = "ti,davinci_mdio";
76+
#address-cells = <1>;
77+
#size-cells = <0>;
78+
reg = <0x4a101000 0x1000>;
79+
bus_freq = <1000000>;
8080
};

Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -302,16 +302,16 @@ examples:
302302
ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
303303
};
304304
};
305-
};
306305
307-
cpts@3d000 {
308-
compatible = "ti,am65-cpts";
309-
reg = <0x0 0x3d000 0x0 0x400>;
310-
clocks = <&k3_clks 18 2>;
311-
clock-names = "cpts";
312-
interrupts-extended = <&gic500 GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>;
313-
interrupt-names = "cpts";
314-
ti,cpts-ext-ts-inputs = <4>;
315-
ti,cpts-periodic-outputs = <2>;
306+
cpts@3d000 {
307+
compatible = "ti,am65-cpts";
308+
reg = <0x0 0x3d000 0x0 0x400>;
309+
clocks = <&k3_clks 18 2>;
310+
clock-names = "cpts";
311+
interrupts-extended = <&gic500 GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>;
312+
interrupt-names = "cpts";
313+
ti,cpts-ext-ts-inputs = <4>;
314+
ti,cpts-periodic-outputs = <2>;
315+
};
316316
};
317317
};

Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -131,23 +131,23 @@ examples:
131131
#include <dt-bindings/interrupt-controller/arm-gic.h>
132132
133133
cpts@310d0000 {
134-
compatible = "ti,am65-cpts";
135-
reg = <0x310d0000 0x400>;
136-
reg-names = "cpts";
137-
clocks = <&main_cpts_mux>;
138-
clock-names = "cpts";
139-
interrupts-extended = <&k3_irq 163 0 IRQ_TYPE_LEVEL_HIGH>;
140-
interrupt-names = "cpts";
141-
ti,cpts-periodic-outputs = <6>;
142-
ti,cpts-ext-ts-inputs = <8>;
143-
144-
main_cpts_mux: refclk-mux {
145-
#clock-cells = <0>;
146-
clocks = <&k3_clks 118 5>, <&k3_clks 118 11>,
147-
<&k3_clks 157 91>, <&k3_clks 157 77>,
148-
<&k3_clks 157 102>, <&k3_clks 157 80>,
149-
<&k3_clks 120 3>, <&k3_clks 121 3>;
150-
assigned-clocks = <&main_cpts_mux>;
151-
assigned-clock-parents = <&k3_clks 118 11>;
152-
};
134+
compatible = "ti,am65-cpts";
135+
reg = <0x310d0000 0x400>;
136+
reg-names = "cpts";
137+
clocks = <&main_cpts_mux>;
138+
clock-names = "cpts";
139+
interrupts-extended = <&k3_irq 163 0 IRQ_TYPE_LEVEL_HIGH>;
140+
interrupt-names = "cpts";
141+
ti,cpts-periodic-outputs = <6>;
142+
ti,cpts-ext-ts-inputs = <8>;
143+
144+
main_cpts_mux: refclk-mux {
145+
#clock-cells = <0>;
146+
clocks = <&k3_clks 118 5>, <&k3_clks 118 11>,
147+
<&k3_clks 157 91>, <&k3_clks 157 77>,
148+
<&k3_clks 157 102>, <&k3_clks 157 80>,
149+
<&k3_clks 120 3>, <&k3_clks 121 3>;
150+
assigned-clocks = <&main_cpts_mux>;
151+
assigned-clock-parents = <&k3_clks 118 11>;
152+
};
153153
};

0 commit comments

Comments
 (0)