mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 20:01:55 +00:00
mvebu dt changes for v3.11 (round 6)
- mvebu - mini-PCIe connectors on Armada 370 RD - kirkwood - correct internal register ranges translation -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQEcBAABAgAGBQJRxIGAAAoJEAi3KVZQDZAeOPQH/0lp/jZ2SGWWV9K/son9w+De /mAHe6jK0tlpSDJZATGN2+zTt8f74ElADVyxHdojsMZelzC3TTq12WLWpRD/fvAI lwCTVQnRwNzFX9x/rjEYv/RsbhlSSvv8lGn3OGm8Mw0B6BSikgHDsralGG0NfaQB mHoqL0lmE9BZnMuuHZrEu6S4Sp7fNombMgL7WmbAh1O1IDJpifBlu1Pa10LKo0/D cCZutG2FSqBLekTiCv3Uz7NovIGManHnezVUkxtyoeUohdKA8Q0U0dGpNcxl4dh2 ZJeU35n3EZBEWbHh4HPnZrtil/7okr6fDG9jI6s4OQVKy6glAq9KcF6v2UjSXnI= =APBh -----END PGP SIGNATURE----- Merge tag 'dt-3.11-6' of git://git.infradead.org/users/jcooper/linux into next/dt From Jason Cooper: mvebu dt changes for v3.11 (round 6) - mvebu - mini-PCIe connectors on Armada 370 RD - kirkwood - correct internal register ranges translation * tag 'dt-3.11-6' of git://git.infradead.org/users/jcooper/linux: ARM: Kirkwood: Fix the internal register ranges translation arm: mvebu: enable mini-PCIe connectors on Armada 370 RD Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
f7bea65be7
@ -85,6 +85,22 @@
|
||||
gpios = <&gpio0 6 1>;
|
||||
};
|
||||
};
|
||||
|
||||
pcie-controller {
|
||||
status = "okay";
|
||||
|
||||
/* Internal mini-PCIe connector */
|
||||
pcie@1,0 {
|
||||
/* Port 0, Lane 0 */
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
/* Internal mini-PCIe connector */
|
||||
pcie@2,0 {
|
||||
/* Port 1, Lane 0 */
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -30,7 +30,8 @@
|
||||
|
||||
ocp@f1000000 {
|
||||
compatible = "simple-bus";
|
||||
ranges = <0x00000000 0xf1000000 0x4000000
|
||||
ranges = <0x00000000 0xf1000000 0x0100000
|
||||
0xf4000000 0xf4000000 0x0000400
|
||||
0xf5000000 0xf5000000 0x0000400>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
@ -163,7 +164,7 @@
|
||||
ale = <1>;
|
||||
bank-width = <1>;
|
||||
compatible = "marvell,orion-nand";
|
||||
reg = <0x3000000 0x400>;
|
||||
reg = <0xf4000000 0x400>;
|
||||
chip-delay = <25>;
|
||||
/* set partition map and/or chip-delay in board dts */
|
||||
clocks = <&gate_clk 7>;
|
||||
|
Loading…
Reference in New Issue
Block a user