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

Commit 50f2de61 authored by Shawn Guo's avatar Shawn Guo
Browse files

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



It moves a bunch of header files included in hardware.h and itself
from mach-imx/include/mach to mach-imx, and updates users to include
hardware.h rather than mach/hardware.h.  The files in mach-imx/devices
will need to include "../hardware.h".

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 6dde5ac5

arch/arm/mach-imx/3ds_debugboard.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/regulator/machine.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/fixed.h>





#include <mach/hardware.h>

#include "hardware.h"





/* LAN9217 ethernet base address */

/* LAN9217 ethernet base address */

#define LAN9217_BASE_ADDR(n)	(n + 0x0)

#define LAN9217_BASE_ADDR(n)	(n + 0x0)

arch/arm/mach-imx/avic.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <linux/of.h>

#include <linux/of.h>

#include <asm/mach/irq.h>

#include <asm/mach/irq.h>

#include <asm/exception.h>

#include <asm/exception.h>

#include <mach/hardware.h>

#include <mach/irqs.h>

#include <mach/irqs.h>





#include "common.h"

#include "common.h"

#include "hardware.h"

#include "irq-common.h"

#include "irq-common.h"





#define AVIC_INTCNTL		0x00	/* int control reg */

#define AVIC_INTCNTL		0x00	/* int control reg */

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,10 +22,9 @@ 
#include <linux/clkdev.h>

#include <linux/clkdev.h>

#include <linux/err.h>

#include <linux/err.h>





#include <mach/hardware.h>



#include "clk.h"

#include "clk.h"

#include "common.h"

#include "common.h"

#include "hardware.h"





/* CCM register addresses */

/* CCM register addresses */

#define IO_ADDR_CCM(off)	(MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR + (off)))

#define IO_ADDR_CCM(off)	(MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR + (off)))

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -25,10 +25,9 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/err.h>

#include <linux/err.h>





#include <mach/hardware.h>



#include "clk.h"

#include "clk.h"

#include "common.h"

#include "common.h"

#include "hardware.h"





#define IO_ADDR_CCM(off)	(MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR + (off)))

#define IO_ADDR_CCM(off)	(MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR + (off)))

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -24,11 +24,10 @@ 
#include <linux/clkdev.h>

#include <linux/clkdev.h>

#include <linux/err.h>

#include <linux/err.h>





#include <mach/hardware.h>

#include <mach/mx25.h>



#include "clk.h"

#include "clk.h"

#include "common.h"

#include "common.h"

#include "hardware.h"

#include "mx25.h"





#define CRM_BASE	MX25_IO_ADDRESS(MX25_CRM_BASE_ADDR)

#define CRM_BASE	MX25_IO_ADDRESS(MX25_CRM_BASE_ADDR)