mvebu fixes for v3.10 round 1

- mvebu
     - duplicate alias removal
     - augment new internal-regs dt node with proper ranges node
 
  - kirkwood
     - stable fix for QNAP TS-11x/TS-21x enabling PCIe port 1
 
  - plat-orion
     - missing ehci include in common.h.  needed within common.h.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJRkRSIAAoJEAi3KVZQDZAemuwH+weyabb2kl3203svdG2E6pRF
 h2Znj97zpZTgMLi96Onn7cN6A6xTCix4CCbjV91RhZWvWFkyw2/G73SZioo4tH7R
 Z2qgAfpk1OHF6XPiM2EeecG2ZdIbr9zoQtQHFRclRk+K7vvBa+osmuFZ6mleq5Hj
 ssLPP6oG/5gx58r0mbgIV6nrErGmN5VD3JJr/KnqQbMxZpD1/7EBlmwyD/ik7Fi7
 rnynDNZp7+LK72O1faSdUqij+YsuXE9uoZkN5Vd77ZKtxC+iHuhpJP1RPoyoy+pN
 Wr0k+3XV5Nmmp72Uq5vJqHwqblvhE1ylui5LqjLnyx+Yyxurl4zrPWJIXAQBnn0=
 =3wrv
 -----END PGP SIGNATURE-----

Merge tag 'fixes-3.10-1' of git://git.infradead.org/users/jcooper/linux into fixes

From Jason Cooper, mvebu fixes for v3.10:
 - mvebu
    - duplicate alias removal
    - augment new internal-regs dt node with proper ranges node
 - kirkwood
    - stable fix for QNAP TS-11x/TS-21x enabling PCIe port 1
 - plat-orion
    - missing ehci include in common.h.  needed within common.h.

* tag 'fixes-3.10-1' of git://git.infradead.org/users/jcooper/linux:
  ARM: mvebu: Add a ranges entry to translate devbus childs
  ARM: plat-orion: add missing ehci include to common.h
  Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
  ARM: mvebu: do not duplicate the mpic alias

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-05-20 23:24:49 -07:00
commit 4ae608e137
5 changed files with 7 additions and 3 deletions

View File

@ -43,7 +43,7 @@
wt-override; wt-override;
}; };
mpic: interrupt-controller@20000 { interrupt-controller@20000 {
reg = <0x20a00 0x1d0>, <0x21870 0x58>; reg = <0x20a00 0x1d0>, <0x21870 0x58>;
}; };

View File

@ -27,6 +27,9 @@
}; };
soc { soc {
ranges = <0 0 0xd0000000 0x100000
0xf0000000 0 0xf0000000 0x8000000>;
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <250000000>; clock-frequency = <250000000>;

View File

@ -31,7 +31,7 @@
wt-override; wt-override;
}; };
mpic: interrupt-controller@20000 { interrupt-controller@20000 {
reg = <0x20a00 0x2d0>, <0x21070 0x58>; reg = <0x20a00 0x2d0>, <0x21070 0x58>;
}; };

View File

@ -124,7 +124,7 @@ static void __init qnap_ts219_init(void)
static int __init ts219_pci_init(void) static int __init ts219_pci_init(void)
{ {
if (machine_is_ts219()) if (machine_is_ts219())
kirkwood_pcie_init(KW_PCIE0); kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0);
return 0; return 0;
} }

View File

@ -10,6 +10,7 @@
#ifndef __PLAT_COMMON_H #ifndef __PLAT_COMMON_H
#include <linux/mv643xx_eth.h> #include <linux/mv643xx_eth.h>
#include <linux/platform_data/usb-ehci-orion.h>
struct dsa_platform_data; struct dsa_platform_data;
struct mv_sata_platform_data; struct mv_sata_platform_data;