]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: dts: kirkwood: Fixup pcie DT warnings
authorAndrew Lunn <andrew@lunn.ch>
Sun, 3 Apr 2016 02:03:47 +0000 (04:03 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Thu, 14 Apr 2016 17:06:15 +0000 (19:06 +0200)
PCIe has a range property, so the unit name should contain an address.
Make use of the label to enable individual PCIe busses. Also, fixup
the synology dtsi file which added a label pcie2 rather than using the
existing pcie1 label.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
35 files changed:
arch/arm/boot/dts/kirkwood-6192.dtsi
arch/arm/boot/dts/kirkwood-6281.dtsi
arch/arm/boot/dts/kirkwood-6282.dtsi
arch/arm/boot/dts/kirkwood-98dx4122.dtsi
arch/arm/boot/dts/kirkwood-b3.dts
arch/arm/boot/dts/kirkwood-db-88f6281.dts
arch/arm/boot/dts/kirkwood-db-88f6282.dts
arch/arm/boot/dts/kirkwood-dir665.dts
arch/arm/boot/dts/kirkwood-ds111.dts
arch/arm/boot/dts/kirkwood-ds112.dts
arch/arm/boot/dts/kirkwood-ds212.dts
arch/arm/boot/dts/kirkwood-ds411.dts
arch/arm/boot/dts/kirkwood-ds411slim.dts
arch/arm/boot/dts/kirkwood-iconnect.dts
arch/arm/boot/dts/kirkwood-km_common.dtsi
arch/arm/boot/dts/kirkwood-laplug.dts
arch/arm/boot/dts/kirkwood-linkstation.dtsi
arch/arm/boot/dts/kirkwood-mplcec4.dts
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
arch/arm/boot/dts/kirkwood-nas2big.dts
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
arch/arm/boot/dts/kirkwood-nsa310.dts
arch/arm/boot/dts/kirkwood-nsa320.dts
arch/arm/boot/dts/kirkwood-nsa325.dts
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
arch/arm/boot/dts/kirkwood-openrd.dtsi
arch/arm/boot/dts/kirkwood-rd88f6192.dts
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
arch/arm/boot/dts/kirkwood-rs212.dts
arch/arm/boot/dts/kirkwood-synology.dtsi
arch/arm/boot/dts/kirkwood-t5325.dts
arch/arm/boot/dts/kirkwood-ts219-6282.dts
arch/arm/boot/dts/kirkwood-ts219.dtsi
arch/arm/boot/dts/kirkwood-ts419-6282.dts

index 9e6e9e2691d5d7293939d9b84ed2b394bc5aa5ae..1014a5dd903590ce3697123d208e20fb78d192b8 100644 (file)
@@ -1,6 +1,6 @@
 / {
        mbus {
-               pciec: pcie-controller {
+               pciec: pcie-controller@82000000 {
                        compatible = "marvell,kirkwood-pcie";
                        status = "disabled";
                        device_type = "pci";
index 7dc7d6782e8325012b8b7ad8fe52676ab15ca404..fad20155130417de9612a7cad727b54e9fe35152 100644 (file)
@@ -1,6 +1,6 @@
 / {
        mbus {
-               pciec: pcie-controller {
+               pciec: pcie-controller@82000000 {
                        compatible = "marvell,kirkwood-pcie";
                        status = "disabled";
                        device_type = "pci";
index 4680eec990f0cd3bc92a985b57e954303ee2f0b4..27434c35eb66c849002811034c2769b449caf837 100644 (file)
@@ -1,6 +1,6 @@
 / {
        mbus {
-               pciec: pcie-controller {
+               pciec: pcie-controller@82000000 {
                        compatible = "marvell,kirkwood-pcie";
                        status = "disabled";
                        device_type = "pci";
index 9e1f741d74ff4aed504bece8454bad93301fa4b5..17eb92733310179a65b944c4dd2c17db1162f06e 100644 (file)
@@ -1,6 +1,6 @@
 / {
        mbus {
-               pciec: pcie-controller {
+               pciec: pcie-controller@82000000 {
                        compatible = "marvell,kirkwood-pcie";
                        status = "disabled";
                        device_type = "pci";
index d2936ad3af1d8d1b73c992906682ed9370c8014d..d091ecb61cd2e45c144720ef1c1ad2713c3bb7a9 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       /* Wifi model has Atheros chipset on pcie port */
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pmx_button_power: pmx-button-power {
        };
 };
 
+/* Wifi model has Atheros chipset on pcie port */
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index c39dd766c75a03caf11e0a79e71d3a25778fd33b..aee6f02b1c801ce89654d84b261a6758af6aad11 100644 (file)
 / {
        model = "Marvell DB-88F6281-BP Development Board";
        compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+};
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
+&pciec {
+        status = "okay";
+};
 
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
+&pcie0 {
+       status = "okay";
 };
index 701c6b6cdaa2ffd82b49ac2a0fe145e1e9d626a5..e8b23e13ec0c935dd6d86371dfb54a57e0b0df48 100644 (file)
 / {
        model = "Marvell DB-88F6282-BP Development Board";
        compatible = "marvell,db-88f6282-bp", "marvell,kirkwood-88f6282", "marvell,kirkwood";
+};
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
+&pciec {
+        status = "okay";
+};
 
-                       pcie@1,0 {
-                               status = "okay";
-                       };
+&pcie0 {
+       status = "okay";
+};
 
-                       pcie@2,0 {
-                               status = "okay";
-                       };
-               };
-       };
+&pcie1 {
+       status = "okay";
 };
index f548363060ea432a29b4932e3083cce60b8acde0..41acbb6dd6ab8b4583797f293b59a5686cff7b6a 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-0 =< &pmx_led_usb
 &rtc {
        status = "disabled";
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 61f47fbe44d0d6b12354da1641a7c7cc05b5cf22..a85a4664431bb5c825000bff07c9acc1f1070677 100644 (file)
@@ -40,6 +40,6 @@
        status = "okay";
 };
 
-&pcie2 {
+&pcie1 {
        status = "okay";
 };
index b84af3da8c84d596b2b950489541c4efd9216783..6cef4bdbc01b7f1b7d7fd33cb15fd35d8ea3edda 100644 (file)
        status = "okay";
 };
 
-&pcie2 {
+&pciec {
+        status = "okay";
+};
+
+&pcie1 {
        status = "okay";
 };
index 99afd462f956ff2030f8e6d639ffb2052a78857a..7f32e7abffac9d89c468a8834fe378ea27e7a885 100644 (file)
@@ -43,6 +43,6 @@
        status = "okay";
 };
 
-&pcie2 {
+&pcie1 {
        status = "okay";
 };
index 623cd4a37d7171bfe3d262513c98feb48eae0f71..72e58307416d50966736f3b3f4753ac03f219733 100644 (file)
        status = "okay";
 };
 
-&pcie2 {
+&pciec {
+        status = "okay";
+};
+
+&pcie1 {
        status = "okay";
 };
index a0a1fad8b4de5fae9690a11ad0bc2670a2e0bd81..aaaf31b81522f88b56c992e1883f756f644171e1 100644 (file)
@@ -44,6 +44,6 @@
        status = "okay";
 };
 
-&pcie2 {
+&pcie1 {
        status = "okay";
 };
index 674306746dec0400a2b8941f9f138af21ab04beb..d25184ae4af324c2bece562d19e2c7e8aaade216 100644 (file)
                linux,initrd-end   = <0x4800000>;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pmx_button_reset: pmx-button-reset {
                phy-handle = <&ethphy0>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 8367c772c76474b069ff3cbcbe8768d1b5e80550..f6096f56046dce4b889f88c21d2816cb2bcb32e1 100644 (file)
@@ -4,16 +4,6 @@
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
        status = "okay";
        chip-delay = <25>;
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index c39e17a89f4e9c5a584a9386d672e3c56576f27e..1b0f070c2676633c52f8b8f2df013f734c1668c4 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                serial@12000 {
                        status = "okay";
                phy-handle = <&ethphy0>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 69061b6e987b86de8adf408e3477e45457b050fb..36c54c9dfa3095c46a283720f48be18147f45748 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pmx_power_hdd0: pmx-power-hdd0 {
                };
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index f3a991837515d4b97aec12aa2a21b9ddcefe8a2d..aa413b0bcce28ae6cdd47d528c314a22bbe7dc8e 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pmx_led_health: pmx-led-health {
                phy-handle = <&ethphy1>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 26fb610b2af7441ba52ee578ba23cb7f33b69c13..172a38c0b8a96e32097ab72fc27621bdf2a02eec 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-        };
-
        ocp@f1000000 {
                pin-controller@10000 {
                        pmx_usb_led: pmx-usb-led {
                duplex = <1>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 7427ec50b8290790e299b52547910b1db67d39ee..f53bcacf6b6351bc6cacb4403855bffecf3d605e 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                rtc@10300 {
                        /* The on-chip RTC is not powered (no supercap). */
                reg = <0x9100000 0x6f00000>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index fd733c63bc27da55aadb88b435fe8f2912aca8ad..8745484912d293fbeccb8383207262c4389a1fbb 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pmx_button_power: pmx-button-power {
                phy-handle = <&ethphy0>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index b514d643fb6c5413abd3ad1c50bfeffe9d905a33..a4e97f7f5804c48f632e97c25956d0e8649aab0a 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       /* Connected to NEC uPD720200 USB 3.0 controller */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pmx_button_power: pmx-button-power {
                phy-handle = <&ethphy0>;
        };
 };
+
+/* Connected to NEC uPD720200 USB 3.0 controller */
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 6139df0f376c911f078408761acd5f86df09f53b..0b69ee4934fa314c28ef0ad16940f839bf192e2e 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-0 = <&pmx_unknown>;
                };
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 2a935e94f96f1fc3bdc588b1f8b3474a00caff62..6ab104b4bb4290bf40906c7f9cd02afa80da68c7 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-names = "default";
                phy-handle = <&ethphy0>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index bc4ec933238743559ae4df59daf2091d86088113..36c64816bf7f1cd000acdf75d193279e49efac3a 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-names = "default";
        };
 };
 
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 5ccc46190079ef31141ac0c144b09ea4d202d197..e09b79ac73fd3e40568b49914e1469ffe07f9a79 100644 (file)
@@ -4,16 +4,6 @@
 / {
        model = "ZyXEL NSA310";
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
 
                reg = <0x5040000 0x2fc0000>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 24f1d30970a0650b535bcd67395c0cea8ace7935..e4ecab1126011f220601ed7f31e931ec6336bebb 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
                reg = <0x0600000 0x1FA00000>;
        };
 };
+
+&pcie0 {
+       status = "okay";
+};
index e0b959396ca2bfe4e6e624ef1ff83f1dbb6952fa..b8af907249fb97161c25c5809720d0e14479525c 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-0 = <&pmx_usb_power>;
         ethernet0-port@0 {
                 phy-handle = <&ethphy0>;
         };
-};
\ No newline at end of file
+};
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 5521426d101b76d2c2290f72600065c34fcc4b11..d5aacf137e4096fe43b1a99034e648a557b32c6d 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-names = "default";
                duplex = <1>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 3b19f1fd4caca99e687474b92a3a0729a13a1537..2c722ecd53313bb5a4bae00e88372c63af51b7d1 100644 (file)
        status = "okay";
 };
 
-&pcie2 {
+&pciec {
+        status = "okay";
+};
+
+&pcie1 {
        status = "okay";
 };
index 04015c174b990ed764fa18f3230b43e47c9c17b9..65e9524e852ab0570e72330fc8a5eabfb4fe173f 100644 (file)
  */
 
 / {
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-
-                       pcie2: pcie@2,0 {
-                               status = "disabled";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pmx_alarmled_12: pmx-alarmled-12 {
                phy-handle = <&ethphy1>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 860c6d778d4703d5e2f33471e8a295223a77b535..3500f4738fb04358b3e15f9bda5020ea65b9d817 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-0 = <&pmx_i2s &pmx_sysrst>;
                phy-handle = <&ethphy0>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index 1d291f620869323eb015abdd4457e177cfdcb927..3437bb3968445f20ff409093c60b9b8c1f3aa494 100644 (file)
@@ -5,16 +5,6 @@
 #include "kirkwood-ts219.dtsi"
 
 / {
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@2,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
 
@@ -63,3 +53,5 @@
 };
 
 &ethphy0 { reg = <0>; };
+
+&pcie1 { status = "okay"; };
index b3f75382cb061b104b1396dc9abce1ced83a7158..62e5e2d5c348c864fb57fa7a1bcec712f7a1093a 100644 (file)
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                i2c@11000 {
                        status = "okay";
                phy-handle = <&ethphy0>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
index d7512d4cdced8ea7ec4f56350562228f0882a586..e3e71f48acc829526f9c8f8d9fa62dfbaa5aee88 100644 (file)
 #include "kirkwood-ts219.dtsi"
 #include "kirkwood-ts419.dtsi"
 
-/ {
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@2,0 {
-                               status = "okay";
-                       };
-               };
-       };
-};
-
 &ethphy0 { reg = <0>; };
 &ethphy1 { reg = <1>; };
+
+&pciec { status = "okay"; };
+&pcie1 { status = "okay"; };