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
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 5006da299ae65cadf92932f2f7b062b5a8c65798 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Fri, 18 Jan 2013 16:42:01 +0100
|
|
Subject: [PATCH 008/203] clk: mvebu: add more PCIe clocks for Armada XP
|
|
|
|
The current revision of the datasheet only mentions the gatable clocks
|
|
for the PCIe 0.0, 0.1, 0.2 and 0.3 interfaces, and forgot to mention
|
|
the ones for the PCIe 1.0, 1.1, 1.2, 1.3, 2.0 and 3.0
|
|
interfaces. After confirmation with Marvell engineers, this patch adds
|
|
the missing gatable clocks for those PCIe interfaces.
|
|
|
|
It also changes the name of the previously existing PCIe gatable
|
|
clocks, in order to match the naming using the datasheets.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Cc: Mike Turquette <mturquette@linaro.org>
|
|
---
|
|
drivers/clk/mvebu/clk-gating-ctrl.c | 14 ++++++++++----
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/clk/mvebu/clk-gating-ctrl.c
|
|
+++ b/drivers/clk/mvebu/clk-gating-ctrl.c
|
|
@@ -137,10 +137,14 @@ static const struct mvebu_soc_descr __in
|
|
{ "ge2", NULL, 2 },
|
|
{ "ge1", NULL, 3 },
|
|
{ "ge0", NULL, 4 },
|
|
- { "pex0", NULL, 5 },
|
|
- { "pex1", NULL, 6 },
|
|
- { "pex2", NULL, 7 },
|
|
- { "pex3", NULL, 8 },
|
|
+ { "pex00", NULL, 5 },
|
|
+ { "pex01", NULL, 6 },
|
|
+ { "pex02", NULL, 7 },
|
|
+ { "pex03", NULL, 8 },
|
|
+ { "pex10", NULL, 9 },
|
|
+ { "pex11", NULL, 10 },
|
|
+ { "pex12", NULL, 11 },
|
|
+ { "pex13", NULL, 12 },
|
|
{ "bp", NULL, 13 },
|
|
{ "sata0lnk", NULL, 14 },
|
|
{ "sata0", "sata0lnk", 15 },
|
|
@@ -152,6 +156,8 @@ static const struct mvebu_soc_descr __in
|
|
{ "xor0", NULL, 22 },
|
|
{ "crypto", NULL, 23 },
|
|
{ "tdm", NULL, 25 },
|
|
+ { "pex20", NULL, 26 },
|
|
+ { "pex30", NULL, 27 },
|
|
{ "xor1", NULL, 28 },
|
|
{ "sata1lnk", NULL, 29 },
|
|
{ "sata1", "sata1lnk", 30 },
|