Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / arch / arm / dts / armada-38x-controlcenterdc.dts

diff --git a/arch/arm/dts/armada-38x-controlcenterdc.dts b/arch/arm/dts/armada-38x-controlcenterdc.dts
index ffbd0dc..5063a79 100644 (file)
--- a/arch/arm/dts/armada-38x-controlcenterdc.dts
+++ b/arch/arm/dts/armada-38x-controlcenterdc.dts
@@ -243,7 +243,7 @@
                        };
                };
 
-               pcie-controller {
+               pcie {
                        status = "okay";
                        /*
                         * The two PCIe units are accessible through
@@ -573,14 +573,14 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "n25q016a", "spi-flash";
+               compatible = "n25q016a", "jedec,spi-nor";
                reg = <0>; /* Chip select 0 */
                spi-max-frequency = <108000000>;
        };
        spi-flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "n25q128a11", "spi-flash";
+               compatible = "n25q128a11", "jedec,spi-nor";
                reg = <1>; /* Chip select 1 */
                spi-max-frequency = <108000000>;
                u-boot,dm-pre-reloc;