Commit 323226bb authored by Olof Johansson's avatar Olof Johansson

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: default avatarOlof Johansson <olof@lixom.net>
parents cd3fc1b9 5f1f3d50
...@@ -39,8 +39,9 @@ memory { ...@@ -39,8 +39,9 @@ memory {
}; };
soc { soc {
ranges = <0 0 0xd0000000 0x100000 ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */
0xf0000000 0 0xf0000000 0x1000000>; 0xe0000000 0 0xe0000000 0x8100000 /* PCIe */
0xf0000000 0 0xf0000000 0x1000000 /* Device Bus, NOR 16MiB */>;
internal-regs { internal-regs {
serial@12000 { serial@12000 {
......
...@@ -27,8 +27,9 @@ memory { ...@@ -27,8 +27,9 @@ memory {
}; };
soc { soc {
ranges = <0 0 0xd0000000 0x100000 ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */
0xf0000000 0 0xf0000000 0x8000000>; 0xe0000000 0 0xe0000000 0x8100000 /* PCIe */
0xf0000000 0 0xf0000000 0x8000000 /* Device Bus, NOR 128MiB */>;
internal-regs { internal-regs {
serial@12000 { serial@12000 {
......
...@@ -22,9 +22,10 @@ static unsigned int __init kirkwood_variant(void) ...@@ -22,9 +22,10 @@ static unsigned int __init kirkwood_variant(void)
kirkwood_pcie_id(&dev, &rev); kirkwood_pcie_id(&dev, &rev);
if ((dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0) || if (dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0)
(dev == MV88F6282_DEV_ID))
return MPP_F6281_MASK; return MPP_F6281_MASK;
if (dev == MV88F6282_DEV_ID)
return MPP_F6282_MASK;
if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0) if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0)
return MPP_F6192_MASK; return MPP_F6192_MASK;
if (dev == MV88F6180_DEV_ID) if (dev == MV88F6180_DEV_ID)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment