[v3,01/04] clk: shmobile: Get rid of CONFIG_ARCH_SHMOBILE_MULTI

Commit Message

Magnus Damm Aug. 28, 2015, 9:16 a.m. UTC

From: Magnus Damm <[e-mail]>

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 <[e-mail]>
Acked-by: Geert Uytterhoeven <[e-mail]>
---

 Changes since V2:
 - Fixed patch subject typo CONFIG_SHMOBILE_MULTI -> CONFIG_ARCH_SHMOBILE_MULTI

 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(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Laurent Pinchart Aug. 28, 2015, 7:59 p.m. UTC | #1

Hi Magnus,

Thank you for the patch.

On Friday 28 August 2015 18:16:02 Magnus Damm wrote:
> From: Magnus Damm <[e-mail]>
> 
> 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 <[e-mail]>
> Acked-by: Geert Uytterhoeven <[e-mail]>

Assuming you have verified that adding the same object file several times to 
obj-y won't cause any issue,

Acked-by: Laurent Pinchart <[e-mail]>

> ---
> 
>  Changes since V2:
>  - Fixed patch subject typo CONFIG_SHMOBILE_MULTI ->
> CONFIG_ARCH_SHMOBILE_MULTI
> 
>  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

Magnus Damm Aug. 29, 2015, 8:33 a.m. UTC | #2

Hi Laurent,

On Sat, Aug 29, 2015 at 4:59 AM, Laurent Pinchart
<[e-mail]> wrote:
> Hi Magnus,
>
> Thank you for the patch.
>
> On Friday 28 August 2015 18:16:02 Magnus Damm wrote:
>> From: Magnus Damm <[e-mail]>
>>
>> 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 <[e-mail]>
>> Acked-by: Geert Uytterhoeven <[e-mail]>
>
> Assuming you have verified that adding the same object file several times to
> obj-y won't cause any issue,

Yeah. A good example of such (mis)use is in arch/arm/mach-shmobile/Kconfig.
I've also built 32-bit shmobile_defconfig and 64-bit defconfig without issues.

> Acked-by: Laurent Pinchart <[e-mail]>

Thanks!

/ magnus
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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