tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'ti-keystone-dt-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/dt

Keystone2 device tree updates for v5.20

* Whitespace cleanups.

* tag 'ti-keystone-dt-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
ARM: dts: keystone: Adjust whitespace around '='

Link: https://lore.kernel.org/r/20220708232709.rrpzbrpv7jbipyym@eldest
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann bfcfa1bd 7310e458

+56 -56
+13 -13
arch/arm/boot/dts/keystone-k2e-netcp.dtsi
··· 12 12 #size-cells = <1>; 13 13 clocks = <&chipclk13>; 14 14 ranges; 15 - queue-range = <0 0x2000>; 16 - linkram0 = <0x100000 0x4000>; 17 - linkram1 = <0 0x10000>; 15 + queue-range = <0 0x2000>; 16 + linkram0 = <0x100000 0x4000>; 17 + linkram1 = <0 0x10000>; 18 18 19 19 qmgrs { 20 20 #address-cells = <1>; ··· 176 176 interfaces { 177 177 gbe0: interface-0 { 178 178 slave-port = <0>; 179 - link-interface = <1>; 180 - phy-handle = <&ethphy0>; 179 + link-interface = <1>; 180 + phy-handle = <&ethphy0>; 181 181 }; 182 182 gbe1: interface-1 { 183 183 slave-port = <1>; 184 - link-interface = <1>; 185 - phy-handle = <&ethphy1>; 184 + link-interface = <1>; 185 + phy-handle = <&ethphy1>; 186 186 }; 187 187 }; 188 188 189 189 secondary-slave-ports { 190 190 port-2 { 191 191 slave-port = <2>; 192 - link-interface = <2>; 192 + link-interface = <2>; 193 193 }; 194 194 port-3 { 195 195 slave-port = <3>; 196 - link-interface = <2>; 196 + link-interface = <2>; 197 197 }; 198 198 port-4 { 199 199 slave-port = <4>; 200 - link-interface = <2>; 200 + link-interface = <2>; 201 201 }; 202 202 port-5 { 203 203 slave-port = <5>; 204 - link-interface = <2>; 204 + link-interface = <2>; 205 205 }; 206 206 port-6 { 207 207 slave-port = <6>; 208 - link-interface = <2>; 208 + link-interface = <2>; 209 209 }; 210 210 port-7 { 211 211 slave-port = <7>; 212 - link-interface = <2>; 212 + link-interface = <2>; 213 213 }; 214 214 }; 215 215 };
+3 -3
arch/arm/boot/dts/keystone-k2e.dtsi
··· 141 141 clock-names = "pcie"; 142 142 #address-cells = <3>; 143 143 #size-cells = <2>; 144 - reg = <0x21021000 0x2000>, <0x21020000 0x1000>, <0x02620128 4>; 144 + reg = <0x21021000 0x2000>, <0x21020000 0x1000>, <0x02620128 4>; 145 145 ranges = <0x82000000 0 0x60000000 0x60000000 146 146 0 0x10000000>; 147 147 ··· 185 185 }; 186 186 187 187 mdio: mdio@24200f00 { 188 - compatible = "ti,keystone_mdio", "ti,davinci_mdio"; 188 + compatible = "ti,keystone_mdio", "ti,davinci_mdio"; 189 189 #address-cells = <1>; 190 190 #size-cells = <0>; 191 191 reg = <0x24200f00 0x100>; 192 192 status = "disabled"; 193 193 clocks = <&clkcpgmac>; 194 194 clock-names = "fck"; 195 - bus_freq = <2500000>; 195 + bus_freq = <2500000>; 196 196 }; 197 197 /include/ "keystone-k2e-netcp.dtsi" 198 198 };
+1 -1
arch/arm/boot/dts/keystone-k2g-netcp.dtsi
··· 125 125 interfaces { 126 126 gbe0: interface-0 { 127 127 slave-port = <0>; 128 - link-interface = <5>; 128 + link-interface = <5>; 129 129 }; 130 130 }; 131 131 };
+9 -9
arch/arm/boot/dts/keystone-k2g.dtsi
··· 262 262 */ 263 263 ti,system-reboot-controller; 264 264 mbox-names = "rx", "tx"; 265 - mboxes= <&msgmgr 5 2>, 265 + mboxes = <&msgmgr 5 2>, 266 266 <&msgmgr 0 0>; 267 267 reg-names = "debug_messages"; 268 268 reg = <0x02921c00 0x400>; ··· 326 326 327 327 dss: dss@02540000 { 328 328 compatible = "ti,k2g-dss"; 329 - reg = <0x02540000 0x400>, 329 + reg = <0x02540000 0x400>, 330 330 <0x02550000 0x1000>, 331 331 <0x02557000 0x1000>, 332 332 <0x0255a800 0x100>, 333 333 <0x0255ac00 0x100>; 334 334 reg-names = "cfg", "common", "vid1", "ovr1", "vp1"; 335 - clocks = <&k2g_clks 0x2 0>, 335 + clocks = <&k2g_clks 0x2 0>, 336 336 <&k2g_clks 0x2 1>; 337 337 clock-names = "fck", "vp1"; 338 338 interrupts = <GIC_SPI 247 IRQ_TYPE_EDGE_RISING>; ··· 348 348 349 349 edma0: edma@2700000 { 350 350 compatible = "ti,k2g-edma3-tpcc", "ti,edma3-tpcc"; 351 - reg = <0x02700000 0x8000>; 351 + reg = <0x02700000 0x8000>; 352 352 reg-names = "edma3_cc"; 353 353 interrupts = <GIC_SPI 200 IRQ_TYPE_EDGE_RISING>, 354 354 <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>, ··· 367 367 368 368 edma0_tptc0: tptc@2760000 { 369 369 compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc"; 370 - reg = <0x02760000 0x400>; 370 + reg = <0x02760000 0x400>; 371 371 power-domains = <&k2g_pds 0x3f>; 372 372 }; 373 373 374 374 edma0_tptc1: tptc@2768000 { 375 375 compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc"; 376 - reg = <0x02768000 0x400>; 376 + reg = <0x02768000 0x400>; 377 377 power-domains = <&k2g_pds 0x3f>; 378 378 }; 379 379 380 380 edma1: edma@2728000 { 381 381 compatible = "ti,k2g-edma3-tpcc", "ti,edma3-tpcc"; 382 - reg = <0x02728000 0x8000>; 382 + reg = <0x02728000 0x8000>; 383 383 reg-names = "edma3_cc"; 384 384 interrupts = <GIC_SPI 208 IRQ_TYPE_EDGE_RISING>, 385 385 <GIC_SPI 219 IRQ_TYPE_EDGE_RISING>, ··· 402 402 403 403 edma1_tptc0: tptc@27b0000 { 404 404 compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc"; 405 - reg = <0x027b0000 0x400>; 405 + reg = <0x027b0000 0x400>; 406 406 power-domains = <&k2g_pds 0x4f>; 407 407 }; 408 408 409 409 edma1_tptc1: tptc@27b8000 { 410 410 compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc"; 411 - reg = <0x027b8000 0x400>; 411 + reg = <0x027b8000 0x400>; 412 412 power-domains = <&k2g_pds 0x4f>; 413 413 }; 414 414
+6 -6
arch/arm/boot/dts/keystone-k2hk-netcp.dtsi
··· 12 12 #size-cells = <1>; 13 13 clocks = <&chipclk13>; 14 14 ranges; 15 - queue-range = <0 0x4000>; 16 - linkram0 = <0x100000 0x8000>; 17 - linkram1 = <0x0 0x10000>; 15 + queue-range = <0 0x4000>; 16 + linkram0 = <0x100000 0x8000>; 17 + linkram1 = <0x0 0x10000>; 18 18 19 19 qmgrs { 20 20 #address-cells = <1>; ··· 150 150 #size-cells = <1>; 151 151 152 152 /* NetCP address range */ 153 - ranges = <0 0x2000000 0x100000>; 153 + ranges = <0 0x2000000 0x100000>; 154 154 155 155 clocks = <&clkpa>, <&clkcpgmac>; 156 156 clock-names = "pa_clk", "ethss_clk"; ··· 207 207 secondary-slave-ports { 208 208 port-2 { 209 209 slave-port = <2>; 210 - link-interface = <2>; 210 + link-interface = <2>; 211 211 }; 212 212 port-3 { 213 213 slave-port = <3>; 214 - link-interface = <2>; 214 + link-interface = <2>; 215 215 }; 216 216 }; 217 217 };
+2 -2
arch/arm/boot/dts/keystone-k2hk.dtsi
··· 282 282 }; 283 283 284 284 mdio: mdio@2090300 { 285 - compatible = "ti,keystone_mdio", "ti,davinci_mdio"; 285 + compatible = "ti,keystone_mdio", "ti,davinci_mdio"; 286 286 #address-cells = <1>; 287 287 #size-cells = <0>; 288 288 reg = <0x02090300 0x100>; 289 289 status = "disabled"; 290 290 clocks = <&clkcpgmac>; 291 291 clock-names = "fck"; 292 - bus_freq = <2500000>; 292 + bus_freq = <2500000>; 293 293 }; 294 294 /include/ "keystone-k2hk-netcp.dtsi" 295 295 };
+9 -9
arch/arm/boot/dts/keystone-k2l-netcp.dtsi
··· 12 12 #size-cells = <1>; 13 13 clocks = <&chipclk13>; 14 14 ranges; 15 - queue-range = <0 0x2000>; 16 - linkram0 = <0x100000 0x4000>; 17 - linkram1 = <0x70000000 0x10000>; /* 1MB OSR mem */ 15 + queue-range = <0 0x2000>; 16 + linkram0 = <0x100000 0x4000>; 17 + linkram1 = <0x70000000 0x10000>; /* 1MB OSR mem */ 18 18 19 19 qmgrs { 20 20 #address-cells = <1>; ··· 174 174 interfaces { 175 175 gbe0: interface-0 { 176 176 slave-port = <0>; 177 - link-interface = <1>; 178 - phy-handle = <&ethphy0>; 177 + link-interface = <1>; 178 + phy-handle = <&ethphy0>; 179 179 }; 180 180 gbe1: interface-1 { 181 181 slave-port = <1>; 182 - link-interface = <1>; 183 - phy-handle = <&ethphy1>; 182 + link-interface = <1>; 183 + phy-handle = <&ethphy1>; 184 184 }; 185 185 }; 186 186 187 187 secondary-slave-ports { 188 188 port-2 { 189 189 slave-port = <2>; 190 - link-interface = <2>; 190 + link-interface = <2>; 191 191 }; 192 192 port-3 { 193 193 slave-port = <3>; 194 - link-interface = <2>; 194 + link-interface = <2>; 195 195 }; 196 196 }; 197 197 };
+4 -4
arch/arm/boot/dts/keystone-k2l.dtsi
··· 47 47 reg-shift = <2>; 48 48 reg-io-width = <4>; 49 49 reg = <0x02348400 0x100>; 50 - clocks = <&clkuart2>; 50 + clocks = <&clkuart2>; 51 51 interrupts = <GIC_SPI 432 IRQ_TYPE_EDGE_RISING>; 52 52 }; 53 53 ··· 57 57 reg-shift = <2>; 58 58 reg-io-width = <4>; 59 59 reg = <0x02348800 0x100>; 60 - clocks = <&clkuart3>; 60 + clocks = <&clkuart3>; 61 61 interrupts = <GIC_SPI 435 IRQ_TYPE_EDGE_RISING>; 62 62 }; 63 63 ··· 388 388 }; 389 389 390 390 mdio: mdio@26200f00 { 391 - compatible = "ti,keystone_mdio", "ti,davinci_mdio"; 391 + compatible = "ti,keystone_mdio", "ti,davinci_mdio"; 392 392 #address-cells = <1>; 393 393 #size-cells = <0>; 394 394 reg = <0x26200f00 0x100>; 395 395 status = "disabled"; 396 396 clocks = <&clkcpgmac>; 397 397 clock-names = "fck"; 398 - bus_freq = <2500000>; 398 + bus_freq = <2500000>; 399 399 }; 400 400 /include/ "keystone-k2l-netcp.dtsi" 401 401 };
+9 -9
arch/arm/boot/dts/keystone.dtsi
··· 14 14 interrupt-parent = <&gic>; 15 15 16 16 aliases { 17 - serial0 = &uart0; 17 + serial0 = &uart0; 18 18 spi0 = &spi0; 19 19 spi1 = &spi1; 20 20 spi2 = &spi2; ··· 61 61 }; 62 62 63 63 psci { 64 - compatible = "arm,psci"; 65 - method = "smc"; 66 - cpu_suspend = <0x84000001>; 67 - cpu_off = <0x84000002>; 68 - cpu_on = <0x84000003>; 64 + compatible = "arm,psci"; 65 + method = "smc"; 66 + cpu_suspend = <0x84000001>; 67 + cpu_off = <0x84000002>; 68 + cpu_on = <0x84000003>; 69 69 }; 70 70 71 71 soc0: soc@0 { ··· 119 119 reg-shift = <2>; 120 120 reg-io-width = <4>; 121 121 reg = <0x02530c00 0x100>; 122 - clocks = <&clkuart0>; 122 + clocks = <&clkuart0>; 123 123 interrupts = <GIC_SPI 277 IRQ_TYPE_EDGE_RISING>; 124 124 }; 125 125 ··· 129 129 reg-shift = <2>; 130 130 reg-io-width = <4>; 131 131 reg = <0x02531000 0x100>; 132 - clocks = <&clkuart1>; 132 + clocks = <&clkuart1>; 133 133 interrupts = <GIC_SPI 280 IRQ_TYPE_EDGE_RISING>; 134 134 }; 135 135 ··· 301 301 clock-names = "pcie"; 302 302 #address-cells = <3>; 303 303 #size-cells = <2>; 304 - reg = <0x21801000 0x2000>, <0x21800000 0x1000>, <0x02620128 4>; 304 + reg = <0x21801000 0x2000>, <0x21800000 0x1000>, <0x02620128 4>; 305 305 ranges = <0x82000000 0 0x50000000 0x50000000 306 306 0 0x10000000>; 307 307