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
+1 -1
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 */
+2 -1
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)))
+2 -1
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)))
+2 -1
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)
+2 -1
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)))
+1 -1
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", };
+1 -1
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;
+1 -1
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", };
+2 -1
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
+1 -1
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
+2 -1
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;
-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",
+2 -1
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;
+1 -1
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"
@@ -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"
@@ -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"
@@ -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"
+2 -1
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)
{
+2 -1
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),

Some files were not shown because too many files have changed in this diff Show More