| Message ID | 1482316017-22154-3-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Stephen Boyd |
| Headers | show |
On 12/21, Thomas Petazzoni wrote: > This commit: > > - makes the GOP_DP (bit 9) gatable clock a child clock of the > SD_MMC_GOP (bit 18) clock, as it should have been. The clock for bit > 18 was just named SD_MMC, but since it also covers the GOP block, it > is renamed SD_MMC_GOP. > > - makes the MG (bit 5) gatable clock a child clock of the MG_CORE > clock (bit 6) > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- Applied to clk-next
Hello Stephen, On Wed, 21 Dec 2016 16:14:56 -0800, Stephen Boyd wrote: > On 12/21, Thomas Petazzoni wrote: > > This commit: > > > > - makes the GOP_DP (bit 9) gatable clock a child clock of the > > SD_MMC_GOP (bit 18) clock, as it should have been. The clock for bit > > 18 was just named SD_MMC, but since it also covers the GOP block, it > > is renamed SD_MMC_GOP. > > > > - makes the MG (bit 5) gatable clock a child clock of the MG_CORE > > clock (bit 6) > > > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > > --- > > Applied to clk-next I don't see my patch in clk-next at https://git.kernel.org/cgit/linux/kernel/git/clk/linux.git/log/drivers/clk/mvebu/cp110-system-controller.c?h=clk-next, nor in linux-next. Am I missing something? Thanks a lot, Thomas
On 02/14, Thomas Petazzoni wrote: > Hello Stephen, > > On Wed, 21 Dec 2016 16:14:56 -0800, Stephen Boyd wrote: > > On 12/21, Thomas Petazzoni wrote: > > > This commit: > > > > > > - makes the GOP_DP (bit 9) gatable clock a child clock of the > > > SD_MMC_GOP (bit 18) clock, as it should have been. The clock for bit > > > 18 was just named SD_MMC, but since it also covers the GOP block, it > > > is renamed SD_MMC_GOP. > > > > > > - makes the MG (bit 5) gatable clock a child clock of the MG_CORE > > > clock (bit 6) > > > > > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > > > --- > > > > Applied to clk-next > > I don't see my patch in clk-next at > https://git.kernel.org/cgit/linux/kernel/git/clk/linux.git/log/drivers/clk/mvebu/cp110-system-controller.c?h=clk-next, > nor in linux-next. Am I missing something? > Odd. I don't know what happened. I've applied it now.
Hello, On Tue, 14 Feb 2017 10:59:12 -0800, Stephen Boyd wrote: > > I don't see my patch in clk-next at > > https://git.kernel.org/cgit/linux/kernel/git/clk/linux.git/log/drivers/clk/mvebu/cp110-system-controller.c?h=clk-next, > > nor in linux-next. Am I missing something? > > Odd. I don't know what happened. I've applied it now. I think you also forgot to apply: [PATCHv2 1/3] dt-bindings: arm: update Armada CP110 system controller binding from the same series. You told me "Applied to clk-next", but I don't see it in linux-next. Thanks! Thomas
diff --git a/drivers/clk/mvebu/cp110-system-controller.c b/drivers/clk/mvebu/cp110-system-controller.c index f2303da..8038b93 100644 --- a/drivers/clk/mvebu/cp110-system-controller.c +++ b/drivers/clk/mvebu/cp110-system-controller.c @@ -64,8 +64,11 @@ enum { #define CP110_GATE_NAND 2 #define CP110_GATE_PPV2 3 #define CP110_GATE_SDIO 4 +#define CP110_GATE_MG 5 +#define CP110_GATE_MG_CORE 6 #define CP110_GATE_XOR1 7 #define CP110_GATE_XOR0 8 +#define CP110_GATE_GOP_DP 9 #define CP110_GATE_PCIE_X1_0 11 #define CP110_GATE_PCIE_X1_1 12 #define CP110_GATE_PCIE_X4 13 @@ -73,7 +76,7 @@ enum { #define CP110_GATE_SATA 15 #define CP110_GATE_SATA_USB 16 #define CP110_GATE_MAIN 17 -#define CP110_GATE_SDMMC 18 +#define CP110_GATE_SDMMC_GOP 18 #define CP110_GATE_SLOW_IO 21 #define CP110_GATE_USB3H0 22 #define CP110_GATE_USB3H1 23 @@ -302,6 +305,11 @@ static int cp110_syscon_clk_probe(struct platform_device *pdev) "gate-clock-output-names", CP110_GATE_MAIN, &parent); break; + case CP110_GATE_MG: + of_property_read_string_index(np, + "gate-clock-output-names", + CP110_GATE_MG_CORE, &parent); + break; case CP110_GATE_NAND: parent = nand_name; break; @@ -309,9 +317,10 @@ static int cp110_syscon_clk_probe(struct platform_device *pdev) parent = ppv2_name; break; case CP110_GATE_SDIO: + case CP110_GATE_GOP_DP: of_property_read_string_index(np, "gate-clock-output-names", - CP110_GATE_SDMMC, &parent); + CP110_GATE_SDMMC_GOP, &parent); break; case CP110_GATE_XOR1: case CP110_GATE_XOR0:
This commit: - makes the GOP_DP (bit 9) gatable clock a child clock of the SD_MMC_GOP (bit 18) clock, as it should have been. The clock for bit 18 was just named SD_MMC, but since it also covers the GOP block, it is renamed SD_MMC_GOP. - makes the MG (bit 5) gatable clock a child clock of the MG_CORE clock (bit 6) Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- drivers/clk/mvebu/cp110-system-controller.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)