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

Commit e3372474 authored by Shawn Guo's avatar Shawn Guo
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 3995eb82

arch/arm/mach-imx/avic.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-imx/clk-imx1.c

+2 −1
Original line number Diff line number Diff line
@@ -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)))

arch/arm/mach-imx/clk-imx21.c

+2 −1
Original line number Diff line number Diff line
@@ -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)))

arch/arm/mach-imx/clk-imx25.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-imx/clk-imx27.c

+2 −1
Original line number Diff line number Diff line
@@ -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)))