diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-21 10:24:49 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-21 10:30:43 +0400 |
| commit | 4ae608e137a8b0e5a34a4f4c409f8468b4685df9 (patch) | |
| tree | bcf6d77bc52d5578a59bc3768677e07c0ff8f9db /arch/arm | |
| parent | 6ec3240047ee6a4b34f90d45e19ed179bc9b4a2e (diff) | |
| parent | 00ed4a0bd964555fe9276f2299564c384d50ae7d (diff) | |
| download | linux-4ae608e137a8b0e5a34a4f4c409f8468b4685df9.tar.xz | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/ts219-setup.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-orion/include/plat/common.h | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index b2c1b5af9749..0c9130b6fb80 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -43,7 +43,7 @@ wt-override; }; - mpic: interrupt-controller@20000 { + interrupt-controller@20000 { reg = <0x20a00 0x1d0>, <0x21870 0x58>; }; diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index f14d36c46159..46b785064dd8 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts @@ -27,6 +27,9 @@ }; soc { + ranges = <0 0 0xd0000000 0x100000 + 0xf0000000 0 0xf0000000 0x8000000>; + internal-regs { serial@12000 { clock-frequency = <250000000>; diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index bacab11c10dc..5b902f9a3af2 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -31,7 +31,7 @@ wt-override; }; - mpic: interrupt-controller@20000 { + interrupt-controller@20000 { reg = <0x20a00 0x2d0>, <0x21070 0x58>; }; diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c index 283abff90228..e1267d6b468f 100644 --- a/arch/arm/mach-kirkwood/ts219-setup.c +++ b/arch/arm/mach-kirkwood/ts219-setup.c @@ -124,7 +124,7 @@ static void __init qnap_ts219_init(void) static int __init ts219_pci_init(void) { if (machine_is_ts219()) - kirkwood_pcie_init(KW_PCIE0); + kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0); return 0; } diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h index e06fc5fefa14..d9a24f605a2b 100644 --- a/arch/arm/plat-orion/include/plat/common.h +++ b/arch/arm/plat-orion/include/plat/common.h @@ -10,6 +10,7 @@ #ifndef __PLAT_COMMON_H #include <linux/mv643xx_eth.h> +#include <linux/platform_data/usb-ehci-orion.h> struct dsa_platform_data; struct mv_sata_platform_data; |