diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-11 20:01:01 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-11 20:05:56 -0400 |
| commit | 323226bbb3d865af12644d66df2b7f161adf51c7 (patch) | |
| tree | 2f0b676c65927d9f798100690e70b3a52d57d313 | |
| parent | cd3fc1b9a34e535a8acbead7461475fbc43bdd49 (diff) | |
| parent | 5f1f3d5088316f827591764aa6a5e7161eb514bd (diff) | |
Merge tag 'fixes-3.10-4' of git://git.infradead.org/users/jcooper/linux into fixes
From Jason Cooper, mvebu fixes for v3.10 round 4:
- mvebu
- fix PCIe ranges property so NOR flash is visible
- kirkwood
- fix identification of 88f6282 so MPPs can be set correctly
* tag 'fixes-3.10-4' of git://git.infradead.org/users/jcooper/linux:
arm: mvebu: armada-xp-{gp,openblocks-ax3-4}: specify PCIe range
ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-gp.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 5 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/mpp.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts index 3ee63d128e27..76db557adbe7 100644 --- a/arch/arm/boot/dts/armada-xp-gp.dts +++ b/arch/arm/boot/dts/armada-xp-gp.dts | |||
| @@ -39,8 +39,9 @@ | |||
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | soc { | 41 | soc { |
| 42 | ranges = <0 0 0xd0000000 0x100000 | 42 | ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */ |
| 43 | 0xf0000000 0 0xf0000000 0x1000000>; | 43 | 0xe0000000 0 0xe0000000 0x8100000 /* PCIe */ |
| 44 | 0xf0000000 0 0xf0000000 0x1000000 /* Device Bus, NOR 16MiB */>; | ||
| 44 | 45 | ||
| 45 | internal-regs { | 46 | internal-regs { |
| 46 | serial@12000 { | 47 | serial@12000 { |
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 46b785064dd8..fdea75c73411 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | |||
| @@ -27,8 +27,9 @@ | |||
| 27 | }; | 27 | }; |
| 28 | 28 | ||
| 29 | soc { | 29 | soc { |
| 30 | ranges = <0 0 0xd0000000 0x100000 | 30 | ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */ |
| 31 | 0xf0000000 0 0xf0000000 0x8000000>; | 31 | 0xe0000000 0 0xe0000000 0x8100000 /* PCIe */ |
| 32 | 0xf0000000 0 0xf0000000 0x8000000 /* Device Bus, NOR 128MiB */>; | ||
| 32 | 33 | ||
| 33 | internal-regs { | 34 | internal-regs { |
| 34 | serial@12000 { | 35 | serial@12000 { |
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c index 827cde42414f..e96fd71abd76 100644 --- a/arch/arm/mach-kirkwood/mpp.c +++ b/arch/arm/mach-kirkwood/mpp.c | |||
| @@ -22,9 +22,10 @@ static unsigned int __init kirkwood_variant(void) | |||
| 22 | 22 | ||
| 23 | kirkwood_pcie_id(&dev, &rev); | 23 | kirkwood_pcie_id(&dev, &rev); |
| 24 | 24 | ||
| 25 | if ((dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0) || | 25 | if (dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0) |
| 26 | (dev == MV88F6282_DEV_ID)) | ||
| 27 | return MPP_F6281_MASK; | 26 | return MPP_F6281_MASK; |
| 27 | if (dev == MV88F6282_DEV_ID) | ||
| 28 | return MPP_F6282_MASK; | ||
| 28 | if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0) | 29 | if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0) |
| 29 | return MPP_F6192_MASK; | 30 | return MPP_F6192_MASK; |
| 30 | if (dev == MV88F6180_DEV_ID) | 31 | if (dev == MV88F6180_DEV_ID) |