[PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Magnus Damm]

From: Magnus Damm <damm+renesas@opensource.se>

Shmobile is all multiplatform these days, so get rid of the
reference to CONFIG_ARCH_SHMOBILE_MULTI. Also instead of always
enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and
MSTP depending on if they are included in the SoC or not.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---

 Changes since V1:
 - dropped DIV6 from R-Car Gen1 variants - thanks Geert!

 drivers/clk/Makefile          |    2 +-
 drivers/clk/shmobile/Makefile |   22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

--- 0001/drivers/clk/Makefile
+++ work/drivers/clk/Makefile	2015-08-26 16:39:50.052366518 +0900
@@ -66,7 +66,7 @@ obj-$(CONFIG_COMMON_CLK_PXA)		+= pxa/
 obj-$(CONFIG_COMMON_CLK_QCOM)		+= qcom/
 obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/
 obj-$(CONFIG_COMMON_CLK_SAMSUNG)	+= samsung/
-obj-$(CONFIG_ARCH_SHMOBILE_MULTI)	+= shmobile/
+obj-$(CONFIG_ARCH_SHMOBILE)		+= shmobile/
 obj-$(CONFIG_ARCH_SIRF)			+= sirf/
 obj-$(CONFIG_ARCH_SOCFPGA)		+= socfpga/
 obj-$(CONFIG_PLAT_SPEAR)		+= spear/
--- 0001/drivers/clk/shmobile/Makefile
+++ work/drivers/clk/shmobile/Makefile	2015-08-26 16:40:04.832366518 +0900
@@ -1,13 +1,11 @@
 obj-$(CONFIG_ARCH_EMEV2)		+= clk-emev2.o
-obj-$(CONFIG_ARCH_R7S72100)		+= clk-rz.o
-obj-$(CONFIG_ARCH_R8A73A4)		+= clk-r8a73a4.o
-obj-$(CONFIG_ARCH_R8A7740)		+= clk-r8a7740.o
-obj-$(CONFIG_ARCH_R8A7778)		+= clk-r8a7778.o
-obj-$(CONFIG_ARCH_R8A7779)		+= clk-r8a7779.o
-obj-$(CONFIG_ARCH_R8A7790)		+= clk-rcar-gen2.o
-obj-$(CONFIG_ARCH_R8A7791)		+= clk-rcar-gen2.o
-obj-$(CONFIG_ARCH_R8A7793)		+= clk-rcar-gen2.o
-obj-$(CONFIG_ARCH_R8A7794)		+= clk-rcar-gen2.o
-obj-$(CONFIG_ARCH_SH73A0)		+= clk-sh73a0.o
-obj-$(CONFIG_ARCH_SHMOBILE_MULTI)	+= clk-div6.o
-obj-$(CONFIG_ARCH_SHMOBILE_MULTI)	+= clk-mstp.o
+obj-$(CONFIG_ARCH_R7S72100)		+= clk-rz.o clk-mstp.o
+obj-$(CONFIG_ARCH_R8A73A4)		+= clk-r8a73a4.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7740)		+= clk-r8a7740.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7778)		+= clk-r8a7778.o clk-mstp.o
+obj-$(CONFIG_ARCH_R8A7779)		+= clk-r8a7779.o clk-mstp.o
+obj-$(CONFIG_ARCH_R8A7790)		+= clk-rcar-gen2.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7791)		+= clk-rcar-gen2.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7793)		+= clk-rcar-gen2.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7794)		+= clk-rcar-gen2.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_SH73A0)		+= clk-sh73a0.o clk-mstp.o clk-div6.o

Re: [PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Geert Uytterhoeven]

On Wed, Aug 26, 2015 at 9:43 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Shmobile is all multiplatform these days, so get rid of the
> reference to CONFIG_ARCH_SHMOBILE_MULTI. Also instead of always
> enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and
> MSTP depending on if they are included in the SoC or not.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>
>  Changes since V1:
>  - dropped DIV6 from R-Car Gen1 variants - thanks Geert!

BTW, you forgot to mention, but it's important for Mike and Stephen to
know that this should not be queued up in a branch that still has
ARCH_SHMOBILE_LEGACY.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Magnus Damm]

Hi Geert,

On Wed, Aug 26, 2015 at 4:48 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Wed, Aug 26, 2015 at 9:43 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
>> From: Magnus Damm <damm+renesas@opensource.se>
>>
>> Shmobile is all multiplatform these days, so get rid of the
>> reference to CONFIG_ARCH_SHMOBILE_MULTI. Also instead of always
>> enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and
>> MSTP depending on if they are included in the SoC or not.
>>
>> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
>> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> ---
>>
>>  Changes since V1:
>>  - dropped DIV6 from R-Car Gen1 variants - thanks Geert!
>
> BTW, you forgot to mention, but it's important for Mike and Stephen to
> know that this should not be queued up in a branch that still has
> ARCH_SHMOBILE_LEGACY.

Right, we need to sync with the mach-shmobile integration merge order
with stuff from Simon. I believe the remaining legacy cleanups are
targeted for v4.4. So merging this in v4.4 or later would be good.

Cheers,

/ magnus

Re: [PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Simon Horman]

On Wed, Aug 26, 2015 at 04:56:47PM +0900, Magnus Damm wrote:
> Hi Geert,
> 
> On Wed, Aug 26, 2015 at 4:48 PM, Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
> > On Wed, Aug 26, 2015 at 9:43 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
> >> From: Magnus Damm <damm+renesas@opensource.se>
> >>
> >> Shmobile is all multiplatform these days, so get rid of the
> >> reference to CONFIG_ARCH_SHMOBILE_MULTI. Also instead of always
> >> enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and
> >> MSTP depending on if they are included in the SoC or not.
> >>
> >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> >> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >> ---
> >>
> >>  Changes since V1:
> >>  - dropped DIV6 from R-Car Gen1 variants - thanks Geert!
> >
> > BTW, you forgot to mention, but it's important for Mike and Stephen to
> > know that this should not be queued up in a branch that still has
> > ARCH_SHMOBILE_LEGACY.
> 
> Right, we need to sync with the mach-shmobile integration merge order
> with stuff from Simon. I believe the remaining legacy cleanups are
> targeted for v4.4. So merging this in v4.4 or later would be good.

Yes, the remaining legacy cleanups are queued up in my renesas tree for
v4.4.

Re: [PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Magnus Damm]

Hi Geert,

On Wed, Aug 26, 2015 at 4:48 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Wed, Aug 26, 2015 at 9:43 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
>> From: Magnus Damm <damm+renesas@opensource.se>
>>
>> Shmobile is all multiplatform these days, so get rid of the
>> reference to CONFIG_ARCH_SHMOBILE_MULTI. Also instead of always
>> enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and
>> MSTP depending on if they are included in the SoC or not.
>>
>> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
>> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> ---
>>
>>  Changes since V1:
>>  - dropped DIV6 from R-Car Gen1 variants - thanks Geert!
>
> BTW, you forgot to mention, but it's important for Mike and Stephen to
> know that this should not be queued up in a branch that still has
> ARCH_SHMOBILE_LEGACY.

Allow me to clarify one thing.

Your comment is true for this older version of this patch, but newer
versions such as:
[PATCH v5 01/05] clk: shmobile: Rework CONFIG_ARCH_SHMOBILE_MULTI
and later versions do not have this dependency on ARCH_SHMOBILE_LEGACY cleanups.

So newer versions can be merged at any time without any special dependencies.

Thanks,

/ magnus

Re: [PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Geert Uytterhoeven]

Hi Magnus,

On Wed, Sep 2, 2015 at 8:52 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
> On Wed, Aug 26, 2015 at 4:48 PM, Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
>> On Wed, Aug 26, 2015 at 9:43 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
>>> From: Magnus Damm <damm+renesas@opensource.se>
>>>
>>> Shmobile is all multiplatform these days, so get rid of the
>>> reference to CONFIG_ARCH_SHMOBILE_MULTI. Also instead of always
>>> enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and
>>> MSTP depending on if they are included in the SoC or not.
>>>
>>> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
>>> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
>>> ---
>>>
>>>  Changes since V1:
>>>  - dropped DIV6 from R-Car Gen1 variants - thanks Geert!
>>
>> BTW, you forgot to mention, but it's important for Mike and Stephen to
>> know that this should not be queued up in a branch that still has
>> ARCH_SHMOBILE_LEGACY.
>
> Allow me to clarify one thing.
>
> Your comment is true for this older version of this patch, but newer
> versions such as:
> [PATCH v5 01/05] clk: shmobile: Rework CONFIG_ARCH_SHMOBILE_MULTI
> and later versions do not have this dependency on ARCH_SHMOBILE_LEGACY cleanups.
>
> So newer versions can be merged at any time without any special dependencies.

That's correct, as they don't get rid of CONFIG_ARCH_SHMOBILE_MULTI in
drivers/clk/Makefile...

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Geert Uytterhoeven]

On Wed, Aug 26, 2015 at 9:43 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Shmobile is all multiplatform these days, so get rid of the
> reference to CONFIG_ARCH_SHMOBILE_MULTI. Also instead of always
> enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and
> MSTP depending on if they are included in the SoC or not.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

BTW, the symbol name in the subject lacks an "ARCH_" infix.

Too many replies to the same patch, time for coffee...

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Magnus Damm]

On Wed, Aug 26, 2015 at 4:55 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Wed, Aug 26, 2015 at 9:43 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
>> From: Magnus Damm <damm+renesas@opensource.se>
>>
>> Shmobile is all multiplatform these days, so get rid of the
>> reference to CONFIG_ARCH_SHMOBILE_MULTI. Also instead of always
>> enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and
>> MSTP depending on if they are included in the SoC or not.
>>
>> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
>> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> BTW, the symbol name in the subject lacks an "ARCH_" infix.
>
> Too many replies to the same patch, time for coffee...

Ouch, that's for V3 then...

Thanks,

/ magnus