Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / dts / armada-8040-clearfog-gt-8k.dts

diff --git a/arch/arm/dts/armada-8040-clearfog-gt-8k.dts b/arch/arm/dts/armada-8040-clearfog-gt-8k.dts
index 498105f25f0555cd9572822341441f7cc85533ad..720c95082b6bde0acdb943c7844169af45ba4150 100644 (file)
--- a/arch/arm/dts/armada-8040-clearfog-gt-8k.dts
+++ b/arch/arm/dts/armada-8040-clearfog-gt-8k.dts
@@ -99,6 +99,11 @@
                     0    0    0    0    0    0    0xe  0xe  0xe  0xe
                     0xe  0xe  0 >;
 
+       cpm_pcie_reset_pins: cpm-pcie-reset-pins {
+               marvell,pins = < 32 >;
+               marvell,function = <0>;
+       };
+
        cpm_xhci_vbus_pins: cpm-xhci-vbus-pins {
                marvell,pins = < 47 >;
                marvell,function = <0>;
@@ -120,6 +125,9 @@
 
 &cpm_pcie0 {
        num-lanes = <1>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&cpm_pcie_reset_pins>;
+       marvell,reset-gpio = <&cpm_gpio1 0 GPIO_ACTIVE_LOW>;
        status = "okay";
 };
 
@@ -232,7 +240,7 @@
        status = "okay";
 
        spi-flash@0 {
-               compatible = "jedec,spi-nor", "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;