Patchwork [PATCHv10,5/9] clk: mvebu: create parent-child relation for PCIe clocks on Armada 370

login
register
mail settings
Submitter Thomas Petazzoni
Date May 16, 2013, 3:55 p.m.
Message ID <1368719725-21265-6-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/244384/
State Not Applicable
Headers show

Comments

Thomas Petazzoni - May 16, 2013, 3:55 p.m.
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(-)
Jason - May 19, 2013, 8:47 p.m.
On Thu, May 16, 2013 at 05:55:20PM +0200, Thomas Petazzoni wrote:
> 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(-)

Patches 5 - 8 applied to mvebu/pcie, with a dep on Sebastian's clock
rework and mvebu/of_pci.  Thanks for the head's up on the clk conflict.
My resolution should match yours.  Please let me know if it doesn't.

thx,

Jason.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jason - May 20, 2013, 6:02 p.m.
On Sun, May 19, 2013 at 04:47:03PM -0400, Jason Cooper wrote:
> On Thu, May 16, 2013 at 05:55:20PM +0200, Thomas Petazzoni wrote:
> > 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(-)
> 
> Patches 5 - 8 applied to mvebu/pcie, with a dep on Sebastian's clock
> rework and mvebu/of_pci.  Thanks for the head's up on the clk conflict.
> My resolution should match yours.  Please let me know if it doesn't.

As stated in the clk thread, I'm going to re-order this so pcie doesn't
depend on the clk series.

thx,

Jason.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/clk/mvebu/clk-gating-ctrl.c b/drivers/clk/mvebu/clk-gating-ctrl.c
index ebf141d..b35785a 100644
--- 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 __initconst armada_370_gating_descr[] = {
 	{ "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 },