diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-03-29 06:53:11 +0100 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 14:42:23 +0200 |
| commit | 0b48d3a6fbac641d1da12bbe202ec82ff0c89148 (patch) | |
| tree | c35489ed45797c3d3aa49c9b59d6cb4df47e0cbc /arch/arm/mach-mxs/mach-mxs.c | |
| parent | ARM: mxs: merge imx23 and imx28 into one machine_desc (diff) | |
| download | linux-0b48d3a6fbac641d1da12bbe202ec82ff0c89148.tar.xz linux-0b48d3a6fbac641d1da12bbe202ec82ff0c89148.zip | |
ARM: mxs: remove unused headers
Most of the stuff in the headers are used nowhere now. Move a few
things that are useful for mach-mxs.c into there and remove the headers.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/mach-mxs.c')
| -rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index a6e1ccb05066..16870bf853b8 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -31,8 +31,33 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> #include <asm/system_misc.h> -#include <mach/digctl.h> -#include <mach/mxs.h> + +/* MXS DIGCTL SAIF CLKMUX */ +#define MXS_DIGCTL_SAIF_CLKMUX_DIRECT 0x0 +#define MXS_DIGCTL_SAIF_CLKMUX_CROSSINPUT 0x1 +#define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0 0x2 +#define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR1 0x3 + +#define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr)) + +#define MXS_SET_ADDR 0x4 +#define MXS_CLR_ADDR 0x8 +#define MXS_TOG_ADDR 0xc + +static inline void __mxs_setl(u32 mask, void __iomem *reg) +{ + __raw_writel(mask, reg + MXS_SET_ADDR); +} + +static inline void __mxs_clrl(u32 mask, void __iomem *reg) +{ + __raw_writel(mask, reg + MXS_CLR_ADDR); +} + +static inline void __mxs_togl(u32 mask, void __iomem *reg) +{ + __raw_writel(mask, reg + MXS_TOG_ADDR); +} static struct fb_videomode mx23evk_video_modes[] = { { |