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

mvebu DT fixes for v3.15 (incremental #2)

Browse Source 
- kirkwood: fix mis-located pcie controller nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTa5VOAAoJEP45WPkGe8ZnwmYP/jou+y52USypPyZq5/+0L4cK
 2bInB+3mNs5NZEdaPxh70xhJMvTbusNvOCOdWpEJVuV5as4kOWba3ThS96c6kY8j
 94UStQAYS18iWORcOI81ZbjYufxvNicmoYqyq68psJ5QWQG/vc9D/N7px5HvkEhg
 jcNvfyjmZb44c2gsS5UsbKlycJ5MwRqczgA7R/ik3Q4CdCuN6E7xgvu4RdPbRPFm
 HvblNijM+0PAslREMy9qi+SFMRazlUmha8VGpWiVHRUZww3HnJ2owNAMkBKfp6ia
 9yv2V2y47Eb+khPEvrmEi5+CkjVaFqhA4G00a+VCwnLWPwK14wV/GKvR7tUwpChK
 O36zdDzZ6w2vWZNIBBLxz0EueLSoa8bUpCJdhrnEFxG2a+xop3JE9A0MU8ewfAEQ
 oMOy79/DC1vn+k9qJsxMPxpt9dNn7uCILRd7mqMkKst9Gp9jjZu9tloCz5qcdO/n
 T8odPQ8XqlWn4Y3vC24qyhZOXrAfTJWUSccNBRyipvvpYrV9/Lcg7u51uNigfaKE
 Z6Q32feKFLuE5o5E2j4HCVpJKVTKi2GQend0cDOGctEofvFDkjuP1Eg4CzmLhJr7
 ioyqpfCtlia/DCbsII/pCOHXX4iI2gsB+EFsidF+20dfSDo9n8jJULVpq3xRwy/6
 ytH0F6R5ijIupaF5BzXv
 =Twky
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu into fixes

Merge 'ARM: mvebu: DT fixes for v3.15 (incr #2)' from Jason Cooper:

mvebu DT fixes for v3.15 (incremental #2)

 - kirkwood: fix mis-located pcie controller nodes

* tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood: fix mislocated pcie-controller nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-05-10 20:22:29 -07:00
commit e5e49fe9df
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,16 @@
bootargs = "console=ttyS0,115200n8 earlyprintk";
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl@10000 {
pmx_usb_led: pmx-usb-led {
@ -73,14 +83,6 @@
ehci@50000 {
status = "okay";
};
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
gpio-leds {

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

@ -4,6 +4,16 @@
/ {
model = "ZyXEL NSA310";
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
@ -26,14 +36,6 @@
status = "okay";
nr-ports = <2>;
};
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
gpio_poweroff {