diff options
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/clk-imx5.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-imx/clk-pllv2.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/clk-pllv3.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/clocksource.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/external-nand-boot.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-imx/gpio.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx1.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx21.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx25.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx31.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx35.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx51.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx53.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/devices-imx31.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/generic.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx-regs.h | 64 | ||||
-rw-r--r-- | arch/arm/mach-imx/iomux-v3.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/nand.c | 5 |
18 files changed, 23 insertions, 80 deletions
diff --git a/arch/arm/mach-imx/clk-imx5.c b/arch/arm/mach-imx/clk-imx5.c index 03a18435c6..050842d103 100644 --- a/arch/arm/mach-imx/clk-imx5.c +++ b/arch/arm/mach-imx/clk-imx5.c @@ -13,7 +13,8 @@ #include <io.h> #include <linux/clkdev.h> #include <linux/err.h> -#include <mach/imx-regs.h> +#include <mach/imx51-regs.h> +#include <mach/imx53-regs.h> #include "clk.h" diff --git a/arch/arm/mach-imx/clk-pllv2.c b/arch/arm/mach-imx/clk-pllv2.c index 69072698c4..7e087c1789 100644 --- a/arch/arm/mach-imx/clk-pllv2.c +++ b/arch/arm/mach-imx/clk-pllv2.c @@ -17,7 +17,6 @@ #include <io.h> #include <linux/clkdev.h> #include <linux/err.h> -#include <mach/imx-regs.h> #include <malloc.h> #include <asm-generic/div64.h> diff --git a/arch/arm/mach-imx/clk-pllv3.c b/arch/arm/mach-imx/clk-pllv3.c index a99eec56a3..e337e87f13 100644 --- a/arch/arm/mach-imx/clk-pllv3.c +++ b/arch/arm/mach-imx/clk-pllv3.c @@ -17,7 +17,6 @@ #include <io.h> #include <linux/clkdev.h> #include <linux/err.h> -#include <mach/imx-regs.h> #include <malloc.h> #include <clock.h> #include <asm-generic/div64.h> diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c index cc7c38fc62..e18685ec29 100644 --- a/arch/arm/mach-imx/clocksource.c +++ b/arch/arm/mach-imx/clocksource.c @@ -32,7 +32,6 @@ #include <linux/clk.h> #include <linux/err.h> #include <notifier.h> -#include <mach/imx-regs.h> #include <io.h> /* Part 1: Registers */ diff --git a/arch/arm/mach-imx/external-nand-boot.c b/arch/arm/mach-imx/external-nand-boot.c index d3f2637bea..2e9e475fed 100644 --- a/arch/arm/mach-imx/external-nand-boot.c +++ b/arch/arm/mach-imx/external-nand-boot.c @@ -17,7 +17,11 @@ #include <linux/mtd/nand.h> #include <mach/imx-nand.h> #include <mach/generic.h> -#include <mach/imx-regs.h> +#include <mach/imx21-regs.h> +#include <mach/imx25-regs.h> +#include <mach/imx27-regs.h> +#include <mach/imx31-regs.h> +#include <mach/imx35-regs.h> static void __bare_init noinline imx_nandboot_wait_op_done(void *regs) { diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c index cd7655a5d1..1bf4100964 100644 --- a/arch/arm/mach-imx/gpio.c +++ b/arch/arm/mach-imx/gpio.c @@ -23,7 +23,6 @@ #include <common.h> #include <errno.h> #include <io.h> -#include <mach/imx-regs.h> #include <gpio.h> #include <init.h> diff --git a/arch/arm/mach-imx/imx1.c b/arch/arm/mach-imx/imx1.c index 966a8c2847..18901ea6d0 100644 --- a/arch/arm/mach-imx/imx1.c +++ b/arch/arm/mach-imx/imx1.c @@ -14,7 +14,7 @@ #include <common.h> #include <init.h> #include <io.h> -#include <mach/imx-regs.h> +#include <mach/imx1-regs.h> #include <mach/weim.h> #include <mach/iomux-v1.h> #include <reset_source.h> diff --git a/arch/arm/mach-imx/imx21.c b/arch/arm/mach-imx/imx21.c index 417ada37ff..cddf3c088e 100644 --- a/arch/arm/mach-imx/imx21.c +++ b/arch/arm/mach-imx/imx21.c @@ -14,7 +14,7 @@ #include <common.h> #include <init.h> #include <io.h> -#include <mach/imx-regs.h> +#include <mach/imx21-regs.h> #include <mach/weim.h> #include <mach/iomux-v1.h> diff --git a/arch/arm/mach-imx/imx25.c b/arch/arm/mach-imx/imx25.c index 0f92b17ed4..3bd95c146a 100644 --- a/arch/arm/mach-imx/imx25.c +++ b/arch/arm/mach-imx/imx25.c @@ -13,7 +13,7 @@ #include <common.h> #include <init.h> -#include <mach/imx-regs.h> +#include <mach/imx25-regs.h> #include <mach/iim.h> #include <io.h> #include <mach/weim.h> diff --git a/arch/arm/mach-imx/imx31.c b/arch/arm/mach-imx/imx31.c index 71b4c333c0..b2f0724bd1 100644 --- a/arch/arm/mach-imx/imx31.c +++ b/arch/arm/mach-imx/imx31.c @@ -15,7 +15,7 @@ #include <init.h> #include <sizes.h> #include <io.h> -#include <mach/imx-regs.h> +#include <mach/imx31-regs.h> #include <mach/weim.h> void imx31_setup_weimcs(size_t cs, unsigned upper, unsigned lower, diff --git a/arch/arm/mach-imx/imx35.c b/arch/arm/mach-imx/imx35.c index 55601570e7..737eb3a3a8 100644 --- a/arch/arm/mach-imx/imx35.c +++ b/arch/arm/mach-imx/imx35.c @@ -16,7 +16,7 @@ #include <init.h> #include <io.h> #include <mach/weim.h> -#include <mach/imx-regs.h> +#include <mach/imx35-regs.h> #include <mach/iim.h> #include <mach/revision.h> #include <mach/generic.h> diff --git a/arch/arm/mach-imx/imx51.c b/arch/arm/mach-imx/imx51.c index fac5c25486..f5a867be3f 100644 --- a/arch/arm/mach-imx/imx51.c +++ b/arch/arm/mach-imx/imx51.c @@ -17,7 +17,7 @@ #include <environment.h> #include <io.h> #include <mach/imx5.h> -#include <mach/imx-regs.h> +#include <mach/imx51-regs.h> #include <mach/revision.h> #include <mach/clock-imx51_53.h> #include <mach/generic.h> diff --git a/arch/arm/mach-imx/imx53.c b/arch/arm/mach-imx/imx53.c index 0a4de83a4c..38b94fcc80 100644 --- a/arch/arm/mach-imx/imx53.c +++ b/arch/arm/mach-imx/imx53.c @@ -17,7 +17,7 @@ #include <notifier.h> #include <sizes.h> #include <mach/imx5.h> -#include <mach/imx-regs.h> +#include <mach/imx53-regs.h> #include <mach/revision.h> #include <mach/clock-imx51_53.h> diff --git a/arch/arm/mach-imx/include/mach/devices-imx31.h b/arch/arm/mach-imx/include/mach/devices-imx31.h index 72167b0a14..fe719301ad 100644 --- a/arch/arm/mach-imx/include/mach/devices-imx31.h +++ b/arch/arm/mach-imx/include/mach/devices-imx31.h @@ -1,5 +1,5 @@ -#include <mach/imx-regs.h> +#include <mach/imx31-regs.h> #include <mach/devices.h> static inline struct device_d *imx31_add_spi0(struct spi_imx_master *pdata) diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h index 7fe5810d5f..86966e45f4 100644 --- a/arch/arm/mach-imx/include/mach/generic.h +++ b/arch/arm/mach-imx/include/mach/generic.h @@ -19,6 +19,10 @@ int imx_25_35_boot_save_loc(unsigned int ctrl, unsigned int type); void imx_27_boot_save_loc(void __iomem *sysctrl_base); int imx51_boot_save_loc(void __iomem *src_base); +/* There's a off-by-one betweem the gpio bank number and the gpiochip */ +/* range e.g. GPIO_1_5 is gpio 5 under linux */ +#define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr)) + #ifdef CONFIG_ARCH_IMX1 #define cpu_is_mx1() (1) #else diff --git a/arch/arm/mach-imx/include/mach/imx-regs.h b/arch/arm/mach-imx/include/mach/imx-regs.h deleted file mode 100644 index 4acee24148..0000000000 --- a/arch/arm/mach-imx/include/mach/imx-regs.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * - * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#ifndef _IMX_REGS_H -#define _IMX_REGS_H - -/* ------------------------------------------------------------------------ - * Motorola IMX system registers - * ------------------------------------------------------------------------ - */ - -# ifndef __ASSEMBLY__ -# define __REG(x) (*((volatile u32 *)(x))) -# define __REG16(x) (*(volatile u16 *)(x)) -# define __REG2(x,y) (*(volatile u32 *)((u32)&__REG(x) + (y))) -# else -# define __REG(x) (x) -# define __REG16(x) (x) -# define __REG2(x,y) ((x)+(y)) -#endif - -#ifdef CONFIG_ARCH_IMX1 -# include <mach/imx1-regs.h> -#elif defined CONFIG_ARCH_IMX21 -# include <mach/imx21-regs.h> -#elif defined CONFIG_ARCH_IMX27 -# include <mach/imx27-regs.h> -#elif defined CONFIG_ARCH_IMX31 -# include <mach/imx31-regs.h> -#elif defined CONFIG_ARCH_IMX35 -# include <mach/imx35-regs.h> -#elif defined CONFIG_ARCH_IMX25 -# include <mach/imx25-regs.h> -#elif defined CONFIG_ARCH_IMX51 -# include <mach/imx51-regs.h> -#elif defined CONFIG_ARCH_IMX53 -# include <mach/imx53-regs.h> -#elif defined CONFIG_ARCH_IMX6 -# include <mach/imx6-regs.h> -#else -# error "unknown i.MX soc type" -#endif - -/* There's a off-by-one betweem the gpio bank number and the gpiochip */ -/* range e.g. GPIO_1_5 is gpio 5 under linux */ -#define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr)) - -#endif /* _IMX_REGS_H */ diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c index 9153ead2f2..8a6064da6c 100644 --- a/arch/arm/mach-imx/iomux-v3.c +++ b/arch/arm/mach-imx/iomux-v3.c @@ -18,7 +18,6 @@ #include <init.h> #include <io.h> #include <mach/iomux-v3.h> -#include <mach/imx-regs.h> static void __iomem *base; diff --git a/arch/arm/mach-imx/nand.c b/arch/arm/mach-imx/nand.c index e793015bc4..f298a36046 100644 --- a/arch/arm/mach-imx/nand.c +++ b/arch/arm/mach-imx/nand.c @@ -13,7 +13,10 @@ #include <common.h> #include <mach/generic.h> -#include <mach/imx-regs.h> +#include <mach/imx21-regs.h> +#include <mach/imx25-regs.h> +#include <mach/imx27-regs.h> +#include <mach/imx35-regs.h> #include <io.h> #define RCSR_NFC_FMS (1 << 8) |