From: Jan Kiszka <[email protected]> The dtc of 4.17+ checks if a device tree node of device_type "pci" is also called "pci". Please it by renaming ours.
Signed-off-by: Jan Kiszka <[email protected]> --- configs/arm/dts/inmate-bananapi.dts | 2 +- configs/arm/dts/inmate-jetson-tk1.dts | 2 +- configs/arm/dts/inmate-orangepi0.dts | 2 +- configs/arm64/dts/inmate-espressobin.dts | 2 +- configs/arm64/dts/inmate-hikey.dts | 2 +- configs/arm64/dts/inmate-jetson-tx1.dts | 2 +- configs/arm64/dts/inmate-qemu-arm64.dts | 2 +- configs/arm64/dts/inmate-zynqmp-zcu102-2.dts | 2 +- configs/arm64/dts/inmate-zynqmp-zcu102.dts | 2 +- driver/pci.c | 2 +- driver/vpci_template.dts | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/arm/dts/inmate-bananapi.dts b/configs/arm/dts/inmate-bananapi.dts index 143476b8c..137223205 100644 --- a/configs/arm/dts/inmate-bananapi.dts +++ b/configs/arm/dts/inmate-bananapi.dts @@ -97,7 +97,7 @@ clocks = <&apb1_gates 23>; }; - vpci@2000000 { + pci@2000000 { compatible = "pci-host-ecam-generic"; device_type = "pci"; bus-range = <0 0>; diff --git a/configs/arm/dts/inmate-jetson-tk1.dts b/configs/arm/dts/inmate-jetson-tk1.dts index 9cc3f7dd9..974e5e26e 100644 --- a/configs/arm/dts/inmate-jetson-tk1.dts +++ b/configs/arm/dts/inmate-jetson-tk1.dts @@ -80,7 +80,7 @@ status = "okay"; }; - vpci@48000000 { + pci@48000000 { compatible = "pci-host-ecam-generic"; device_type = "pci"; bus-range = <0 0>; diff --git a/configs/arm/dts/inmate-orangepi0.dts b/configs/arm/dts/inmate-orangepi0.dts index 387a2a847..080176d64 100644 --- a/configs/arm/dts/inmate-orangepi0.dts +++ b/configs/arm/dts/inmate-orangepi0.dts @@ -93,7 +93,7 @@ clock-frequency = <24000000>; }; - vpci@2000000 { + pci@2000000 { compatible = "pci-host-ecam-generic"; device_type = "pci"; bus-range = <0 0>; diff --git a/configs/arm64/dts/inmate-espressobin.dts b/configs/arm64/dts/inmate-espressobin.dts index ecd53e2a2..49715e8ae 100644 --- a/configs/arm64/dts/inmate-espressobin.dts +++ b/configs/arm64/dts/inmate-espressobin.dts @@ -68,7 +68,7 @@ interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; }; - vpci@fc000000 { + pci@fc000000 { compatible = "pci-host-ecam-generic"; device_type = "pci"; bus-range = <0 0>; diff --git a/configs/arm64/dts/inmate-hikey.dts b/configs/arm64/dts/inmate-hikey.dts index 70b3ea364..c33767fe2 100644 --- a/configs/arm64/dts/inmate-hikey.dts +++ b/configs/arm64/dts/inmate-hikey.dts @@ -93,7 +93,7 @@ clock-names = "uartclk", "apb_pclk"; }; - vpci@f6000000 { + pci@f6000000 { compatible = "pci-host-ecam-generic"; device_type = "pci"; bus-range = <0 0>; diff --git a/configs/arm64/dts/inmate-jetson-tx1.dts b/configs/arm64/dts/inmate-jetson-tx1.dts index 2632b7172..8fd30e825 100644 --- a/configs/arm64/dts/inmate-jetson-tx1.dts +++ b/configs/arm64/dts/inmate-jetson-tx1.dts @@ -83,7 +83,7 @@ status = "okay"; }; - vpci@48000000 { + pci@48000000 { status = "okay"; compatible = "pci-host-ecam-generic"; device_type = "pci"; diff --git a/configs/arm64/dts/inmate-qemu-arm64.dts b/configs/arm64/dts/inmate-qemu-arm64.dts index 7fcf9f34f..6150a43d7 100644 --- a/configs/arm64/dts/inmate-qemu-arm64.dts +++ b/configs/arm64/dts/inmate-qemu-arm64.dts @@ -84,7 +84,7 @@ clock-names = "uartclk", "apb_pclk"; }; - vpci@7000000 { + pci@7000000 { compatible = "pci-host-ecam-generic"; device_type = "pci"; bus-range = <0 0>; diff --git a/configs/arm64/dts/inmate-zynqmp-zcu102-2.dts b/configs/arm64/dts/inmate-zynqmp-zcu102-2.dts index a62a47497..bf86b0d27 100644 --- a/configs/arm64/dts/inmate-zynqmp-zcu102-2.dts +++ b/configs/arm64/dts/inmate-zynqmp-zcu102-2.dts @@ -66,7 +66,7 @@ #interrupt-cells = <3>; }; - vpci@fc000000 { + pci@fc000000 { compatible = "pci-host-ecam-generic"; device_type = "pci"; bus-range = <0 0>; diff --git a/configs/arm64/dts/inmate-zynqmp-zcu102.dts b/configs/arm64/dts/inmate-zynqmp-zcu102.dts index 8f6b25864..f0819d49b 100644 --- a/configs/arm64/dts/inmate-zynqmp-zcu102.dts +++ b/configs/arm64/dts/inmate-zynqmp-zcu102.dts @@ -87,7 +87,7 @@ clock-names = "uart_clk", "pclk"; }; - vpci@fc000000 { + pci@fc000000 { compatible = "pci-host-ecam-generic"; device_type = "pci"; bus-range = <0 0>; diff --git a/driver/pci.c b/driver/pci.c index d62ad90e9..dd3cd451a 100644 --- a/driver/pci.c +++ b/driver/pci.c @@ -301,7 +301,7 @@ static bool create_vpci_of_overlay(struct jailhouse_system *config) if (of_property_read_u32(gic, "#address-cells", &gic_address_cells) < 0) gic_address_cells = 0; - vpci = of_find_node_by_name(overlay, "vpci"); + vpci = of_find_node_by_name(overlay, "pci"); if (!vpci) goto out; diff --git a/driver/vpci_template.dts b/driver/vpci_template.dts index bbc2aa0b5..084c91f1f 100644 --- a/driver/vpci_template.dts +++ b/driver/vpci_template.dts @@ -6,7 +6,7 @@ #address-cells = <2>; #size-cells = <2>; - vpci@0 { + pci@0 { compatible = "pci-host-ecam-generic"; device_type = "pci"; bus-range = <0 0>; -- 2.13.6 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
