[PATCH] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[PATCH] 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>
---

 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 15:18:22.852366518 +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 15:16:57.742366518 +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 clk-div6.o
+obj-$(CONFIG_ARCH_R8A7779)		+= clk-r8a7779.o clk-mstp.o clk-div6.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] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Geert Uytterhoeven]

Hi Magnus,

On Wed, Aug 26, 2015 at 8:33 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>

> --- 0001/drivers/clk/shmobile/Makefile
> +++ work/drivers/clk/shmobile/Makefile  2015-08-26 15:16:57.742366518 +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 clk-div6.o
> +obj-$(CONFIG_ARCH_R8A7779)             += clk-r8a7779.o clk-mstp.o clk-div6.o

R-Car Gen1 doesn't have div6 clocks.

If you fix that,
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

> +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

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] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

[Magnus Damm]

Hi Geert,

On Wed, Aug 26, 2015 at 4:25 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> Hi Magnus,
>
> On Wed, Aug 26, 2015 at 8:33 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>
>
>> --- 0001/drivers/clk/shmobile/Makefile
>> +++ work/drivers/clk/shmobile/Makefile  2015-08-26 15:16:57.742366518 +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 clk-div6.o
>> +obj-$(CONFIG_ARCH_R8A7779)             += clk-r8a7779.o clk-mstp.o clk-div6.o
>
> R-Car Gen1 doesn't have div6 clocks.

Oops, you're right. Then this way makes even more sense. =)

> If you fix that,
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Will do, thanks!

/ magnus