diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:38 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:38 +0000 |
| commit | a8c10d8f903682fb3dde82084665a9a72216b02e (patch) | |
| tree | c62a7fd987aaeef721141f541c4477b8427e22ea /target/linux/mvebu/patches-3.10/0032-arm-mvebu-enable-mini-PCIe-connectors-on-Armada-370-.patch | |
| parent | e84b7226b0a6713c4edbb8aab562413766eb64d0 (diff) | |
| download | upstream-a8c10d8f903682fb3dde82084665a9a72216b02e.tar.gz upstream-a8c10d8f903682fb3dde82084665a9a72216b02e.tar.bz2 upstream-a8c10d8f903682fb3dde82084665a9a72216b02e.zip | |
mvebu: backport mainline patches from kernel 3.11
This is a backport of the patches accepted to the Linux mainline related to
mvebu SoC (Armada XP and Armada 370) between Linux v3.10, and Linux v3.11.
This work mainly covers:
* Enabling USB storage, and PCI to mvebu_defconfig.
* Add support for NOR flash.
* Some PCI device tree related updates, and bus parsing.
* Adding Armada XP & 370 PCI driver, and update some clock gating
specifics.
* Introduce Marvell EBU Device Bus driver.
* Enaling USB in the armada*.dts.
* Enabling, and updating the mvebu-mbus.
* Some SATA and Ethernet related fixes.
Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com>
CC: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0032-arm-mvebu-enable-mini-PCIe-connectors-on-Armada-370-.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0032-arm-mvebu-enable-mini-PCIe-connectors-on-Armada-370-.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0032-arm-mvebu-enable-mini-PCIe-connectors-on-Armada-370-.patch b/target/linux/mvebu/patches-3.10/0032-arm-mvebu-enable-mini-PCIe-connectors-on-Armada-370-.patch new file mode 100644 index 0000000000..81ab352d9f --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0032-arm-mvebu-enable-mini-PCIe-connectors-on-Armada-370-.patch @@ -0,0 +1,42 @@ +From e552d168344e941a1781682207269dbfd27850b1 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Tue, 18 Jun 2013 15:37:41 +0200 +Subject: [PATCH 032/203] arm: mvebu: enable mini-PCIe connectors on Armada 370 + RD + +The Armada 370 RD board has two internal mini-PCIe connectors. This +commit adds the necessary Device Tree informations to enable the usage +of those mini-PCIe connectors. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Cc: Florian Fainelli <florian@openwrt.org> +Signed-off-by: Jason Cooper <jason@lakedaemon.net> +--- + arch/arm/boot/dts/armada-370-rd.dts | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +--- a/arch/arm/boot/dts/armada-370-rd.dts ++++ b/arch/arm/boot/dts/armada-370-rd.dts +@@ -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"; ++ }; ++ }; + }; + }; + }; |