diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-08 22:53:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-08 22:53:33 -0800 |
| commit | 22673b71689a65a89335d0f3e42ce952efb3e7e1 (patch) | |
| tree | 0a5c5a7289d8522a0ccbe564fb74cdc6332a7afd /drivers/clk | |
| parent | ba0e1fa928e6e7a47d54008b1a701b02a858d0e4 (diff) | |
| parent | a79528e9d849803457b6235ddb1a1cfd4e11c6cd (diff) | |
Merge tag 'integrator-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup2
Merge more Integrator multiplatform patches for v3.15 from Linus Walleij:
- Remove all dangling header files in <mach/*> from the global
namespace and push them down into the mach-integrator folder.
- Decouple the Integrator from the plat-versatile sched_clock
implementation.
* tag 'integrator-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: integrator: register sched_clock directly
ARM: integrator: localize the hardware.h header
ARM: integrator: merge platform.h to hardware.h
ARM: integrator: localize the impd1.h header
ARM: integrator: localize the lm.h header
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/versatile/clk-impd1.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/versatile/clk-impd1.c b/drivers/clk/versatile/clk-impd1.c index 6d8b8e1a080a..31b44f025f9e 100644 --- a/drivers/clk/versatile/clk-impd1.c +++ b/drivers/clk/versatile/clk-impd1.c @@ -13,10 +13,12 @@ #include <linux/io.h> #include <linux/platform_data/clk-integrator.h> -#include <mach/impd1.h> - #include "clk-icst.h" +#define IMPD1_OSC1 0x00 +#define IMPD1_OSC2 0x04 +#define IMPD1_LOCK 0x08 + struct impd1_clk { char *vco1name; struct clk *vco1clk; |