diff mbox

[1/2] clk: samsung: exynos5422: add missing parent GSCL block clocks

Message ID 1449582415-30164-1-git-send-email-m.szyprowski@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Marek Szyprowski Dec. 8, 2015, 1:46 p.m. UTC
This patch adds clocks, which are required for preserving parent clock
configuration on GSCL power domain on/off.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 drivers/clk/samsung/clk-exynos5420.c   | 8 ++++----
 include/dt-bindings/clock/exynos5420.h | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

Comments

Krzysztof Kozlowski Dec. 9, 2015, 4:49 a.m. UTC | #1
On 08.12.2015 22:46, Marek Szyprowski wrote:
> This patch adds clocks, which are required for preserving parent clock
> configuration on GSCL power domain on/off.
> 
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>  drivers/clk/samsung/clk-exynos5420.c   | 8 ++++----
>  include/dt-bindings/clock/exynos5420.h | 2 ++
>  2 files changed, 6 insertions(+), 4 deletions(-)

I suppose that, with ack from clock folks, this can go through samsung-soc?

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Adding Stephen and linux-clk at Cc.

On 09/12/15 05:49, Krzysztof Kozlowski wrote:
> On 08.12.2015 22:46, Marek Szyprowski wrote:
>> > This patch adds clocks, which are required for preserving parent clock
>> > configuration on GSCL power domain on/off.
>> > 
>> > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>> > ---
>> >  drivers/clk/samsung/clk-exynos5420.c   | 8 ++++----
>> >  include/dt-bindings/clock/exynos5420.h | 2 ++
>> >  2 files changed, 6 insertions(+), 4 deletions(-)
>
> I suppose that, with ack from clock folks, this can go through samsung-soc?

I guess it makes more sense that making a stable branch with just
this patch to be pulled into arm-soc and clk tree. I'm fine with
applying this patch through arm-soc, but I think we also need
Mike's or Stephen ack for this.

Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Krzysztof Kozlowski Dec. 9, 2015, 1:36 p.m. UTC | #3
W dniu 09.12.2015 o 19:14, Sylwester Nawrocki pisze:
> Adding Stephen and linux-clk at Cc.
> 
> On 09/12/15 05:49, Krzysztof Kozlowski wrote:
>> On 08.12.2015 22:46, Marek Szyprowski wrote:
>>>> This patch adds clocks, which are required for preserving parent clock
>>>> configuration on GSCL power domain on/off.
>>>>
>>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>>>> ---
>>>>  drivers/clk/samsung/clk-exynos5420.c   | 8 ++++----
>>>>  include/dt-bindings/clock/exynos5420.h | 2 ++
>>>>  2 files changed, 6 insertions(+), 4 deletions(-)
>>
>> I suppose that, with ack from clock folks, this can go through samsung-soc?
> 
> I guess it makes more sense that making a stable branch with just
> this patch to be pulled into arm-soc and clk tree. I'm fine with
> applying this patch through arm-soc, but I think we also need
> Mike's or Stephen ack for this.
> 
> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

I am fine with the branch approach (actually in such cases I make them
anyway just in case).

As you suggested I'll wait for Mike's or Stepen's acks.

BR,
Krzysztof

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski Dec. 17, 2015, 12:58 a.m. UTC | #4
On 17.12.2015 02:23, Sylwester Nawrocki wrote:
> Krzysztof,
> 
> On 09/12/15 14:36, Krzysztof Kozlowski wrote:
>> W dniu 09.12.2015 o 19:14, Sylwester Nawrocki pisze:
>>>> Adding Stephen and linux-clk at Cc.
>>>>
>>>> On 09/12/15 05:49, Krzysztof Kozlowski wrote:
>>>>>> On 08.12.2015 22:46, Marek Szyprowski wrote:
>>>>>>>>>> This patch adds clocks, which are required for preserving parent clock
>>>>>>>>>> configuration on GSCL power domain on/off.
>>>>>>>>>>
>>>>>>>>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>>>>>>>>>> ---
>>>>>>>>>>  drivers/clk/samsung/clk-exynos5420.c   | 8 ++++----
>>>>>>>>>>  include/dt-bindings/clock/exynos5420.h | 2 ++
>>>>>>>>>>  2 files changed, 6 insertions(+), 4 deletions(-)
>>>>>>
>>>>>> I suppose that, with ack from clock folks, this can go through samsung-soc?
>>>>
>>>> I guess it makes more sense that making a stable branch with just
>>>> this patch to be pulled into arm-soc and clk tree. I'm fine with
>>>> applying this patch through arm-soc, but I think we also need
>>>> Mike's or Stephen ack for this.
>>>>
>>>> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>>
>> I am fine with the branch approach (actually in such cases I make them
>> anyway just in case).
>>
>> As you suggested I'll wait for Mike's or Stepen's acks.
> 
> I've put the $subject patch and the other exynos5420 patch which 
> was a dependency for dts patches (both touching include/dt-bindings/
> clock/exynos5420.h) onto a stable branch. Below are details if 
> you need to pull.

Great! Thanks Sylwester.
BR,
Krzysztof


> 
> 
> The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e27864353c89:
> 
>   Linux 4.4-rc5 (2015-12-13 17:42:58 -0800)
> 
> are available in the git repository at:
> 
>   git://linuxtv.org/snawrocki/samsung.git tags/for-4.5-clk-exynos5420
> 
> for you to fetch changes up to bee4f87f01dc30fcf9e05eb55b833f89fd9bb4f4:
> 
>   clk: samsung: exynos5420: add cpu clock configuration data and instantiate cpu clock (2015-12-16 16:35:26 +0100)
> 
> ----------------------------------------------------------------
> Samsung exynos5420 SoC clk subsystem support updates:
> instantiation of the cpu clocks and addition of the GSCL
> IP parent clocks to the list of available consumer clocks.
> 
> ----------------------------------------------------------------
> Marek Szyprowski (1):
>       clk: samsung: exynos542x: add missing parent GSCL block clocks
> 
> Thomas Abraham (1):
>       clk: samsung: exynos5420: add cpu clock configuration data and instantiate cpu clock
> 
>  drivers/clk/samsung/clk-exynos5420.c   |   66 +++++++++++++++++++++++++++++---
>  include/dt-bindings/clock/exynos5420.h |    4 ++
>  2 files changed, 64 insertions(+), 6 deletions(-)
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Michael Turquette Dec. 22, 2015, 6:44 p.m. UTC | #5
On 12/17, Krzysztof Kozlowski wrote:
> On 17.12.2015 02:23, Sylwester Nawrocki wrote:
> > Krzysztof,
> > 
> > On 09/12/15 14:36, Krzysztof Kozlowski wrote:
> >> W dniu 09.12.2015 o 19:14, Sylwester Nawrocki pisze:
> >>>> Adding Stephen and linux-clk at Cc.
> >>>>
> >>>> On 09/12/15 05:49, Krzysztof Kozlowski wrote:
> >>>>>> On 08.12.2015 22:46, Marek Szyprowski wrote:
> >>>>>>>>>> This patch adds clocks, which are required for preserving parent clock
> >>>>>>>>>> configuration on GSCL power domain on/off.
> >>>>>>>>>>
> >>>>>>>>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> >>>>>>>>>> ---
> >>>>>>>>>>  drivers/clk/samsung/clk-exynos5420.c   | 8 ++++----
> >>>>>>>>>>  include/dt-bindings/clock/exynos5420.h | 2 ++
> >>>>>>>>>>  2 files changed, 6 insertions(+), 4 deletions(-)
> >>>>>>
> >>>>>> I suppose that, with ack from clock folks, this can go through samsung-soc?
> >>>>
> >>>> I guess it makes more sense that making a stable branch with just
> >>>> this patch to be pulled into arm-soc and clk tree. I'm fine with
> >>>> applying this patch through arm-soc, but I think we also need
> >>>> Mike's or Stephen ack for this.
> >>>>
> >>>> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >>
> >> I am fine with the branch approach (actually in such cases I make them
> >> anyway just in case).
> >>
> >> As you suggested I'll wait for Mike's or Stepen's acks.
> > 
> > I've put the $subject patch and the other exynos5420 patch which 
> > was a dependency for dts patches (both touching include/dt-bindings/
> > clock/exynos5420.h) onto a stable branch. Below are details if 
> > you need to pull.

This is superseded by the pull request found in Message-ID:
<5671A456.9030203@samsung.com>, correct?

Thanks,
Mike

> 
> Great! Thanks Sylwester.
> BR,
> Krzysztof
> 
> 
> > 
> > 
> > The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e27864353c89:
> > 
> >   Linux 4.4-rc5 (2015-12-13 17:42:58 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://linuxtv.org/snawrocki/samsung.git tags/for-4.5-clk-exynos5420
> > 
> > for you to fetch changes up to bee4f87f01dc30fcf9e05eb55b833f89fd9bb4f4:
> > 
> >   clk: samsung: exynos5420: add cpu clock configuration data and instantiate cpu clock (2015-12-16 16:35:26 +0100)
> > 
> > ----------------------------------------------------------------
> > Samsung exynos5420 SoC clk subsystem support updates:
> > instantiation of the cpu clocks and addition of the GSCL
> > IP parent clocks to the list of available consumer clocks.
> > 
> > ----------------------------------------------------------------
> > Marek Szyprowski (1):
> >       clk: samsung: exynos542x: add missing parent GSCL block clocks
> > 
> > Thomas Abraham (1):
> >       clk: samsung: exynos5420: add cpu clock configuration data and instantiate cpu clock
> > 
> >  drivers/clk/samsung/clk-exynos5420.c   |   66 +++++++++++++++++++++++++++++---
> >  include/dt-bindings/clock/exynos5420.h |    4 ++
> >  2 files changed, 64 insertions(+), 6 deletions(-)
> > 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mike,

On 22/12/15 19:44, Mike Turquette wrote:
> This is superseded by the pull request found in Message-ID:
> <5671A456.9030203@samsung.com>, correct?

The two pull requests are based on same branch, first 2 commits are
tagged with for-4.5-clk-exynos5420 tag and the whole branch is tagged
as clk-samsung-4.5. I assumed it's fine to use just the below tag for
arm-soc.

>>> > > The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e27864353c89:
>>> > > 
>>> > >   Linux 4.4-rc5 (2015-12-13 17:42:58 -0800)
>>> > > 
>>> > > are available in the git repository at:
>>> > > 
>>> > >   git://linuxtv.org/snawrocki/samsung.git tags/for-4.5-clk-exynos5420
>>> > > 
>>> > > for you to fetch changes up to bee4f87f01dc30fcf9e05eb55b833f89fd9bb4f4:
>>> > > 
>>> > >   clk: samsung: exynos5420: add cpu clock configuration data and instantiate cpu clock (2015-12-16 16:35:26 +0100)
>>> > > 
>>> > > ----------------------------------------------------------------
>>> > > Samsung exynos5420 SoC clk subsystem support updates:
>>> > > instantiation of the cpu clocks and addition of the GSCL
>>> > > IP parent clocks to the list of available consumer clocks.
>>> > > 
>>> > > ----------------------------------------------------------------
>>> > > Marek Szyprowski (1):
>>> > >       clk: samsung: exynos542x: add missing parent GSCL block clocks
>>> > > 
>>> > > Thomas Abraham (1):
>>> > >       clk: samsung: exynos5420: add cpu clock configuration data and instantiate cpu clock
>>> > > 
>>> > >  drivers/clk/samsung/clk-exynos5420.c   |   66 +++++++++++++++++++++++++++++---
>>> > >  include/dt-bindings/clock/exynos5420.h |    4 ++
>>> > >  2 files changed, 64 insertions(+), 6 deletions(-)

--
Regards,
Sylwester

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Michael Turquette Dec. 22, 2015, 8:45 p.m. UTC | #7
On 12/22, Sylwester Nawrocki wrote:
> Mike,
> 
> On 22/12/15 19:44, Mike Turquette wrote:
> > This is superseded by the pull request found in Message-ID:
> > <5671A456.9030203@samsung.com>, correct?
> 
> The two pull requests are based on same branch, first 2 commits are
> tagged with for-4.5-clk-exynos5420 tag and the whole branch is tagged
> as clk-samsung-4.5. I assumed it's fine to use just the below tag for
> arm-soc.

OK, I'll interpret that as a "yes".

Thanks,
Mike

> 
> >>> > > The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e27864353c89:
> >>> > > 
> >>> > >   Linux 4.4-rc5 (2015-12-13 17:42:58 -0800)
> >>> > > 
> >>> > > are available in the git repository at:
> >>> > > 
> >>> > >   git://linuxtv.org/snawrocki/samsung.git tags/for-4.5-clk-exynos5420
> >>> > > 
> >>> > > for you to fetch changes up to bee4f87f01dc30fcf9e05eb55b833f89fd9bb4f4:
> >>> > > 
> >>> > >   clk: samsung: exynos5420: add cpu clock configuration data and instantiate cpu clock (2015-12-16 16:35:26 +0100)
> >>> > > 
> >>> > > ----------------------------------------------------------------
> >>> > > Samsung exynos5420 SoC clk subsystem support updates:
> >>> > > instantiation of the cpu clocks and addition of the GSCL
> >>> > > IP parent clocks to the list of available consumer clocks.
> >>> > > 
> >>> > > ----------------------------------------------------------------
> >>> > > Marek Szyprowski (1):
> >>> > >       clk: samsung: exynos542x: add missing parent GSCL block clocks
> >>> > > 
> >>> > > Thomas Abraham (1):
> >>> > >       clk: samsung: exynos5420: add cpu clock configuration data and instantiate cpu clock
> >>> > > 
> >>> > >  drivers/clk/samsung/clk-exynos5420.c   |   66 +++++++++++++++++++++++++++++---
> >>> > >  include/dt-bindings/clock/exynos5420.h |    4 ++
> >>> > >  2 files changed, 64 insertions(+), 6 deletions(-)
> 
> --
> Regards,
> Sylwester
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 389af3c..4bae2e3 100644
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -677,8 +677,8 @@  static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
 			SRC_TOP5, 20, 1),
 	MUX(CLK_MOUT_USER_ACLK300_DISP1, "mout_user_aclk300_disp1",
 			mout_user_aclk300_disp1_p, SRC_TOP5, 24, 1),
-	MUX(0, "mout_user_aclk300_gscl", mout_user_aclk300_gscl_p,
-			SRC_TOP5, 28, 1),
+	MUX(CLK_MOUT_USER_ACLK300_GSCL, "mout_user_aclk300_gscl",
+			mout_user_aclk300_gscl_p, SRC_TOP5, 28, 1),
 
 	MUX(0, "mout_sclk_mpll", mout_mpll_p, SRC_TOP6, 0, 1),
 	MUX(CLK_MOUT_VPLL, "mout_sclk_vpll", mout_vpll_p, SRC_TOP6, 4, 1),
@@ -729,8 +729,8 @@  static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
 			SRC_TOP12, 20, 1),
 	MUX(CLK_MOUT_SW_ACLK300, "mout_sw_aclk300_disp1",
 			mout_sw_aclk300_disp1_p, SRC_TOP12, 24, 1),
-	MUX(0, "mout_sw_aclk300_gscl", mout_sw_aclk300_gscl_p,
-			SRC_TOP12, 28, 1),
+	MUX(CLK_MOUT_SW_ACLK300_GSCL, "mout_sw_aclk300_gscl",
+			mout_sw_aclk300_gscl_p, SRC_TOP12, 28, 1),
 
 	/* DISP1 Block */
 	MUX(0, "mout_mipi1", mout_group2_p, SRC_DISP10, 16, 3),
diff --git a/include/dt-bindings/clock/exynos5420.h b/include/dt-bindings/clock/exynos5420.h
index 99da0d1..b5af23a 100644
--- a/include/dt-bindings/clock/exynos5420.h
+++ b/include/dt-bindings/clock/exynos5420.h
@@ -210,6 +210,8 @@ 
 #define CLK_MOUT_SW_ACLK300     649
 #define CLK_MOUT_USER_ACLK400_DISP1     650
 #define CLK_MOUT_SW_ACLK400     651
+#define CLK_MOUT_USER_ACLK300_GSCL	652
+#define CLK_MOUT_SW_ACLK300_GSCL	653
 
 /* divider clocks */
 #define CLK_DOUT_PIXEL		768