Skip to contentSkip to conversation

clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

PATCH Superseded Magnus Damm 3 participants 8 messages Aug 26, 2015 – Sep 2, 2015

Subsystems (2)

v2 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI

From: Magnus Damm <[email protected]>

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.

---

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(-)
drivers/clk/Makefile +1 -1
@@ -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/
drivers/clk/shmobile/Makefile +10 -12
@@ -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
#1 lore raw
Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

Quoted 6 lines

---

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 -- [email protected]

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

#2 lore raw

Hi Geert,

Quoted 12 lines · Geert Uytterhoeven
Quoted 11 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

---

Quoted 6 lines
Quoted 2 lines

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

#3 lore raw
Quoted 19 lines · Magnus Damm

Hi Geert,

Quoted 15 lines · Geert Uytterhoeven
Quoted 13 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

---

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

Quoted 7 lines
Quoted 3 lines

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.

#4 lore raw
In reply to Geert Uytterhoeven

Hi Geert,

Quoted 12 lines · Geert Uytterhoeven
Quoted 11 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

---

Quoted 6 lines
Quoted 2 lines

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

#5 lore raw

Hi Magnus,

Quoted 21 lines · Magnus Damm
Quoted 12 lines · Geert Uytterhoeven
Quoted 11 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

---

Quoted 6 lines
Quoted 2 lines

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.

Quoted 8 lines

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 -- [email protected]

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

#6 lore raw
In reply to Magnus Damm
Quoted 9 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

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 -- [email protected]

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

#7 lore raw
Quoted 8 lines · Geert Uytterhoeven
Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

Quoted 6 lines
Quoted 2 lines

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