[PATCH 0/3] ARM: OMAP: clk-next-omap emergency fixes

[PATCH 0/3] ARM: OMAP: clk-next-omap emergency fixes

[Tero Kristo]

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

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

[Tero Kristo]

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 <t-kristo@ti.com>
---
 arch/arm/mach-omap2/Makefile |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 088305f..96a990f 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -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
-- 
1.7.9.5

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

[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 <t-kristo@ti.com>
---
 arch/arm/mach-omap2/Kconfig  |   18 ++++++++++--------
 arch/arm/mach-omap2/Makefile |    1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index dc21df1..e65948a 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -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
 
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 96a990f..8ebe9f3 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -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
-- 
1.7.9.5

[PATCH 3/3] clk: ti: OMAP build fixes

[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 <t-kristo@ti.com>
---
 drivers/clk/Makefile    |    2 +-
 drivers/clk/ti/Makefile |   17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 1f3143f..13c1e91 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -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/
 
diff --git a/drivers/clk/ti/Makefile b/drivers/clk/ti/Makefile
index 007c3c2..4319d40 100644
--- a/drivers/clk/ti/Makefile
+++ b/drivers/clk/ti/Makefile
@@ -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
-- 
1.7.9.5

[PATCH 0/3] ARM: OMAP: clk-next-omap emergency fixes

[Mike Turquette]

Quoting Tero Kristo (2014-01-17 12:25:37)
> 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

> 
> -Tero
> 

[PATCH 0/3] ARM: OMAP: clk-next-omap emergency fixes

[Tony Lindgren]

* Mike Turquette <mturquette@linaro.org> [140117 13:39]:
> Quoting Tero Kristo (2014-01-17 12:25:37)
> > 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.

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

Acked-by: Tony Lindgren <tony@atomide.com>

[PATCH 0/3] ARM: OMAP: clk-next-omap emergency fixes

[Mike Turquette]

On Sat, Jan 18, 2014 at 9:50 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Mike Turquette <mturquette@linaro.org> [140117 13:39]:
>> Quoting Tero Kristo (2014-01-17 12:25:37)
>> > 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.
>
> Great, and just for reference if I did not do it yet for these:
>
> Acked-by: Tony Lindgren <tony@atomide.com>

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

Regards,
Mike