ARM: imx: include common.h rather than mach/common.h

Rename mach-imx/include/mach/common.h to mach-imx/common.h and update
all users to include common.h rather than mach/common.h.

It also removes an unneeded inclusion to common.h in
mach-imx/devices/devices.c.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Shawn Guo 2012-09-13 21:01:00 +08:00
parent 3995eb8205
commit e3372474cf
77 changed files with 93 additions and 77 deletions

View File

@ -22,12 +22,12 @@
#include <linux/irqdomain.h>
#include <linux/io.h>
#include <linux/of.h>
#include <mach/common.h>
#include <asm/mach/irq.h>
#include <asm/exception.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#include "common.h"
#include "irq-common.h"
#define AVIC_INTCNTL 0x00 /* int control reg */

View File

@ -23,8 +23,9 @@
#include <linux/err.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "clk.h"
#include "common.h"
/* CCM register addresses */
#define IO_ADDR_CCM(off) (MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR + (off)))

View File

@ -26,8 +26,9 @@
#include <linux/err.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "clk.h"
#include "common.h"
#define IO_ADDR_CCM(off) (MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR + (off)))

View File

@ -25,9 +25,10 @@
#include <linux/err.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/mx25.h>
#include "clk.h"
#include "common.h"
#define CRM_BASE MX25_IO_ADDRESS(MX25_CRM_BASE_ADDR)

View File

@ -6,9 +6,10 @@
#include <linux/clk-provider.h>
#include <linux/of.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "clk.h"
#include "common.h"
#define IO_ADDR_CCM(off) (MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR + (off)))

View File

@ -24,9 +24,9 @@
#include <mach/hardware.h>
#include <mach/mx31.h>
#include <mach/common.h>
#include "clk.h"
#include "common.h"
#include "crmregs-imx3.h"
static const char *mcu_main_sel[] = { "spll", "mpll", };

View File

@ -15,10 +15,10 @@
#include <linux/err.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "crmregs-imx3.h"
#include "clk.h"
#include "common.h"
struct arm_ahb_div {
unsigned char arm, ahb, sel;

View File

@ -15,10 +15,10 @@
#include <linux/err.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "crm-regs-imx5.h"
#include "clk.h"
#include "common.h"
/* Low-power Audio Playback Mode clock */
static const char *lp_apm_sel[] = { "osc", };

View File

@ -19,8 +19,9 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <mach/common.h>
#include "clk.h"
#include "common.h"
#define CCGR0 0x68
#define CCGR1 0x6c

View File

@ -4,10 +4,10 @@
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/err.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "clk.h"
#include "common.h"
/**
* pll v1

View File

@ -13,7 +13,8 @@
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/iim.h>
#include <mach/common.h>
#include "common.h"
static int mx31_cpu_rev = -1;

View File

@ -21,7 +21,6 @@
#include <linux/init.h>
#include <linux/err.h>
#include <linux/platform_device.h>
#include <mach/common.h>
struct device mxc_aips_bus = {
.init_name = "mxc_aips",

View File

@ -54,7 +54,8 @@
#include <mach/hardware.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include "common.h"
static struct clock_event_device clockevent_epit;
static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED;

View File

@ -29,9 +29,9 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -27,11 +27,11 @@
#include <video/platform_lcd.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/mx25.h>
#include "common.h"
#include "devices-imx25.h"
#include "iomux-mx25.h"

View File

@ -37,8 +37,8 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "common.h"
#include "devices-imx35.h"
#include "iomux-mx35.h"

View File

@ -37,8 +37,8 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "common.h"
#include "devices-imx51.h"
#include "iomux-mx51.h"

View File

@ -13,7 +13,8 @@
#include <linux/errno.h>
#include <asm/cacheflush.h>
#include <asm/cp15.h>
#include <mach/common.h>
#include "common.h"
static inline void cpu_enter_lowpower(void)
{

View File

@ -14,9 +14,10 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include <mach/mx27.h>
#include "common.h"
static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = {
OF_DEV_AUXDATA("fsl,imx27-uart", MX27_UART1_BASE_ADDR, "imx21-uart.0", NULL),
OF_DEV_AUXDATA("fsl,imx27-uart", MX27_UART2_BASE_ADDR, "imx21-uart.1", NULL),

View File

@ -14,9 +14,10 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include <mach/mx31.h>
#include "common.h"
static const struct of_dev_auxdata imx31_auxdata_lookup[] __initconst = {
OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART1_BASE_ADDR,
"imx21-uart.0", NULL),

View File

@ -15,9 +15,10 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include <mach/mx51.h>
#include "common.h"
/*
* Lookup table for attaching a specific name and platform_data pointer to
* devices as they get created by of_platform_populate(). Ideally this table

View File

@ -25,9 +25,9 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "devices-imx1.h"
#include "iomux-mx1.h"

View File

@ -48,9 +48,9 @@
#include <asm/memory.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/ulpi.h>
#include "common.h"
#include "devices-imx31.h"
#include "crmregs-imx3.h"
#include "iomux-mx3.h"

View File

@ -20,12 +20,12 @@
#include <linux/platform_device.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <asm/mach/time.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -34,10 +34,10 @@
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/ulpi.h>
#include "common.h"
#include "devices-imx27.h"
#include "eukrea-baseboards.h"
#include "iomux-mx27.h"

View File

@ -38,8 +38,8 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "common.h"
#include "devices-imx35.h"
#include "eukrea-baseboards.h"
#include "iomux-mx35.h"

View File

@ -26,7 +26,6 @@
#include <linux/spi/spi.h>
#include <linux/can/platform/mcp251x.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <asm/setup.h>
@ -34,6 +33,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include "common.h"
#include "devices-imx51.h"
#include "cpu_op-mx51.h"
#include "eukrea-baseboards.h"

View File

@ -33,9 +33,9 @@
#include <asm/mach/time.h>
#include <asm/memory.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/mx25.h>
#include "common.h"
#include "devices-imx25.h"
#include "eukrea-baseboards.h"
#include "iomux-mx25.h"

View File

@ -40,9 +40,9 @@
#include <asm/mach/time.h>
#include <asm/system_info.h>
#include <asm/memblock.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -18,8 +18,8 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -21,8 +21,8 @@
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -19,9 +19,10 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include <mach/mx53.h>
#include "common.h"
/*
* Lookup table for attaching a specific name and platform_data pointer to
* devices as they get created by of_platform_populate(). Ideally this table

View File

@ -33,10 +33,10 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/system_misc.h>
#include <mach/common.h>
#include <mach/cpuidle.h>
#include <mach/hardware.h>
#include "common.h"
void imx6q_restart(char mode, const char *cmd)
{

View File

@ -36,9 +36,9 @@
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -23,9 +23,9 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "devices-imx1.h"
#include "iomux-mx1.h"

View File

@ -18,13 +18,13 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/physmap.h>
#include <linux/gpio.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include "common.h"
#include "devices-imx21.h"
#include "iomux-mx21.h"

View File

@ -37,9 +37,9 @@
#include <asm/mach/time.h>
#include <asm/memory.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/mx25.h>
#include "common.h"
#include "devices-imx25.h"
#include "iomux-mx25.h"

View File

@ -37,10 +37,10 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/ulpi.h>
#include "3ds_debugboard.h"
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -21,13 +21,13 @@
#include <linux/mtd/physmap.h>
#include <linux/i2c.h>
#include <linux/irq.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -37,10 +37,10 @@
#include <asm/memory.h>
#include <asm/mach/map.h>
#include <asm/memblock.h>
#include <mach/common.h>
#include <mach/ulpi.h>
#include "3ds_debugboard.h"
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -28,7 +28,6 @@
#include <asm/mach/time.h>
#include <asm/memory.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/hardware.h>
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
@ -37,6 +36,7 @@
#include <linux/mfd/wm8350/pmic.h>
#endif
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -43,10 +43,10 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/ulpi.h>
#include "board-mx31lilly.h"
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -40,10 +40,10 @@
#include <asm/setup.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/ulpi.h>
#include "board-mx31lite.h"
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -42,12 +42,12 @@
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/memblock.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/ulpi.h>
#include <linux/platform_data/asoc-imx-ssi.h>
#include "board-mx31moboard.h"
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -44,12 +44,12 @@
#include <asm/memblock.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <video/platform_lcd.h>
#include <media/soc_camera.h>
#include "3ds_debugboard.h"
#include "common.h"
#include "devices-imx35.h"
#include "iomux-mx35.h"

View File

@ -24,7 +24,6 @@
#include <linux/delay.h>
#include <linux/io.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <asm/irq.h>
@ -33,6 +32,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include "common.h"
#include "devices-imx50.h"
#include "iomux-mx50.h"

View File

@ -20,9 +20,9 @@
#include <asm/mach/time.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "3ds_debugboard.h"
#include "common.h"
#include "devices-imx51.h"
#include "iomux-mx51.h"

View File

@ -20,7 +20,6 @@
#include <linux/spi/flash.h>
#include <linux/spi/spi.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <asm/setup.h>
@ -28,6 +27,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include "common.h"
#include "devices-imx51.h"
#include "cpu_op-mx51.h"
#include "iomux-mx51.h"

View File

@ -21,7 +21,6 @@
#include <linux/mtd/physmap.h>
#include <linux/i2c.h>
#include <linux/irq.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@ -30,6 +29,7 @@
#include <linux/gpio.h>
#include <linux/i2c/pca953x.h>
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -32,11 +32,11 @@
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <asm/mach/time.h>
#include <mach/ulpi.h>
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -42,10 +42,10 @@
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/memblock.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/ulpi.h>
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"
#include "pcm037.h"

View File

@ -11,11 +11,10 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <mach/common.h>
#include <asm/mach-types.h>
#include "pcm037.h"
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -33,11 +33,11 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/ulpi.h>
#include "board-pcm038.h"
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -34,9 +34,9 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/ulpi.h>
#include "common.h"
#include "devices-imx35.h"
#include "iomux-mx35.h"

View File

@ -26,10 +26,10 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <asm/page.h>
#include <asm/setup.h>
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -20,9 +20,9 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "devices-imx1.h"
#include "iomux-mx1.h"

View File

@ -29,12 +29,12 @@
#include <asm/mach/time.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <linux/i2c.h>
#include <linux/i2c/at24.h>
#include <linux/mfd/mc13xxx.h>
#include "common.h"
#include "devices-imx35.h"
#include "iomux-mx35.h"

View File

@ -22,9 +22,9 @@
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "iomux-v1.h"
static struct map_desc imx_io_desc[] __initdata = {

View File

@ -22,10 +22,10 @@
#include <linux/init.h>
#include <linux/pinctrl/machine.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <asm/pgtable.h>
#include <asm/mach/map.h>
#include "common.h"
#include "devices/devices-common.h"
#include "iomux-v1.h"

View File

@ -24,10 +24,10 @@
#include <asm/pgtable.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/mx25.h>
#include "common.h"
#include "devices/devices-common.h"
#include "iomux-v3.h"

View File

@ -22,10 +22,10 @@
#include <linux/init.h>
#include <linux/pinctrl/machine.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <asm/pgtable.h>
#include <asm/mach/map.h>
#include "common.h"
#include "devices/devices-common.h"
#include "iomux-v1.h"

View File

@ -26,9 +26,9 @@
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "crmregs-imx3.h"
#include "devices/devices-common.h"
#include "iomux-v3.h"

View File

@ -19,8 +19,8 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "common.h"
#include "devices/devices-common.h"
#include "iomux-v3.h"

View File

@ -31,9 +31,9 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "board-mx31lilly.h"
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -32,9 +32,9 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include "board-mx31lite.h"
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -22,10 +22,10 @@
#include <linux/usb/otg.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/ulpi.h>
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -24,12 +24,12 @@
#include <linux/usb/otg.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/ulpi.h>
#include <media/soc_camera.h>
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -23,13 +23,13 @@
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/ulpi.h>
#include <media/soc_camera.h>
#include "board-mx31moboard.h"
#include "common.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"

View File

@ -23,9 +23,9 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"

View File

@ -16,9 +16,10 @@
#include <asm/smp_scu.h>
#include <asm/hardware/gic.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
static void __iomem *scu_base;
static struct map_desc scu_io_desc __initdata = {

View File

@ -9,8 +9,9 @@
* http://www.gnu.org/copyleft/gpl.html
*/
#include <linux/io.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
#include "crmregs-imx3.h"
#include "devices/devices-common.h"

View File

@ -16,9 +16,10 @@
#include <asm/cacheflush.h>
#include <asm/system_misc.h>
#include <asm/tlbflush.h>
#include <mach/common.h>
#include <mach/cpuidle.h>
#include <mach/hardware.h>
#include "common.h"
#include "crm-regs-imx5.h"
/*

View File

@ -18,9 +18,10 @@
#include <asm/proc-fns.h>
#include <asm/suspend.h>
#include <asm/hardware/cache-l2x0.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include "common.h"
extern unsigned long phys_l2x0_saved_regs;
static int imx6q_suspend_finish(unsigned long val)

View File

@ -23,11 +23,12 @@
#include <linux/delay.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <asm/system_misc.h>
#include <asm/proc-fns.h>
#include <asm/mach-types.h>
#include "common.h"
static void __iomem *wdog_base;
/*

View File

@ -30,7 +30,8 @@
#include <mach/hardware.h>
#include <asm/sched_clock.h>
#include <asm/mach/time.h>
#include <mach/common.h>
#include "common.h"
/*
* There are 2 versions of the timer hardware on Freescale MXC hardware.

View File

@ -22,9 +22,9 @@
#include <asm/exception.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include "common.h"
#include "irq-common.h"
/*