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

ARM: dts: mediatek: Update MT7629 PCIe node for new format

To match the new dts binding. Remove "subsys",unused
interrupt and slot node.Add "interrupt-names",
"linux,pci-domain" and pciecfg node.

Signed-off-by: Chuanjia Liu <chuanjia.liu@mediatek.com>
Acked-by: Ryder Lee <ryder.lee@mediatek.com>
Link: https://lore.kernel.org/r/20210823032800.1660-7-chuanjia.liu@mediatek.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

authored by

Chuanjia Liu and committed by
Matthias Brugger
adfaea23 235e40fd

+23 -25
+2 -1
arch/arm/boot/dts/mt7629-rfb.dts
··· 140 140 }; 141 141 }; 142 142 143 - &pcie { 143 + &pcie1 { 144 144 pinctrl-names = "default"; 145 145 pinctrl-0 = <&pcie_pins>; 146 + status = "okay"; 146 147 }; 147 148 148 149 &pciephy1 {
+21 -24
arch/arm/boot/dts/mt7629.dtsi
··· 361 361 #reset-cells = <1>; 362 362 }; 363 363 364 - pcie: pcie@1a140000 { 364 + pciecfg: pciecfg@1a140000 { 365 + compatible = "mediatek,generic-pciecfg", "syscon"; 366 + reg = <0x1a140000 0x1000>; 367 + }; 368 + 369 + pcie1: pcie@1a145000 { 365 370 compatible = "mediatek,mt7629-pcie"; 366 371 device_type = "pci"; 367 - reg = <0x1a140000 0x1000>, 368 - <0x1a145000 0x1000>; 369 - reg-names = "subsys","port1"; 372 + reg = <0x1a145000 0x1000>; 373 + reg-names = "port1"; 374 + linux,pci-domain = <1>; 370 375 #address-cells = <3>; 371 376 #size-cells = <2>; 372 - interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_LOW>, 373 - <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>; 377 + interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>; 378 + interrupt-names = "pcie_irq"; 374 379 clocks = <&pciesys CLK_PCIE_P1_MAC_EN>, 375 380 <&pciesys CLK_PCIE_P0_AHB_EN>, 376 381 <&pciesys CLK_PCIE_P1_AUX_EN>, ··· 396 391 power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>; 397 392 bus-range = <0x00 0xff>; 398 393 ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>; 394 + status = "disabled"; 399 395 400 - pcie1: pcie@1,0 { 401 - device_type = "pci"; 402 - reg = <0x0800 0 0 0 0>; 403 - #address-cells = <3>; 404 - #size-cells = <2>; 396 + #interrupt-cells = <1>; 397 + interrupt-map-mask = <0 0 0 7>; 398 + interrupt-map = <0 0 0 1 &pcie_intc1 0>, 399 + <0 0 0 2 &pcie_intc1 1>, 400 + <0 0 0 3 &pcie_intc1 2>, 401 + <0 0 0 4 &pcie_intc1 3>; 402 + pcie_intc1: interrupt-controller { 403 + interrupt-controller; 404 + #address-cells = <0>; 405 405 #interrupt-cells = <1>; 406 - ranges; 407 - num-lanes = <1>; 408 - interrupt-map-mask = <0 0 0 7>; 409 - interrupt-map = <0 0 0 1 &pcie_intc1 0>, 410 - <0 0 0 2 &pcie_intc1 1>, 411 - <0 0 0 3 &pcie_intc1 2>, 412 - <0 0 0 4 &pcie_intc1 3>; 413 - 414 - pcie_intc1: interrupt-controller { 415 - interrupt-controller; 416 - #address-cells = <0>; 417 - #interrupt-cells = <1>; 418 - }; 419 406 }; 420 407 }; 421 408