Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ae608e1 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 6ec32400 00ed4a0b

arch/arm/boot/dts/armada-370.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
				wt-override;

			};



			mpic: interrupt-controller@20000 {

			interrupt-controller@20000 {

				reg = <0x20a00 0x1d0>, <0x21870 0x58>;

			};

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
	};



	soc {

		ranges = <0          0 0xd0000000 0x100000

			  0xf0000000 0 0xf0000000 0x8000000>;



		internal-regs {

			serial@12000 {

				clock-frequency = <250000000>;

arch/arm/boot/dts/armada-xp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
				wt-override;

			};



			mpic: interrupt-controller@20000 {

			interrupt-controller@20000 {

			      reg = <0x20a00 0x2d0>, <0x21070 0x58>;

			};

arch/arm/mach-kirkwood/ts219-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

arch/arm/plat-orion/include/plat/common.h

+1 −0
Original line number Diff line number Diff line
@@ -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;