shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'dt-3.11-6' of git://git.infradead.org/users/jcooper/linux into next/dt

Browse Source 
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:
Arnd Bergmann
2013-06-21 19:54:13 +02:00
parent 7aaa1e8c5e 01db527e65
commit f7bea65be7
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/boot/dts/armada-370-rd.dts
View File

@@ -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";
};
};
};
};
};

5
arch/arm/boot/dts/kirkwood.dtsi
View File

@@ -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>;