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 'microchip-dt64-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt

Microchip ARM64 device tree updates for v6.10

It contains:
- dtbs_check and dtc W=1 warning fixes
- mdio2 and serdes address fixes for sparx5

* tag 'microchip-dt64-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
arm64: dts: microchip: sparx5_pcb135: drop duplicated NOR flash
arm64: dts: microchip: sparx5_pcb134: drop duplicated NOR flash
arm64: dts: microchip: sparx5_pcb135: drop LED unit addresses
arm64: dts: microchip: sparx5_pcb134: drop LED unit addresses
arm64: dts: microchip: sparx5_pcb135: align I2C mux node name with bindings
arm64: dts: microchip: sparx5_pcb134: align I2C mux node name with bindings
arm64: dts: microchip: sparx5_pcb135: add missing I2C mux unit addresses
arm64: dts: microchip: sparx5_pcb134: add missing I2C mux unit addresses
arm64: dts: microchip: sparx5: correct serdes unit address
arm64: dts: microchip: sparx5: fix mdio reg

Link: https://lore.kernel.org/r/20240429121429.1941241-1-claudiu.beznea@tuxon.dev
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann cc5dc7e7 e8325e33

+85 -103
+2 -2
arch/arm64/boot/dts/microchip/sparx5.dtsi
··· 447 447 pinctrl-names = "default"; 448 448 #address-cells = <1>; 449 449 #size-cells = <0>; 450 - reg = <0x6 0x110102d4 0x24>; 450 + reg = <0x6 0x110102f8 0x24>; 451 451 }; 452 452 453 453 mdio3: mdio@61101031c { ··· 460 460 reg = <0x6 0x1101031c 0x24>; 461 461 }; 462 462 463 - serdes: serdes@10808000 { 463 + serdes: serdes@610808000 { 464 464 compatible = "microchip,sparx5-serdes"; 465 465 #phy-cells = <1>; 466 466 clocks = <&sys_clk>;
+70 -79
arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
··· 15 15 16 16 leds { 17 17 compatible = "gpio-leds"; 18 - led@0 { 18 + led-0 { 19 19 label = "twr0:green"; 20 20 gpios = <&sgpio_out0 8 0 GPIO_ACTIVE_LOW>; 21 21 }; 22 - led@1 { 22 + led-1 { 23 23 label = "twr0:yellow"; 24 24 gpios = <&sgpio_out0 8 1 GPIO_ACTIVE_LOW>; 25 25 }; 26 - led@2 { 26 + led-2 { 27 27 label = "twr1:green"; 28 28 gpios = <&sgpio_out0 9 0 GPIO_ACTIVE_LOW>; 29 29 }; 30 - led@3 { 30 + led-3 { 31 31 label = "twr1:yellow"; 32 32 gpios = <&sgpio_out0 9 1 GPIO_ACTIVE_LOW>; 33 33 }; 34 - led@4 { 34 + led-4 { 35 35 label = "twr2:green"; 36 36 gpios = <&sgpio_out0 10 0 GPIO_ACTIVE_LOW>; 37 37 }; 38 - led@5 { 38 + led-5 { 39 39 label = "twr2:yellow"; 40 40 gpios = <&sgpio_out0 10 1 GPIO_ACTIVE_LOW>; 41 41 }; 42 - led@6 { 42 + led-6 { 43 43 label = "twr3:green"; 44 44 gpios = <&sgpio_out0 11 0 GPIO_ACTIVE_LOW>; 45 45 }; 46 - led@7 { 46 + led-7 { 47 47 label = "twr3:yellow"; 48 48 gpios = <&sgpio_out0 11 1 GPIO_ACTIVE_LOW>; 49 49 }; 50 - led@8 { 50 + led-8 { 51 51 label = "eth12:green"; 52 52 gpios = <&sgpio_out0 12 0 GPIO_ACTIVE_HIGH>; 53 53 default-state = "off"; 54 54 }; 55 - led@9 { 55 + led-9 { 56 56 label = "eth12:yellow"; 57 57 gpios = <&sgpio_out0 12 1 GPIO_ACTIVE_HIGH>; 58 58 default-state = "off"; 59 59 }; 60 - led@10 { 60 + led-10 { 61 61 label = "eth13:green"; 62 62 gpios = <&sgpio_out0 13 0 GPIO_ACTIVE_HIGH>; 63 63 default-state = "off"; 64 64 }; 65 - led@11 { 65 + led-11 { 66 66 label = "eth13:yellow"; 67 67 gpios = <&sgpio_out0 13 1 GPIO_ACTIVE_HIGH>; 68 68 default-state = "off"; 69 69 }; 70 - led@12 { 70 + led-12 { 71 71 label = "eth14:green"; 72 72 gpios = <&sgpio_out0 14 0 GPIO_ACTIVE_HIGH>; 73 73 default-state = "off"; 74 74 }; 75 - led@13 { 75 + led-13 { 76 76 label = "eth14:yellow"; 77 77 gpios = <&sgpio_out0 14 1 GPIO_ACTIVE_HIGH>; 78 78 default-state = "off"; 79 79 }; 80 - led@14 { 80 + led-14 { 81 81 label = "eth15:green"; 82 82 gpios = <&sgpio_out0 15 0 GPIO_ACTIVE_HIGH>; 83 83 default-state = "off"; 84 84 }; 85 - led@15 { 85 + led-15 { 86 86 label = "eth15:yellow"; 87 87 gpios = <&sgpio_out0 15 1 GPIO_ACTIVE_HIGH>; 88 88 default-state = "off"; 89 89 }; 90 - led@16 { 90 + led-16 { 91 91 label = "eth48:green"; 92 92 gpios = <&sgpio_out1 16 0 GPIO_ACTIVE_HIGH>; 93 93 default-state = "off"; 94 94 }; 95 - led@17 { 95 + led-17 { 96 96 label = "eth48:yellow"; 97 97 gpios = <&sgpio_out1 16 1 GPIO_ACTIVE_HIGH>; 98 98 default-state = "off"; 99 99 }; 100 - led@18 { 100 + led-18 { 101 101 label = "eth49:green"; 102 102 gpios = <&sgpio_out1 17 0 GPIO_ACTIVE_HIGH>; 103 103 default-state = "off"; 104 104 }; 105 - led@19 { 105 + led-19 { 106 106 label = "eth49:yellow"; 107 107 gpios = <&sgpio_out1 17 1 GPIO_ACTIVE_HIGH>; 108 108 default-state = "off"; 109 109 }; 110 - led@20 { 110 + led-20 { 111 111 label = "eth50:green"; 112 112 gpios = <&sgpio_out1 18 0 GPIO_ACTIVE_HIGH>; 113 113 default-state = "off"; 114 114 }; 115 - led@21 { 115 + led-21 { 116 116 label = "eth50:yellow"; 117 117 gpios = <&sgpio_out1 18 1 GPIO_ACTIVE_HIGH>; 118 118 default-state = "off"; 119 119 }; 120 - led@22 { 120 + led-22 { 121 121 label = "eth51:green"; 122 122 gpios = <&sgpio_out1 19 0 GPIO_ACTIVE_HIGH>; 123 123 default-state = "off"; 124 124 }; 125 - led@23 { 125 + led-23 { 126 126 label = "eth51:yellow"; 127 127 gpios = <&sgpio_out1 19 1 GPIO_ACTIVE_HIGH>; 128 128 default-state = "off"; 129 129 }; 130 - led@24 { 130 + led-24 { 131 131 label = "eth52:green"; 132 132 gpios = <&sgpio_out1 20 0 GPIO_ACTIVE_HIGH>; 133 133 default-state = "off"; 134 134 }; 135 - led@25 { 135 + led-25 { 136 136 label = "eth52:yellow"; 137 137 gpios = <&sgpio_out1 20 1 GPIO_ACTIVE_HIGH>; 138 138 default-state = "off"; 139 139 }; 140 - led@26 { 140 + led-26 { 141 141 label = "eth53:green"; 142 142 gpios = <&sgpio_out1 21 0 GPIO_ACTIVE_HIGH>; 143 143 default-state = "off"; 144 144 }; 145 - led@27 { 145 + led-27 { 146 146 label = "eth53:yellow"; 147 147 gpios = <&sgpio_out1 21 1 GPIO_ACTIVE_HIGH>; 148 148 default-state = "off"; 149 149 }; 150 - led@28 { 150 + led-28 { 151 151 label = "eth54:green"; 152 152 gpios = <&sgpio_out1 22 0 GPIO_ACTIVE_HIGH>; 153 153 default-state = "off"; 154 154 }; 155 - led@29 { 155 + led-29 { 156 156 label = "eth54:yellow"; 157 157 gpios = <&sgpio_out1 22 1 GPIO_ACTIVE_HIGH>; 158 158 default-state = "off"; 159 159 }; 160 - led@30 { 160 + led-30 { 161 161 label = "eth55:green"; 162 162 gpios = <&sgpio_out1 23 0 GPIO_ACTIVE_HIGH>; 163 163 default-state = "off"; 164 164 }; 165 - led@31 { 165 + led-31 { 166 166 label = "eth55:yellow"; 167 167 gpios = <&sgpio_out1 23 1 GPIO_ACTIVE_HIGH>; 168 168 default-state = "off"; 169 169 }; 170 - led@32 { 170 + led-32 { 171 171 label = "eth56:green"; 172 172 gpios = <&sgpio_out1 24 0 GPIO_ACTIVE_HIGH>; 173 173 default-state = "off"; 174 174 }; 175 - led@33 { 175 + led-33 { 176 176 label = "eth56:yellow"; 177 177 gpios = <&sgpio_out1 24 1 GPIO_ACTIVE_HIGH>; 178 178 default-state = "off"; 179 179 }; 180 - led@34 { 180 + led-34 { 181 181 label = "eth57:green"; 182 182 gpios = <&sgpio_out1 25 0 GPIO_ACTIVE_HIGH>; 183 183 default-state = "off"; 184 184 }; 185 - led@35 { 185 + led-35 { 186 186 label = "eth57:yellow"; 187 187 gpios = <&sgpio_out1 25 1 GPIO_ACTIVE_HIGH>; 188 188 default-state = "off"; 189 189 }; 190 - led@36 { 190 + led-36 { 191 191 label = "eth58:green"; 192 192 gpios = <&sgpio_out1 26 0 GPIO_ACTIVE_HIGH>; 193 193 default-state = "off"; 194 194 }; 195 - led@37 { 195 + led-37 { 196 196 label = "eth58:yellow"; 197 197 gpios = <&sgpio_out1 26 1 GPIO_ACTIVE_HIGH>; 198 198 default-state = "off"; 199 199 }; 200 - led@38 { 200 + led-38 { 201 201 label = "eth59:green"; 202 202 gpios = <&sgpio_out1 27 0 GPIO_ACTIVE_HIGH>; 203 203 default-state = "off"; 204 204 }; 205 - led@39 { 205 + led-39 { 206 206 label = "eth59:yellow"; 207 207 gpios = <&sgpio_out1 27 1 GPIO_ACTIVE_HIGH>; 208 208 default-state = "off"; 209 209 }; 210 - led@40 { 210 + led-40 { 211 211 label = "eth60:green"; 212 212 gpios = <&sgpio_out1 28 0 GPIO_ACTIVE_HIGH>; 213 213 default-state = "off"; 214 214 }; 215 - led@41 { 215 + led-41 { 216 216 label = "eth60:yellow"; 217 217 gpios = <&sgpio_out1 28 1 GPIO_ACTIVE_HIGH>; 218 218 default-state = "off"; 219 219 }; 220 - led@42 { 220 + led-42 { 221 221 label = "eth61:green"; 222 222 gpios = <&sgpio_out1 29 0 GPIO_ACTIVE_HIGH>; 223 223 default-state = "off"; 224 224 }; 225 - led@43 { 225 + led-43 { 226 226 label = "eth61:yellow"; 227 227 gpios = <&sgpio_out1 29 1 GPIO_ACTIVE_HIGH>; 228 228 default-state = "off"; 229 229 }; 230 - led@44 { 230 + led-44 { 231 231 label = "eth62:green"; 232 232 gpios = <&sgpio_out1 30 0 GPIO_ACTIVE_HIGH>; 233 233 default-state = "off"; 234 234 }; 235 - led@45 { 235 + led-45 { 236 236 label = "eth62:yellow"; 237 237 gpios = <&sgpio_out1 30 1 GPIO_ACTIVE_HIGH>; 238 238 default-state = "off"; 239 239 }; 240 - led@46 { 240 + led-46 { 241 241 label = "eth63:green"; 242 242 gpios = <&sgpio_out1 31 0 GPIO_ACTIVE_HIGH>; 243 243 default-state = "off"; 244 244 }; 245 - led@47 { 245 + led-47 { 246 246 label = "eth63:yellow"; 247 247 gpios = <&sgpio_out1 31 1 GPIO_ACTIVE_HIGH>; 248 248 default-state = "off"; ··· 269 269 }; 270 270 gpio@1 { 271 271 ngpios = <64>; 272 - }; 273 - }; 274 - 275 - &spi0 { 276 - status = "okay"; 277 - flash@0 { 278 - compatible = "jedec,spi-nor"; 279 - spi-max-frequency = <8000000>; 280 - reg = <0>; 281 272 }; 282 273 }; 283 274 ··· 386 395 }; 387 396 388 397 &axi { 389 - i2c0_imux: i2c0-imux@0 { 398 + i2c0_imux: i2c-mux-0 { 390 399 compatible = "i2c-mux-pinctrl"; 391 400 #address-cells = <1>; 392 401 #size-cells = <0>; 393 402 i2c-parent = <&i2c0>; 394 403 }; 395 - i2c0_emux: i2c0-emux@0 { 404 + i2c0_emux: i2c-mux-1 { 396 405 compatible = "i2c-mux-gpio"; 397 406 #address-cells = <1>; 398 407 #size-cells = <0>; ··· 418 427 pinctrl-10 = <&i2cmux_10>; 419 428 pinctrl-11 = <&i2cmux_11>; 420 429 pinctrl-12 = <&i2cmux_pins_i>; 421 - i2c_sfp1: i2c_sfp1 { 430 + i2c_sfp1: i2c@0 { 422 431 reg = <0x0>; 423 432 #address-cells = <1>; 424 433 #size-cells = <0>; 425 434 }; 426 - i2c_sfp2: i2c_sfp2 { 435 + i2c_sfp2: i2c@1 { 427 436 reg = <0x1>; 428 437 #address-cells = <1>; 429 438 #size-cells = <0>; 430 439 }; 431 - i2c_sfp3: i2c_sfp3 { 440 + i2c_sfp3: i2c@2 { 432 441 reg = <0x2>; 433 442 #address-cells = <1>; 434 443 #size-cells = <0>; 435 444 }; 436 - i2c_sfp4: i2c_sfp4 { 445 + i2c_sfp4: i2c@3 { 437 446 reg = <0x3>; 438 447 #address-cells = <1>; 439 448 #size-cells = <0>; 440 449 }; 441 - i2c_sfp5: i2c_sfp5 { 450 + i2c_sfp5: i2c@4 { 442 451 reg = <0x4>; 443 452 #address-cells = <1>; 444 453 #size-cells = <0>; 445 454 }; 446 - i2c_sfp6: i2c_sfp6 { 455 + i2c_sfp6: i2c@5 { 447 456 reg = <0x5>; 448 457 #address-cells = <1>; 449 458 #size-cells = <0>; 450 459 }; 451 - i2c_sfp7: i2c_sfp7 { 460 + i2c_sfp7: i2c@6 { 452 461 reg = <0x6>; 453 462 #address-cells = <1>; 454 463 #size-cells = <0>; 455 464 }; 456 - i2c_sfp8: i2c_sfp8 { 465 + i2c_sfp8: i2c@7 { 457 466 reg = <0x7>; 458 467 #address-cells = <1>; 459 468 #size-cells = <0>; 460 469 }; 461 - i2c_sfp9: i2c_sfp9 { 470 + i2c_sfp9: i2c@8 { 462 471 reg = <0x8>; 463 472 #address-cells = <1>; 464 473 #size-cells = <0>; 465 474 }; 466 - i2c_sfp10: i2c_sfp10 { 475 + i2c_sfp10: i2c@9 { 467 476 reg = <0x9>; 468 477 #address-cells = <1>; 469 478 #size-cells = <0>; 470 479 }; 471 - i2c_sfp11: i2c_sfp11 { 480 + i2c_sfp11: i2c@a { 472 481 reg = <0xa>; 473 482 #address-cells = <1>; 474 483 #size-cells = <0>; 475 484 }; 476 - i2c_sfp12: i2c_sfp12 { 485 + i2c_sfp12: i2c@b { 477 486 reg = <0xb>; 478 487 #address-cells = <1>; 479 488 #size-cells = <0>; ··· 486 495 &gpio 61 GPIO_ACTIVE_HIGH 487 496 &gpio 54 GPIO_ACTIVE_HIGH>; 488 497 idle-state = <0x8>; 489 - i2c_sfp13: i2c_sfp13 { 498 + i2c_sfp13: i2c@0 { 490 499 reg = <0x0>; 491 500 #address-cells = <1>; 492 501 #size-cells = <0>; 493 502 }; 494 - i2c_sfp14: i2c_sfp14 { 503 + i2c_sfp14: i2c@1 { 495 504 reg = <0x1>; 496 505 #address-cells = <1>; 497 506 #size-cells = <0>; 498 507 }; 499 - i2c_sfp15: i2c_sfp15 { 508 + i2c_sfp15: i2c@2 { 500 509 reg = <0x2>; 501 510 #address-cells = <1>; 502 511 #size-cells = <0>; 503 512 }; 504 - i2c_sfp16: i2c_sfp16 { 513 + i2c_sfp16: i2c@3 { 505 514 reg = <0x3>; 506 515 #address-cells = <1>; 507 516 #size-cells = <0>; 508 517 }; 509 - i2c_sfp17: i2c_sfp17 { 518 + i2c_sfp17: i2c@4 { 510 519 reg = <0x4>; 511 520 #address-cells = <1>; 512 521 #size-cells = <0>; 513 522 }; 514 - i2c_sfp18: i2c_sfp18 { 523 + i2c_sfp18: i2c@5 { 515 524 reg = <0x5>; 516 525 #address-cells = <1>; 517 526 #size-cells = <0>; 518 527 }; 519 - i2c_sfp19: i2c_sfp19 { 528 + i2c_sfp19: i2c@6 { 520 529 reg = <0x6>; 521 530 #address-cells = <1>; 522 531 #size-cells = <0>; 523 532 }; 524 - i2c_sfp20: i2c_sfp20 { 533 + i2c_sfp20: i2c@7 { 525 534 reg = <0x7>; 526 535 #address-cells = <1>; 527 536 #size-cells = <0>;
+13 -22
arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi
··· 15 15 16 16 leds { 17 17 compatible = "gpio-leds"; 18 - led@0 { 18 + led-0 { 19 19 label = "eth60:yellow"; 20 20 gpios = <&sgpio_out1 28 0 GPIO_ACTIVE_LOW>; 21 21 default-state = "off"; 22 22 }; 23 - led@1 { 23 + led-1 { 24 24 label = "eth60:green"; 25 25 gpios = <&sgpio_out1 28 1 GPIO_ACTIVE_LOW>; 26 26 default-state = "off"; 27 27 }; 28 - led@2 { 28 + led-2 { 29 29 label = "eth61:yellow"; 30 30 gpios = <&sgpio_out1 29 0 GPIO_ACTIVE_LOW>; 31 31 default-state = "off"; 32 32 }; 33 - led@3 { 33 + led-3 { 34 34 label = "eth61:green"; 35 35 gpios = <&sgpio_out1 29 1 GPIO_ACTIVE_LOW>; 36 36 default-state = "off"; 37 37 }; 38 - led@4 { 38 + led-4 { 39 39 label = "eth62:yellow"; 40 40 gpios = <&sgpio_out1 30 0 GPIO_ACTIVE_LOW>; 41 41 default-state = "off"; 42 42 }; 43 - led@5 { 43 + led-5 { 44 44 label = "eth62:green"; 45 45 gpios = <&sgpio_out1 30 1 GPIO_ACTIVE_LOW>; 46 46 default-state = "off"; 47 47 }; 48 - led@6 { 48 + led-6 { 49 49 label = "eth63:yellow"; 50 50 gpios = <&sgpio_out1 31 0 GPIO_ACTIVE_LOW>; 51 51 default-state = "off"; 52 52 }; 53 - led@7 { 53 + led-7 { 54 54 label = "eth63:green"; 55 55 gpios = <&sgpio_out1 31 1 GPIO_ACTIVE_LOW>; 56 56 default-state = "off"; ··· 89 89 90 90 &spi0 { 91 91 status = "okay"; 92 - flash@0 { 93 - compatible = "jedec,spi-nor"; 94 - spi-max-frequency = <8000000>; 95 - reg = <0>; 96 - }; 97 - }; 98 - 99 - &spi0 { 100 - status = "okay"; 101 92 spi@0 { 102 93 compatible = "spi-mux"; 103 94 mux-controls = <&mux>; ··· 120 129 }; 121 130 122 131 &axi { 123 - i2c0_imux: i2c0-imux@0 { 132 + i2c0_imux: i2c-mux { 124 133 compatible = "i2c-mux-pinctrl"; 125 134 #address-cells = <1>; 126 135 #size-cells = <0>; ··· 137 146 pinctrl-2 = <&i2cmux_s31>; 138 147 pinctrl-3 = <&i2cmux_s32>; 139 148 pinctrl-4 = <&i2cmux_pins_i>; 140 - i2c_sfp1: i2c_sfp1 { 149 + i2c_sfp1: i2c@0 { 141 150 reg = <0x0>; 142 151 #address-cells = <1>; 143 152 #size-cells = <0>; 144 153 }; 145 - i2c_sfp2: i2c_sfp2 { 154 + i2c_sfp2: i2c@1 { 146 155 reg = <0x1>; 147 156 #address-cells = <1>; 148 157 #size-cells = <0>; 149 158 }; 150 - i2c_sfp3: i2c_sfp3 { 159 + i2c_sfp3: i2c@2 { 151 160 reg = <0x2>; 152 161 #address-cells = <1>; 153 162 #size-cells = <0>; 154 163 }; 155 - i2c_sfp4: i2c_sfp4 { 164 + i2c_sfp4: i2c@3 { 156 165 reg = <0x3>; 157 166 #address-cells = <1>; 158 167 #size-cells = <0>;