leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: dts: kirkwood: Fixup pcie DT warnings

Browse Source 
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>
This commit is contained in:
Andrew Lunn 2016-04-03 04:03:47 +02:00 committed by Gregory CLEMENT
parent 8b1750de6a
commit eb13cf8345
35 changed files with 212 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/kirkwood-6192.dtsi
View File

@ -1,6 +1,6 @@
/ {
mbus {
pciec: pcie-controller {
pciec: pcie-controller@82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";

2
arch/arm/boot/dts/kirkwood-6281.dtsi
View File

@ -1,6 +1,6 @@
/ {
mbus {
pciec: pcie-controller {
pciec: pcie-controller@82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";

2
arch/arm/boot/dts/kirkwood-6282.dtsi
View File

@ -1,6 +1,6 @@
/ {
mbus {
pciec: pcie-controller {
pciec: pcie-controller@82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";

2
arch/arm/boot/dts/kirkwood-98dx4122.dtsi
View File

@ -1,6 +1,6 @@
/ {
mbus {
pciec: pcie-controller {
pciec: pcie-controller@82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";

19
arch/arm/boot/dts/kirkwood-b3.dts
View File

@ -33,17 +33,6 @@
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 {
@ -199,3 +188,11 @@
};
};
/* Wifi model has Atheros chipset on pcie port */
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-db-88f6281.dts
View File

@ -17,14 +17,12 @@
/ {
model = "Marvell DB-88F6281-BP Development Board";
compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood";
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

26
arch/arm/boot/dts/kirkwood-db-88f6282.dts
View File

@ -17,18 +17,16 @@
/ {
model = "Marvell DB-88F6282-BP Development Board";
compatible = "marvell,db-88f6282-bp", "marvell,kirkwood-88f6282", "marvell,kirkwood";
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
pcie@2,0 {
status = "okay";
};
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};
&pcie1 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-dir665.dts
View File

@ -25,16 +25,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-0 =< &pmx_led_usb
@ -276,3 +266,11 @@
&rtc {
status = "disabled";
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-ds111.dts
View File

@ -40,6 +40,6 @@
status = "okay";
};
&pcie2 {
&pcie1 {
status = "okay";
};

6
arch/arm/boot/dts/kirkwood-ds112.dts
View File

@ -44,6 +44,10 @@
status = "okay";
};
&pcie2 {
&pciec {
status = "okay";
};
&pcie1 {
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-ds212.dts
View File

@ -43,6 +43,6 @@
status = "okay";
};
&pcie2 {
&pcie1 {
status = "okay";
};

6
arch/arm/boot/dts/kirkwood-ds411.dts
View File

@ -48,6 +48,10 @@
status = "okay";
};
&pcie2 {
&pciec {
status = "okay";
};
&pcie1 {
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-ds411slim.dts
View File

@ -44,6 +44,6 @@
status = "okay";
};
&pcie2 {
&pcie1 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-iconnect.dts
View File

@ -19,16 +19,6 @@
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 {
@ -194,3 +184,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-km_common.dtsi
View 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 >;
@ -46,3 +36,11 @@
status = "okay";
chip-delay = <25>;
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

17
arch/arm/boot/dts/kirkwood-laplug.dts
View File

@ -27,15 +27,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
serial@12000 {
status = "okay";
@ -169,3 +160,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

17
arch/arm/boot/dts/kirkwood-linkstation.dtsi
View File

@ -49,15 +49,6 @@
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 {
@ -200,3 +191,11 @@
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-mplcec4.dts
View File

@ -17,16 +17,6 @@
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 {
@ -215,3 +205,11 @@
phy-handle = <&ethphy1>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View File

@ -31,16 +31,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pin-controller@10000 {
pmx_usb_led: pmx-usb-led {
@ -179,3 +169,11 @@
duplex = <1>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-nas2big.dts
View File

@ -28,16 +28,6 @@
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). */
@ -141,3 +131,11 @@
reg = <0x9100000 0x6f00000>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
View File

@ -28,16 +28,6 @@
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 {
@ -251,3 +241,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

21
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
View File

@ -28,18 +28,6 @@
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 {
@ -265,3 +253,12 @@
phy-handle = <&ethphy0>;
};
};
/* Connected to NEC uPD720200 USB 3.0 controller */
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-nsa310.dts
View File

@ -15,16 +15,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_unknown>;
@ -138,3 +128,11 @@
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-nsa320.dts
View File

@ -27,16 +27,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-names = "default";
@ -222,3 +212,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

17
arch/arm/boot/dts/kirkwood-nsa325.dts
View File

@ -28,16 +28,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-names = "default";
@ -236,3 +226,10 @@
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
View File

@ -4,16 +4,6 @@
/ {
model = "ZyXEL NSA310";
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
@ -157,3 +147,11 @@
reg = <0x5040000 0x2fc0000>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

14
arch/arm/boot/dts/kirkwood-openrd.dtsi
View File

@ -25,16 +25,6 @@
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>;
@ -125,3 +115,7 @@
reg = <0x0600000 0x1FA00000>;
};
};
&pcie0 {
status = "okay";
};

20
arch/arm/boot/dts/kirkwood-rd88f6192.dts
View File

@ -29,16 +29,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_usb_power>;
@ -108,4 +98,12 @@
ethernet0-port@0 {
phy-handle = <&ethphy0>;
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
View File

@ -25,16 +25,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-names = "default";
@ -134,3 +124,11 @@
duplex = <1>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

6
arch/arm/boot/dts/kirkwood-rs212.dts
View File

@ -44,6 +44,10 @@
status = "okay";
};
&pcie2 {
&pciec {
status = "okay";
};
&pcie1 {
status = "okay";
};

22
arch/arm/boot/dts/kirkwood-synology.dtsi
View File

@ -10,20 +10,6 @@
*/
/ {
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 {
@ -861,3 +847,11 @@
phy-handle = <&ethphy1>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-t5325.dts
View File

@ -30,16 +30,6 @@
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>;
@ -229,3 +219,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

12
arch/arm/boot/dts/kirkwood-ts219-6282.dts
View 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"; };

18
arch/arm/boot/dts/kirkwood-ts219.dtsi
View File

@ -12,16 +12,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
i2c@11000 {
status = "okay";
@ -105,3 +95,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

15
arch/arm/boot/dts/kirkwood-ts419-6282.dts
View File

@ -16,17 +16,8 @@
#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"; };