All of lore.kernel.org
 help / color / mirror / Atom feed
From: pavel@denx.de (Pavel Machek)
To: linux-arm-kernel@lists.infradead.org
Subject: Move designware timer OF glue into drivers/clocksource
Date: Tue, 10 Jul 2012 13:23:09 +0200	[thread overview]
Message-ID: <20120710112308.GC8701@elf.ucw.cz> (raw)
In-Reply-To: <alpine.LFD.2.02.1207101304160.32033@ionos>

Hi!

> > -obj-y					:= common.o time.o
> > +obj-y					:= common.o ../../../drivers/clocksource/dw_apb_timer_of.o
> 
> Urgh! Why can't we just compile it from drivers/clocksource/Makefile ?
> 
> Otherwise, yes please move the code instead of creating a copy.

Ok, what about this?

Would it be ok to submit dw_apb_timer_of.c for merge now, so that
picoxcell can switch to it and upcomming mach-socfpga can use it?

Thanks,
								Pavel

commit eb710d44cc1b9e7a5d5516a87c43c3c0c62a8936
Author: Pavel <pavel@ucw.cz>
Date:   Tue Jul 10 13:21:24 2012 +0200

    Create a config option to avoid compile-from-different-directory hack.
    
    Signed-off-by: Pavel Machek <pavel@denx.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b7064f5..dbdf53d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -258,6 +258,7 @@ config ARCH_SOCFPGA
 	select CLKDEV_LOOKUP
 	select CPU_V7
 	select DW_APB_TIMER
+	select DW_APB_TIMER_OF
 	select GENERIC_CLOCKEVENTS
 	select GPIO_PL061 if GPIOLIB
 	select HAVE_MACH_CLKDEV
diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile
index 239b8a0..a44f4ff 100644
--- a/arch/arm/mach-socfpga/Makefile
+++ b/arch/arm/mach-socfpga/Makefile
@@ -2,5 +2,5 @@
 # Makefile for the linux kernel.
 #
 
-obj-y					:= common.o ../../../drivers/clocksource/dw_apb_timer_of.o
+obj-y					:= common.o
 obj-$(CONFIG_MACH_SOCFPGA_CYCLONE5)	+= socfpga_cyclone5.o
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 99c6b20..e62bc7e 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -16,6 +16,9 @@ config CLKSRC_MMIO
 config DW_APB_TIMER
 	bool
 
+config DW_APB_TIMER_OF
+	bool
+
 config CLKSRC_DBX500_PRCMU
 	bool "Clocksource PRCMU Timer"
 	depends on UX500_SOC_DB8500
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index dd3e661..2cdaf7d 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -10,4 +10,5 @@ obj-$(CONFIG_EM_TIMER_STI)	+= em_sti.o
 obj-$(CONFIG_CLKBLD_I8253)	+= i8253.o
 obj-$(CONFIG_CLKSRC_MMIO)	+= mmio.o
 obj-$(CONFIG_DW_APB_TIMER)	+= dw_apb_timer.o
+obj-$(CONFIG_DW_APB_TIMER_OF)	+= dw_apb_timer_of.o
 obj-$(CONFIG_CLKSRC_DBX500_PRCMU)	+= clksrc-dbx500-prcmu.o
\ No newline at end of file

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

  parent reply	other threads:[~2012-07-10 11:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-10  9:42 Move designware timer OF glue into drivers/clocksource Pavel Machek
2012-07-10 11:07 ` Thomas Gleixner
2012-07-10 11:13   ` Pavel Machek
2012-07-10 14:10     ` Thomas Gleixner
2012-07-10 11:23   ` Pavel Machek [this message]
2012-07-10 11:24 ` Jamie Iles
2012-07-10 12:19   ` Pavel Machek
2012-07-10 13:41     ` Arnd Bergmann
2012-07-10 18:08       ` Pavel Machek
2012-07-10 12:20 ` Thomas Petazzoni
2012-07-10 18:11   ` Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120710112308.GC8701@elf.ucw.cz \
    --to=pavel@denx.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.