Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc0cc4ca authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: integrator: localize the impd1.h header 



As we move toward multiplatform support for the Integrator family
we need to localize all <mach/*> headers. This moves the impd1.h
header down to the machine folder, copying the the three defines
only used by the clock driver down into the clock driver.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Jonathan Austin <jonathan.austin@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Turquette <mturquette@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c36928ad

arch/arm/mach-integrator/impd1.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,9 +25,9 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/irqchip/arm-vic.h>

#include <linux/irqchip/arm-vic.h>





#include <mach/impd1.h>

#include <asm/sizes.h>

#include <asm/sizes.h>

#include "lm.h"

#include "lm.h"

#include "impd1.h"





static int module_id;

static int module_id;

arch/arm/mach-integrator/include/mach/impd1.h→arch/arm/mach-integrator/impd1.h

+0 −4
Original line number Original line Diff line number Diff line 
#define IMPD1_OSC1	0x00

#define IMPD1_OSC2	0x04

#define IMPD1_LOCK	0x08

#define IMPD1_LEDS	0x0c

#define IMPD1_LEDS	0x0c

#define IMPD1_INT	0x10

#define IMPD1_INT	0x10

#define IMPD1_SW	0x14

#define IMPD1_SW	0x14
@@ -15,4 +12,3 @@ 
struct device;

struct device;





void impd1_tweak_control(struct device *dev, u32 mask, u32 val);
 
void impd1_tweak_control(struct device *dev, u32 mask, u32 val);

drivers/clk/versatile/clk-impd1.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -13,10 +13,12 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <linux/platform_data/clk-integrator.h>

#include <linux/platform_data/clk-integrator.h>





#include <mach/impd1.h>



#include "clk-icst.h"

#include "clk-icst.h"





#define IMPD1_OSC1	0x00

#define IMPD1_OSC2	0x04

#define IMPD1_LOCK	0x08



struct impd1_clk {

struct impd1_clk {

	char *vco1name;

	char *vco1name;

	struct clk *vco1clk;

	struct clk *vco1clk;