public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
* [PATCH 03/10] clk/realview: stop using machine headers
@ 2015-02-26 16:10 Arnd Bergmann
  2015-02-27 12:22 ` Linus Walleij
  0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2015-02-26 16:10 UTC (permalink / raw)
  To: linux-arm-kernel

In order to move realview into multiplatform, we have to prevent device
drivers from accessing the machine header files.

In case of the clk driver, this is very simple, we just copy the
small set of register definitions into the driver that needs them.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/clk/versatile/clk-realview.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/versatile/clk-realview.c b/drivers/clk/versatile/clk-realview.c
index c8b523117fb7..276411f3c437 100644
--- a/drivers/clk/versatile/clk-realview.c
+++ b/drivers/clk/versatile/clk-realview.c
@@ -12,11 +12,15 @@
 #include <linux/io.h>
 #include <linux/clk-provider.h>
 
-#include <mach/hardware.h>
-#include <mach/platform.h>
-
 #include "clk-icst.h"
 
+#define REALVIEW_SYS_OSC0_OFFSET             0x0C
+#define REALVIEW_SYS_OSC1_OFFSET             0x10
+#define REALVIEW_SYS_OSC2_OFFSET             0x14
+#define REALVIEW_SYS_OSC3_OFFSET             0x18
+#define REALVIEW_SYS_OSC4_OFFSET             0x1C	/* OSC1 for RealView/AB */
+#define REALVIEW_SYS_LOCK_OFFSET             0x20
+
 /*
  * Implementation of the ARM RealView clock trees.
  */
-- 
2.1.0.rc2

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 00/10] ARM: realview multiplatform
@ 2015-11-25 16:32 Arnd Bergmann
  2015-11-25 16:32 ` [PATCH 03/10] clk/realview: stop using machine headers Arnd Bergmann
  0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2015-11-25 16:32 UTC (permalink / raw)
  To: linux-arm-kernel

I've posted this series before and this time just want to get the
ball rolling again. Linus Walleij has a series to convert realview
to use devicetree, and that is likely to conflict with this one,
so we should try to get the two things merged together properly.

Also, Russell has in the past had some concerns about the CPU
selection changes, and I'm not sure if the current version addresses
them all.

It would be nice to get as much as possible of this series into
the next/multiplatform branch for 4.5, hopefully getting to the
point where we can use it in a multiplatform configuration.

Arnd Bergmann (10):
  ARM: realview: remove sparsemem hack
  ARM: realview: don't map undefined PCI registers
  clk/realview: stop using machine headers
  ARM: no longer force unbuffered DMA for realview
  ARM: realview: remove private barrier implementation
  ARM: realview: enable multiplatform
  ARM: integrator: use explicit core module options
  ARM: no longer make CPU targets visible separately
  ARM: realview: make all header files local
  ARM: realview: clean up header files

 arch/arm/Kconfig                                   |  16 ---
 arch/arm/mach-integrator/Kconfig                   | 132 ++++++++++++++++++---
 arch/arm/mach-realview/Kconfig                     |  62 +++++++---
 arch/arm/mach-realview/Makefile                    |   7 +-
 .../mach-realview/{include/mach => }/board-eb.h    |   4 +-
 .../{include/mach => }/board-pb1176.h              |   4 +-
 .../{include/mach => }/board-pb11mp.h              |   4 +-
 .../mach-realview/{include/mach => }/board-pba8.h  |   4 +-
 .../mach-realview/{include/mach => }/board-pbx.h   |   4 +-
 arch/arm/mach-realview/core.c                      |   7 +-
 arch/arm/mach-realview/core.h                      |   2 -
 .../mach-realview/{include/mach => }/hardware.h    |   2 -
 arch/arm/mach-realview/include/mach/barriers.h     |   8 --
 arch/arm/mach-realview/include/mach/irqs.h         |  40 -------
 arch/arm/mach-realview/include/mach/memory.h       |  64 ----------
 arch/arm/mach-realview/include/mach/uncompress.h   |  77 ------------
 .../arm/mach-realview/{include/mach => }/irqs-eb.h |  20 +---
 .../mach-realview/{include/mach => }/irqs-pb1176.h |  21 ----
 .../mach-realview/{include/mach => }/irqs-pb11mp.h |  27 +----
 .../mach-realview/{include/mach => }/irqs-pba8.h   |  23 ----
 .../mach-realview/{include/mach => }/irqs-pbx.h    |  24 +---
 .../mach-realview/{include/mach => }/platform.h    |   2 -
 arch/arm/mach-realview/platsmp.c                   |   8 +-
 arch/arm/mach-realview/realview-dt.c               |   1 -
 arch/arm/mach-realview/realview_eb.c               |  12 +-
 arch/arm/mach-realview/realview_pb1176.c           |   6 +-
 arch/arm/mach-realview/realview_pb11mp.c           |  11 +-
 arch/arm/mach-realview/realview_pba8.c             |  14 +--
 arch/arm/mach-realview/realview_pbx.c              |  14 +--
 arch/arm/mm/Kconfig                                |  32 +++--
 drivers/clk/versatile/clk-realview.c               |  10 +-
 31 files changed, 229 insertions(+), 433 deletions(-)
 rename arch/arm/mach-realview/{include/mach => }/board-eb.h (97%)
 rename arch/arm/mach-realview/{include/mach => }/board-pb1176.h (97%)
 rename arch/arm/mach-realview/{include/mach => }/board-pb11mp.h (98%)
 rename arch/arm/mach-realview/{include/mach => }/board-pba8.h (97%)
 rename arch/arm/mach-realview/{include/mach => }/board-pbx.h (98%)
 rename arch/arm/mach-realview/{include/mach => }/hardware.h (95%)
 delete mode 100644 arch/arm/mach-realview/include/mach/barriers.h
 delete mode 100644 arch/arm/mach-realview/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-realview/include/mach/memory.h
 delete mode 100644 arch/arm/mach-realview/include/mach/uncompress.h
 rename arch/arm/mach-realview/{include/mach => }/irqs-eb.h (91%)
 rename arch/arm/mach-realview/{include/mach => }/irqs-pb1176.h (88%)
 rename arch/arm/mach-realview/{include/mach => }/irqs-pb11mp.h (90%)
 rename arch/arm/mach-realview/{include/mach => }/irqs-pba8.h (87%)
 rename arch/arm/mach-realview/{include/mach => }/irqs-pbx.h (90%)
 rename arch/arm/mach-realview/{include/mach => }/platform.h (99%)

-- 
2.1.0.rc2

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH, resent 00/10] ARM Realview multiplatform support
@ 2015-02-26 16:08 Arnd Bergmann
  2015-02-26 16:08 ` [PATCH 03/10] clk/realview: stop using machine headers Arnd Bergmann
  0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2015-02-26 16:08 UTC (permalink / raw)
  To: linux-arm-kernel

This is from an old patch set of mine that I have decided to
update to the latest kernel, hopefully getting it fully merged
in 3.21.

We lose a few features here, but after discussions I've had
in the past, it seems unlikely that anyone would miss them.

A few of the changes are for ARM core code and need at least
an Ack from Russell, or we can try to have a shared git
branch for these if necessary.

Please review.

Arnd Bergmann (10):
  ARM: realview: remove sparsemem hack
  ARM: realview: don't map undefined PCI registers
  clk/realview: stop using machine headers
  ARM: no longer force unbuffered DMA for realview
  ARM: realview: remove private barrier implementation
  ARM: realview: enable multiplatform
  ARM: integrator: use explicit core module options
  ARM: no longer make CPU targets visible separately
  ARM: realview: make all header files local
  ARM: realview: clean up header files

[re-sent with correct mailing list address, sorry for duplicate
 spam]

 arch/arm/Kconfig                                   |  16 ---
 arch/arm/mach-integrator/Kconfig                   | 132 ++++++++++++++++++---
 arch/arm/mach-realview/Kconfig                     |  65 +++++++---
 arch/arm/mach-realview/Makefile                    |   7 +-
 .../mach-realview/{include/mach => }/board-eb.h    |   4 +-
 .../{include/mach => }/board-pb1176.h              |   4 +-
 .../{include/mach => }/board-pb11mp.h              |   4 +-
 .../mach-realview/{include/mach => }/board-pba8.h  |   4 +-
 .../mach-realview/{include/mach => }/board-pbx.h   |   4 +-
 arch/arm/mach-realview/core.c                      |   6 +-
 arch/arm/mach-realview/core.h                      |   2 -
 .../mach-realview/{include/mach => }/hardware.h    |   2 -
 arch/arm/mach-realview/include/mach/barriers.h     |   8 --
 arch/arm/mach-realview/include/mach/irqs.h         |  40 -------
 arch/arm/mach-realview/include/mach/memory.h       |  64 ----------
 arch/arm/mach-realview/include/mach/uncompress.h   |  77 ------------
 .../arm/mach-realview/{include/mach => }/irqs-eb.h |  20 +---
 .../mach-realview/{include/mach => }/irqs-pb1176.h |  21 ----
 .../mach-realview/{include/mach => }/irqs-pb11mp.h |  27 +----
 .../mach-realview/{include/mach => }/irqs-pba8.h   |  23 ----
 .../mach-realview/{include/mach => }/irqs-pbx.h    |  24 +---
 .../mach-realview/{include/mach => }/platform.h    |   2 -
 arch/arm/mach-realview/platsmp.c                   |   8 +-
 arch/arm/mach-realview/realview-dt.c               |   1 -
 arch/arm/mach-realview/realview_eb.c               |  12 +-
 arch/arm/mach-realview/realview_pb1176.c           |   6 +-
 arch/arm/mach-realview/realview_pb11mp.c           |  11 +-
 arch/arm/mach-realview/realview_pba8.c             |  14 +--
 arch/arm/mach-realview/realview_pbx.c              |  14 +--
 arch/arm/mm/Kconfig                                |  32 +++--
 drivers/clk/versatile/clk-realview.c               |  10 +-
 31 files changed, 232 insertions(+), 432 deletions(-)
 rename arch/arm/mach-realview/{include/mach => }/board-eb.h (97%)
 rename arch/arm/mach-realview/{include/mach => }/board-pb1176.h (97%)
 rename arch/arm/mach-realview/{include/mach => }/board-pb11mp.h (98%)
 rename arch/arm/mach-realview/{include/mach => }/board-pba8.h (97%)
 rename arch/arm/mach-realview/{include/mach => }/board-pbx.h (98%)
 rename arch/arm/mach-realview/{include/mach => }/hardware.h (95%)
 delete mode 100644 arch/arm/mach-realview/include/mach/barriers.h
 delete mode 100644 arch/arm/mach-realview/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-realview/include/mach/memory.h
 delete mode 100644 arch/arm/mach-realview/include/mach/uncompress.h
 rename arch/arm/mach-realview/{include/mach => }/irqs-eb.h (91%)
 rename arch/arm/mach-realview/{include/mach => }/irqs-pb1176.h (88%)
 rename arch/arm/mach-realview/{include/mach => }/irqs-pb11mp.h (90%)
 rename arch/arm/mach-realview/{include/mach => }/irqs-pba8.h (87%)
 rename arch/arm/mach-realview/{include/mach => }/irqs-pbx.h (90%)
 rename arch/arm/mach-realview/{include/mach => }/platform.h (99%)

-- 
2.1.0.rc2

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-25 16:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-26 16:10 [PATCH 03/10] clk/realview: stop using machine headers Arnd Bergmann
2015-02-27 12:22 ` Linus Walleij
  -- strict thread matches above, loose matches on Subject: below --
2015-11-25 16:32 [PATCH 00/10] ARM: realview multiplatform Arnd Bergmann
2015-11-25 16:32 ` [PATCH 03/10] clk/realview: stop using machine headers Arnd Bergmann
2015-02-26 16:08 [PATCH, resent 00/10] ARM Realview multiplatform support Arnd Bergmann
2015-02-26 16:08 ` [PATCH 03/10] clk/realview: stop using machine headers Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox