ARM: OMAP: clk-next-omap emergency fixes

PATCH New Tero Kristo 3 participants 7 messages Jan 17, 2014 – Jan 20, 2014

Subsystems (5)

Arm (32-bit) Arm sub-architectures Common clk OMAP2+ support +1 more subsystems

lore

Share & tools

lore

Tero Kristo

author

2014-01-17 20:25 UTC #0 lore raw

cover ARM: OMAP: clk-next-omap emergency fixes

Hi,

Quick emergency band-aid for the build breakages introduced in clk-next by Mike. I didn't have time to test this out (Nishanth will provide some logs) and I will leave the decision whether/how to use these patches or not to Tony + Mike.

I also pushed a test branch based on top of clk-next here:
tree: https://github.com/t-kristo/linux-pm.git
branch: clk-next-omap-fixes

-Tero

Tero Kristo

author

2014-01-17 20:25 UTC #1 lore raw

PATCH 1/3 ARM: DRA7XX/AM43XX: randconfig fixes

DRA7XX and AM43XX were missing common clock code from the Makefile, which causes build breakage in DRA7XX / AM43XX only builds once clock support for these SoCs is added. Add the missing entries to the Makefile as preparation of this.

Signed-off-by Tero Kristo <[email protected]>

---
 arch/arm/mach-omap2/Makefile |    3 +++
 1 file changed, 3 insertions(+)

arch/arm/mach-omap2/Makefile +3 -0

index 088305f..96a990f 100644
@@ -191,6 +191,9 @@ obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o
 obj-$(CONFIG_SOC_AM33XX)		+= $(clock-common) dpll3xxx.o
 obj-$(CONFIG_SOC_OMAP5)			+= $(clock-common)
 obj-$(CONFIG_SOC_OMAP5)			+= dpll3xxx.o dpll44xx.o
+obj-$(CONFIG_SOC_DRA7XX)		+= $(clock-common)
+obj-$(CONFIG_SOC_DRA7XX)		+= dpll3xxx.o dpll44xx.o
+obj-$(CONFIG_SOC_AM43XX)		+= $(clock-common) dpll3xxx.o
 
 # OMAP2 clock rate set data (old "OPP" data)
 obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o

Signature · 1 line

1.7.9.5

Tero Kristo

author

2014-01-17 20:25 UTC #2 lore raw

PATCH 2/3 ARM: DRA7XX: Add support for DRA7XX only build

In reply to Tero Kristo

SOC_DRA7XX was under wrong menu within Kconfig file, which prevented DRA7XX only build. Fixed the kconfig options for this SoC as we are there. voltage.c needs to be added to the DRA7XX build also, otherwise DRA7XX only build will fail.

Signed-off-by Tero Kristo <[email protected]>

---
 arch/arm/mach-omap2/Kconfig  |   18 ++++++++++--------
 arch/arm/mach-omap2/Makefile |    1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

arch/arm/mach-omap2/Kconfig +10 -8

index dc21df1..e65948a 100644
@@ -76,6 +76,16 @@ config SOC_AM43XX
 	select ARM_GIC
 	select MACH_OMAP_GENERIC
 
+config SOC_DRA7XX
+	bool "TI DRA7XX"
+	depends on ARCH_MULTI_V7
+	select ARCH_OMAP2PLUS
+	select ARM_CPU_SUSPEND if PM
+	select ARM_GIC
+	select CPU_V7
+	select HAVE_SMP
+	select HAVE_ARM_ARCH_TIMER
+
 config ARCH_OMAP2PLUS
 	bool
 	select ARCH_HAS_BANDGAP

@@ -128,14 +138,6 @@ config SOC_HAS_REALTIME_COUNTER
 	depends on SOC_OMAP5 || SOC_DRA7XX
 	default y
 
-config SOC_DRA7XX
-	bool "TI DRA7XX"
-	select ARM_ARCH_TIMER
-	select CPU_V7
-	select ARM_GIC
-	select HAVE_SMP
-	select COMMON_CLK
-
 comment "OMAP Core Type"
 	depends on ARCH_OMAP2

arch/arm/mach-omap2/Makefile +1 -0

index 96a990f..8ebe9f3 100644
@@ -132,6 +132,7 @@ obj-$(CONFIG_SOC_AM33XX)		+= $(voltagedomain-common)
 obj-$(CONFIG_SOC_AM43XX)		+= $(voltagedomain-common)
 obj-$(CONFIG_SOC_OMAP5)			+= $(voltagedomain-common)
 obj-$(CONFIG_SOC_OMAP5)                += voltagedomains54xx_data.o
+obj-$(CONFIG_SOC_DRA7XX)		+= $(voltagedomain-common)
 
 # OMAP powerdomain framework
 powerdomain-common			+= powerdomain.o powerdomain-common.o

Signature · 1 line

1.7.9.5

Tero Kristo

author

2014-01-17 20:25 UTC #3 lore raw

PATCH 3/3 clk: ti: OMAP build fixes

In reply to Tero Kristo

Improper merge of TI clock driver resulted in build breakage for OMAP1 build, and various other TI single SoC builds. This patch fixes those by adding the missed Makefile tweaks.

Signed-off-by Tero Kristo <[email protected]>

---
 drivers/clk/Makefile    |    2 +-
 drivers/clk/ti/Makefile |   17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

drivers/clk/Makefile +1 -1

index 1f3143f..13c1e91 100644
@@ -38,7 +38,7 @@ obj-$(CONFIG_PLAT_SAMSUNG)	+= samsung/
 obj-$(CONFIG_COMMON_CLK_XGENE)  += clk-xgene.o
 obj-$(CONFIG_COMMON_CLK_KEYSTONE)	+= keystone/
 obj-$(CONFIG_ARCH_SHMOBILE_MULTI)	+= shmobile/
-obj-$(CONFIG_ARCH_OMAP)		+= ti/
+obj-$(CONFIG_ARCH_OMAP2PLUS)	+= ti/
 
 obj-$(CONFIG_X86)		+= x86/

drivers/clk/ti/Makefile +9 -8

index 007c3c2..4319d40 100644
@@ -1,10 +1,11 @@
 ifneq ($(CONFIG_OF),)
-obj-y					+= clk.o dpll.o autoidle.o divider.o \
-					   fixed-factor.o gate.o clockdomain.o \
-					   composite.o mux.o apll.o clk-43xx.o
-obj-$(CONFIG_SOC_AM33XX)		+= clk-33xx.o
-obj-$(CONFIG_ARCH_OMAP3)		+= interface.o clk-3xxx.o
-obj-$(CONFIG_ARCH_OMAP4)		+= clk-44xx.o
-obj-$(CONFIG_SOC_OMAP5)			+= clk-54xx.o
-obj-$(CONFIG_SOC_DRA7XX)		+= clk-7xx.o
+obj-y					+= clk.o autoidle.o clockdomain.o
+clk-common				= dpll.o composite.o divider.o gate.o \
+					  fixed-factor.o mux.o apll.o
+obj-$(CONFIG_SOC_AM33XX)		+= $(clk-common) clk-33xx.o
+obj-$(CONFIG_ARCH_OMAP3)		+= $(clk-common) interface.o clk-3xxx.o
+obj-$(CONFIG_ARCH_OMAP4)		+= $(clk-common) clk-44xx.o
+obj-$(CONFIG_SOC_OMAP5)			+= $(clk-common) clk-54xx.o
+obj-$(CONFIG_SOC_DRA7XX)		+= $(clk-common) clk-7xx.o
+obj-$(CONFIG_SOC_AM43XX)		+= $(clk-common) clk-43xx.o
 endif

Signature · 1 line

1.7.9.5

Mike Turquette

2014-01-17 21:37 UTC #4 lore raw

cover ARM: OMAP: clk-next-omap emergency fixes

In reply to Tero Kristo

Quoting Tero Kristo (2014-01-17 12:25:37)

Quoted 10 lines

Hi,
Quick emergency band-aid for the build breakages introduced in clk-next by Mike. I didn't have time to test this out (Nishanth will provide some logs) and I will leave the decision whether/how to use these patches or not to Tony + Mike.
I also pushed a test branch based on top of clk-next here:
tree: https://github.com/t-kristo/linux-pm.git
branch: clk-next-omap-fixes

Thanks Tero. I force updated the clk tree with the right branch, so these should not be necessary now.

Regards,
Mike

Quoted 3 lines

-Tero

Tony Lindgren

maintainer

2014-01-18 17:50 UTC #5 lore raw

cover ARM: OMAP: clk-next-omap emergency fixes

Quoted 8 lines · Mike Turquette

Quoting Tero Kristo (2014-01-17 12:25:37)
Quoted 7 lines
Hi,
Quick emergency band-aid for the build breakages introduced in clk-next by Mike. I didn't have time to test this out (Nishanth will provide some logs) and I will leave the decision whether/how to use these patches or not to Tony + Mike.

Quoted 6 lines

Quoted 3 lines
I also pushed a test branch based on top of clk-next here:
tree: https://github.com/t-kristo/linux-pm.git
branch: clk-next-omap-fixes
Thanks Tero. I force updated the clk tree with the right branch, so these should not be necessary now.

Great, and just for reference if I did not do it yet for these:

Acked-by Tony Lindgren <[email protected]>

Mike Turquette

2014-01-20 07:43 UTC #6 lore raw

cover ARM: OMAP: clk-next-omap emergency fixes

Quoted 13 lines · Tony Lindgren

Quoted 12 lines · Mike Turquette
Quoting Tero Kristo (2014-01-17 12:25:37)
Quoted 10 lines
Hi,
Quick emergency band-aid for the build breakages introduced in clk-next by Mike. I didn't have time to test this out (Nishanth will provide some logs) and I will leave the decision whether/how to use these patches or not to Tony + Mike.
I also pushed a test branch based on top of clk-next here:
tree: https://github.com/t-kristo/linux-pm.git
branch: clk-next-omap-fixes

Quoted 6 lines

Quoted 2 lines
Thanks Tero. I force updated the clk tree with the right branch, so these should not be necessary now.
Great, and just for reference if I did not do it yet for these:
Acked-by Tony Lindgren <[email protected]>

I applied your Ack to entire series (these fixes, clock drivers and arch/arm changes).

Regards,
Mike