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

Merge tag 'v5.3-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt

mt8183:
- fix pwrap interrupt number
- add i2c notes

dt-bindings:
- add compatible for mt6779
- add mt6779 uart and sysirq compatible

* tag 'v5.3-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
dt-bindings: irq: mtk, sysirq: add support for mt6779
dt-bindings: mtk-uart: add mt6779 uart bindings
dt-bindings: mediatek: add support for mt6779 reference board
arm64: dts: mt8183: add I2C nodes
arm64: dts: mt8183: fix pwrap gic number

Link: https://lore.kernel.org/r/def8fb77-fce4-097d-7ae2-8c4670bc09c1@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+292 -1
+4
Documentation/devicetree/bindings/arm/mediatek.yaml
··· 48 48 - const: mediatek,mt6765 49 49 - items: 50 50 - enum: 51 + - mediatek,mt6779-evb 52 + - const: mediatek,mt6779 53 + - items: 54 + - enum: 51 55 - mediatek,mt6795-evb 52 56 - const: mediatek,mt6795 53 57 - items:
+1
Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt
··· 15 15 "mediatek,mt7629-sysirq", "mediatek,mt6577-sysirq": for MT7629 16 16 "mediatek,mt6795-sysirq", "mediatek,mt6577-sysirq": for MT6795 17 17 "mediatek,mt6797-sysirq", "mediatek,mt6577-sysirq": for MT6797 18 + "mediatek,mt6779-sysirq", "mediatek,mt6577-sysirq": for MT6779 18 19 "mediatek,mt6765-sysirq", "mediatek,mt6577-sysirq": for MT6765 19 20 "mediatek,mt6755-sysirq", "mediatek,mt6577-sysirq": for MT6755 20 21 "mediatek,mt6592-sysirq", "mediatek,mt6577-sysirq": for MT6592
+1
Documentation/devicetree/bindings/serial/mtk-uart.txt
··· 9 9 * "mediatek,mt6589-uart" for MT6589 compatible UARTS 10 10 * "mediatek,mt6755-uart" for MT6755 compatible UARTS 11 11 * "mediatek,mt6765-uart" for MT6765 compatible UARTS 12 + * "mediatek,mt6779-uart" for MT6779 compatible UARTS 12 13 * "mediatek,mt6795-uart" for MT6795 compatible UARTS 13 14 * "mediatek,mt6797-uart" for MT6797 compatible UARTS 14 15 * "mediatek,mt7622-uart" for MT7622 compatible UARTS
+96
arch/arm64/boot/dts/mediatek/mt8183-evb.dts
··· 30 30 status = "okay"; 31 31 }; 32 32 33 + &i2c0 { 34 + pinctrl-names = "default"; 35 + pinctrl-0 = <&i2c_pins_0>; 36 + status = "okay"; 37 + clock-frequency = <100000>; 38 + }; 39 + 40 + &i2c1 { 41 + pinctrl-names = "default"; 42 + pinctrl-0 = <&i2c_pins_1>; 43 + status = "okay"; 44 + clock-frequency = <100000>; 45 + }; 46 + 47 + &i2c2 { 48 + pinctrl-names = "default"; 49 + pinctrl-0 = <&i2c_pins_2>; 50 + status = "okay"; 51 + clock-frequency = <100000>; 52 + }; 53 + 54 + &i2c3 { 55 + pinctrl-names = "default"; 56 + pinctrl-0 = <&i2c_pins_3>; 57 + status = "okay"; 58 + clock-frequency = <100000>; 59 + }; 60 + 61 + &i2c4 { 62 + pinctrl-names = "default"; 63 + pinctrl-0 = <&i2c_pins_4>; 64 + status = "okay"; 65 + clock-frequency = <1000000>; 66 + }; 67 + 68 + &i2c5 { 69 + pinctrl-names = "default"; 70 + pinctrl-0 = <&i2c_pins_5>; 71 + status = "okay"; 72 + clock-frequency = <1000000>; 73 + }; 74 + 33 75 &pio { 76 + i2c_pins_0: i2c0{ 77 + pins_i2c{ 78 + pinmux = <PINMUX_GPIO82__FUNC_SDA0>, 79 + <PINMUX_GPIO83__FUNC_SCL0>; 80 + mediatek,pull-up-adv = <3>; 81 + mediatek,drive-strength-adv = <00>; 82 + }; 83 + }; 84 + 85 + i2c_pins_1: i2c1{ 86 + pins_i2c{ 87 + pinmux = <PINMUX_GPIO81__FUNC_SDA1>, 88 + <PINMUX_GPIO84__FUNC_SCL1>; 89 + mediatek,pull-up-adv = <3>; 90 + mediatek,drive-strength-adv = <00>; 91 + }; 92 + }; 93 + 94 + i2c_pins_2: i2c2{ 95 + pins_i2c{ 96 + pinmux = <PINMUX_GPIO103__FUNC_SCL2>, 97 + <PINMUX_GPIO104__FUNC_SDA2>; 98 + mediatek,pull-up-adv = <3>; 99 + mediatek,drive-strength-adv = <00>; 100 + }; 101 + }; 102 + 103 + i2c_pins_3: i2c3{ 104 + pins_i2c{ 105 + pinmux = <PINMUX_GPIO50__FUNC_SCL3>, 106 + <PINMUX_GPIO51__FUNC_SDA3>; 107 + mediatek,pull-up-adv = <3>; 108 + mediatek,drive-strength-adv = <00>; 109 + }; 110 + }; 111 + 112 + i2c_pins_4: i2c4{ 113 + pins_i2c{ 114 + pinmux = <PINMUX_GPIO105__FUNC_SCL4>, 115 + <PINMUX_GPIO106__FUNC_SDA4>; 116 + mediatek,pull-up-adv = <3>; 117 + mediatek,drive-strength-adv = <00>; 118 + }; 119 + }; 120 + 121 + i2c_pins_5: i2c5{ 122 + pins_i2c{ 123 + pinmux = <PINMUX_GPIO48__FUNC_SCL5>, 124 + <PINMUX_GPIO49__FUNC_SDA5>; 125 + mediatek,pull-up-adv = <3>; 126 + mediatek,drive-strength-adv = <00>; 127 + }; 128 + }; 129 + 34 130 spi_pins_0: spi0{ 35 131 pins_spi{ 36 132 pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
+190 -1
arch/arm64/boot/dts/mediatek/mt8183.dtsi
··· 16 16 #address-cells = <2>; 17 17 #size-cells = <2>; 18 18 19 + aliases { 20 + i2c0 = &i2c0; 21 + i2c1 = &i2c1; 22 + i2c2 = &i2c2; 23 + i2c3 = &i2c3; 24 + i2c4 = &i2c4; 25 + i2c5 = &i2c5; 26 + i2c6 = &i2c6; 27 + i2c7 = &i2c7; 28 + i2c8 = &i2c8; 29 + i2c9 = &i2c9; 30 + i2c10 = &i2c10; 31 + i2c11 = &i2c11; 32 + }; 33 + 19 34 cpus { 20 35 #address-cells = <1>; 21 36 #size-cells = <0>; ··· 263 248 compatible = "mediatek,mt8183-pwrap"; 264 249 reg = <0 0x1000d000 0 0x1000>; 265 250 reg-names = "pwrap"; 266 - interrupts = <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>; 251 + interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>; 267 252 clocks = <&topckgen CLK_TOP_MUX_PMICSPI>, 268 253 <&infracfg CLK_INFRA_PMIC_AP>; 269 254 clock-names = "spi", "wrap"; ··· 309 294 status = "disabled"; 310 295 }; 311 296 297 + i2c6: i2c@11005000 { 298 + compatible = "mediatek,mt8183-i2c"; 299 + reg = <0 0x11005000 0 0x1000>, 300 + <0 0x11000600 0 0x80>; 301 + interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_LOW>; 302 + clocks = <&infracfg CLK_INFRA_I2C6>, 303 + <&infracfg CLK_INFRA_AP_DMA>; 304 + clock-names = "main", "dma"; 305 + clock-div = <1>; 306 + #address-cells = <1>; 307 + #size-cells = <0>; 308 + status = "disabled"; 309 + }; 310 + 311 + i2c0: i2c@11007000 { 312 + compatible = "mediatek,mt8183-i2c"; 313 + reg = <0 0x11007000 0 0x1000>, 314 + <0 0x11000080 0 0x80>; 315 + interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_LOW>; 316 + clocks = <&infracfg CLK_INFRA_I2C0>, 317 + <&infracfg CLK_INFRA_AP_DMA>; 318 + clock-names = "main", "dma"; 319 + clock-div = <1>; 320 + #address-cells = <1>; 321 + #size-cells = <0>; 322 + status = "disabled"; 323 + }; 324 + 325 + i2c4: i2c@11008000 { 326 + compatible = "mediatek,mt8183-i2c"; 327 + reg = <0 0x11008000 0 0x1000>, 328 + <0 0x11000100 0 0x80>; 329 + interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_LOW>; 330 + clocks = <&infracfg CLK_INFRA_I2C1>, 331 + <&infracfg CLK_INFRA_AP_DMA>, 332 + <&infracfg CLK_INFRA_I2C1_ARBITER>; 333 + clock-names = "main", "dma","arb"; 334 + clock-div = <1>; 335 + #address-cells = <1>; 336 + #size-cells = <0>; 337 + status = "disabled"; 338 + }; 339 + 340 + i2c2: i2c@11009000 { 341 + compatible = "mediatek,mt8183-i2c"; 342 + reg = <0 0x11009000 0 0x1000>, 343 + <0 0x11000280 0 0x80>; 344 + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_LOW>; 345 + clocks = <&infracfg CLK_INFRA_I2C2>, 346 + <&infracfg CLK_INFRA_AP_DMA>, 347 + <&infracfg CLK_INFRA_I2C2_ARBITER>; 348 + clock-names = "main", "dma", "arb"; 349 + clock-div = <1>; 350 + #address-cells = <1>; 351 + #size-cells = <0>; 352 + status = "disabled"; 353 + }; 354 + 312 355 spi0: spi@1100a000 { 313 356 compatible = "mediatek,mt8183-spi"; 314 357 #address-cells = <1>; ··· 380 307 status = "disabled"; 381 308 }; 382 309 310 + i2c3: i2c@1100f000 { 311 + compatible = "mediatek,mt8183-i2c"; 312 + reg = <0 0x1100f000 0 0x1000>, 313 + <0 0x11000400 0 0x80>; 314 + interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_LOW>; 315 + clocks = <&infracfg CLK_INFRA_I2C3>, 316 + <&infracfg CLK_INFRA_AP_DMA>; 317 + clock-names = "main", "dma"; 318 + clock-div = <1>; 319 + #address-cells = <1>; 320 + #size-cells = <0>; 321 + status = "disabled"; 322 + }; 323 + 383 324 spi1: spi@11010000 { 384 325 compatible = "mediatek,mt8183-spi"; 385 326 #address-cells = <1>; ··· 404 317 <&topckgen CLK_TOP_MUX_SPI>, 405 318 <&infracfg CLK_INFRA_SPI1>; 406 319 clock-names = "parent-clk", "sel-clk", "spi-clk"; 320 + status = "disabled"; 321 + }; 322 + 323 + i2c1: i2c@11011000 { 324 + compatible = "mediatek,mt8183-i2c"; 325 + reg = <0 0x11011000 0 0x1000>, 326 + <0 0x11000480 0 0x80>; 327 + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_LOW>; 328 + clocks = <&infracfg CLK_INFRA_I2C4>, 329 + <&infracfg CLK_INFRA_AP_DMA>; 330 + clock-names = "main", "dma"; 331 + clock-div = <1>; 332 + #address-cells = <1>; 333 + #size-cells = <0>; 407 334 status = "disabled"; 408 335 }; 409 336 ··· 447 346 status = "disabled"; 448 347 }; 449 348 349 + i2c9: i2c@11014000 { 350 + compatible = "mediatek,mt8183-i2c"; 351 + reg = <0 0x11014000 0 0x1000>, 352 + <0 0x11000180 0 0x80>; 353 + interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_LOW>; 354 + clocks = <&infracfg CLK_INFRA_I2C1_IMM>, 355 + <&infracfg CLK_INFRA_AP_DMA>, 356 + <&infracfg CLK_INFRA_I2C1_ARBITER>; 357 + clock-names = "main", "dma", "arb"; 358 + clock-div = <1>; 359 + #address-cells = <1>; 360 + #size-cells = <0>; 361 + status = "disabled"; 362 + }; 363 + 364 + i2c10: i2c@11015000 { 365 + compatible = "mediatek,mt8183-i2c"; 366 + reg = <0 0x11015000 0 0x1000>, 367 + <0 0x11000300 0 0x80>; 368 + interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>; 369 + clocks = <&infracfg CLK_INFRA_I2C2_IMM>, 370 + <&infracfg CLK_INFRA_AP_DMA>, 371 + <&infracfg CLK_INFRA_I2C2_ARBITER>; 372 + clock-names = "main", "dma", "arb"; 373 + clock-div = <1>; 374 + #address-cells = <1>; 375 + #size-cells = <0>; 376 + status = "disabled"; 377 + }; 378 + 379 + i2c5: i2c@11016000 { 380 + compatible = "mediatek,mt8183-i2c"; 381 + reg = <0 0x11016000 0 0x1000>, 382 + <0 0x11000500 0 0x80>; 383 + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>; 384 + clocks = <&infracfg CLK_INFRA_I2C5>, 385 + <&infracfg CLK_INFRA_AP_DMA>, 386 + <&infracfg CLK_INFRA_I2C5_ARBITER>; 387 + clock-names = "main", "dma", "arb"; 388 + clock-div = <1>; 389 + #address-cells = <1>; 390 + #size-cells = <0>; 391 + status = "disabled"; 392 + }; 393 + 394 + i2c11: i2c@11017000 { 395 + compatible = "mediatek,mt8183-i2c"; 396 + reg = <0 0x11017000 0 0x1000>, 397 + <0 0x11000580 0 0x80>; 398 + interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_LOW>; 399 + clocks = <&infracfg CLK_INFRA_I2C5_IMM>, 400 + <&infracfg CLK_INFRA_AP_DMA>, 401 + <&infracfg CLK_INFRA_I2C5_ARBITER>; 402 + clock-names = "main", "dma", "arb"; 403 + clock-div = <1>; 404 + #address-cells = <1>; 405 + #size-cells = <0>; 406 + status = "disabled"; 407 + }; 408 + 450 409 spi4: spi@11018000 { 451 410 compatible = "mediatek,mt8183-spi"; 452 411 #address-cells = <1>; ··· 530 369 <&topckgen CLK_TOP_MUX_SPI>, 531 370 <&infracfg CLK_INFRA_SPI5>; 532 371 clock-names = "parent-clk", "sel-clk", "spi-clk"; 372 + status = "disabled"; 373 + }; 374 + 375 + i2c7: i2c@1101a000 { 376 + compatible = "mediatek,mt8183-i2c"; 377 + reg = <0 0x1101a000 0 0x1000>, 378 + <0 0x11000680 0 0x80>; 379 + interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_LOW>; 380 + clocks = <&infracfg CLK_INFRA_I2C7>, 381 + <&infracfg CLK_INFRA_AP_DMA>; 382 + clock-names = "main", "dma"; 383 + clock-div = <1>; 384 + #address-cells = <1>; 385 + #size-cells = <0>; 386 + status = "disabled"; 387 + }; 388 + 389 + i2c8: i2c@1101b000 { 390 + compatible = "mediatek,mt8183-i2c"; 391 + reg = <0 0x1101b000 0 0x1000>, 392 + <0 0x11000700 0 0x80>; 393 + interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_LOW>; 394 + clocks = <&infracfg CLK_INFRA_I2C8>, 395 + <&infracfg CLK_INFRA_AP_DMA>; 396 + clock-names = "main", "dma"; 397 + clock-div = <1>; 398 + #address-cells = <1>; 399 + #size-cells = <0>; 533 400 status = "disabled"; 534 401 }; 535 402