69d323f231
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> SVN-Revision: 39564
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From f12aa05cbfb88e5541814ffa7be7e195471568bd Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Fri, 7 Dec 2012 20:35:20 +0100
|
|
Subject: [PATCH 007/203] clk: mvebu: create parent-child relation for PCIe
|
|
clocks on Armada 370
|
|
|
|
The Armada 370 has two gatable clocks for each PCIe interface, and we
|
|
want both of them to be enabled. We therefore make one of the two
|
|
clocks a child of the other, as we did for the sataX and sataXlnk
|
|
clocks on Armada XP.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Cc: Mike Turquette <mturquette@linaro.org>
|
|
---
|
|
drivers/clk/mvebu/clk-gating-ctrl.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/clk/mvebu/clk-gating-ctrl.c
|
|
+++ b/drivers/clk/mvebu/clk-gating-ctrl.c
|
|
@@ -119,8 +119,8 @@ static const struct mvebu_soc_descr __in
|
|
{ "pex1_en", NULL, 2 },
|
|
{ "ge1", NULL, 3 },
|
|
{ "ge0", NULL, 4 },
|
|
- { "pex0", NULL, 5 },
|
|
- { "pex1", NULL, 9 },
|
|
+ { "pex0", "pex0_en", 5 },
|
|
+ { "pex1", "pex1_en", 9 },
|
|
{ "sata0", NULL, 15 },
|
|
{ "sdio", NULL, 17 },
|
|
{ "tdm", NULL, 25 },
|