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

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
...@@ -21,7 +21,7 @@ ...@@ -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)
......
...@@ -24,10 +24,10 @@ ...@@ -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 */
......
...@@ -22,10 +22,9 @@ ...@@ -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)))
......
...@@ -25,10 +25,9 @@ ...@@ -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)))
......
...@@ -24,11 +24,10 @@ ...@@ -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)
......
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/of.h> #include <linux/of.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) (MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR + (off))) #define IO_ADDR_CCM(off) (MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR + (off)))
......
...@@ -22,12 +22,11 @@ ...@@ -22,12 +22,11 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/of.h> #include <linux/of.h>
#include <mach/hardware.h>
#include <mach/mx31.h>
#include "clk.h" #include "clk.h"
#include "common.h" #include "common.h"
#include "crmregs-imx3.h" #include "crmregs-imx3.h"
#include "hardware.h"
#include "mx31.h"
static const char *mcu_main_sel[] = { "spll", "mpll", }; static const char *mcu_main_sel[] = { "spll", "mpll", };
static const char *per_sel[] = { "per_div", "ipg", }; static const char *per_sel[] = { "per_div", "ipg", };
......
...@@ -14,11 +14,10 @@ ...@@ -14,11 +14,10 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/err.h> #include <linux/err.h>
#include <mach/hardware.h>
#include "crmregs-imx3.h" #include "crmregs-imx3.h"
#include "clk.h" #include "clk.h"
#include "common.h" #include "common.h"
#include "hardware.h"
struct arm_ahb_div { struct arm_ahb_div {
unsigned char arm, ahb, sel; unsigned char arm, ahb, sel;
......
...@@ -14,11 +14,10 @@ ...@@ -14,11 +14,10 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/err.h> #include <linux/err.h>
#include <mach/hardware.h>
#include "crm-regs-imx5.h" #include "crm-regs-imx5.h"
#include "clk.h" #include "clk.h"
#include "common.h" #include "common.h"
#include "hardware.h"
/* Low-power Audio Playback Mode clock */ /* Low-power Audio Playback Mode clock */
static const char *lp_apm_sel[] = { "osc", }; static const char *lp_apm_sel[] = { "osc", };
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kernel.h> #include <linux/kernel.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"
/** /**
* pll v1 * pll v1
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include "iim.h" #include "iim.h"
#include "hardware.h"
static int mx25_cpu_rev = -1; static int mx25_cpu_rev = -1;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <mach/hardware.h> #include "hardware.h"
static int mx27_cpu_rev = -1; static int mx27_cpu_rev = -1;
static int mx27_cpu_partnumber; static int mx27_cpu_partnumber;
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "hardware.h"
#include "iim.h" #include "iim.h"
static int mx31_cpu_rev = -1; static int mx31_cpu_rev = -1;
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include "hardware.h"
#include "iim.h" #include "iim.h"
static int mx35_cpu_rev = -1; static int mx35_cpu_rev = -1;
......
...@@ -15,9 +15,10 @@ ...@@ -15,9 +15,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <mach/hardware.h>
#include <linux/io.h> #include <linux/io.h>
#include "hardware.h"
static int mx5_cpu_rev = -1; static int mx5_cpu_rev = -1;
#define IIM_SREV 0x24 #define IIM_SREV 0x24
......
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include "hardware.h"
unsigned int __mxc_cpu_type; unsigned int __mxc_cpu_type;
EXPORT_SYMBOL(__mxc_cpu_type); EXPORT_SYMBOL(__mxc_cpu_type);
......
...@@ -13,9 +13,10 @@ ...@@ -13,9 +13,10 @@
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/types.h> #include <linux/types.h>
#include <mach/hardware.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include "hardware.h"
static struct cpu_op mx51_cpu_op[] = { static struct cpu_op mx51_cpu_op[] = {
{ {
.cpu_rate = 160000000,}, .cpu_rate = 160000000,},
......
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <mach/hardware.h>
#include "hardware.h"
#define CLK32_FREQ 32768 #define CLK32_FREQ 32768
#define NANOSECOND (1000 * 1000 * 1000) #define NANOSECOND (1000 * 1000 * 1000)
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_ahci_imx_data_entry_single(soc, _devid) \ #define imx_ahci_imx_data_entry_single(soc, _devid) \
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
*/ */
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_fec_data_entry_single(soc, _devid) \ #define imx_fec_data_entry_single(soc, _devid) \
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_flexcan_data_entry_single(soc, _id, _hwid, _size) \ #define imx_flexcan_data_entry_single(soc, _id, _hwid, _size) \
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_fsl_usb2_udc_data_entry_single(soc) \ #define imx_fsl_usb2_udc_data_entry_single(soc) \
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include <asm/sizes.h> #include <asm/sizes.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
struct platform_device *__init imx_add_gpio_keys( struct platform_device *__init imx_add_gpio_keys(
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_imx_fb_data_entry_single(soc, _devid, _size) \ #define imx_imx_fb_data_entry_single(soc, _devid, _size) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_imx_i2c_data_entry_single(soc, _devid, _id, _hwid, _size) \ #define imx_imx_i2c_data_entry_single(soc, _devid, _id, _hwid, _size) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_imx_keypad_data_entry_single(soc, _size) \ #define imx_imx_keypad_data_entry_single(soc, _size) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_imx_ssi_data_entry(soc, _id, _hwid, _size) \ #define imx_imx_ssi_data_entry(soc, _id, _hwid, _size) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_imx_uart_3irq_data_entry(soc, _id, _hwid, _size) \ #define imx_imx_uart_3irq_data_entry(soc, _id, _hwid, _size) \
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <asm/sizes.h> #include <asm/sizes.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_imx2_wdt_data_entry_single(soc, _id, _hwid, _size) \ #define imx_imx2_wdt_data_entry_single(soc, _id, _hwid, _size) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_imx21_hcd_data_entry_single(soc) \ #define imx_imx21_hcd_data_entry_single(soc) \
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#ifdef CONFIG_SOC_IMX27 #ifdef CONFIG_SOC_IMX27
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_imx_udc_data_entry_single(soc, _size) \ #define imx_imx_udc_data_entry_single(soc, _size) \
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <asm/sizes.h> #include <asm/sizes.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_imxdi_rtc_data_entry_single(soc) \ #define imx_imxdi_rtc_data_entry_single(soc) \
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_ipu_core_entry_single(soc) \ #define imx_ipu_core_entry_single(soc) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_mx1_camera_data_entry_single(soc, _size) \ #define imx_mx1_camera_data_entry_single(soc, _size) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_mx2_camera_data_entry_single(soc, _devid) \ #define imx_mx2_camera_data_entry_single(soc, _devid) \
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_mxc_ehci_data_entry_single(soc, _id, hs) \ #define imx_mxc_ehci_data_entry_single(soc, _id, hs) \
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_mxc_mmc_data_entry_single(soc, _devid, _id, _hwid, _size) \ #define imx_mxc_mmc_data_entry_single(soc, _devid, _id, _hwid, _size) \
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <asm/sizes.h> #include <asm/sizes.h>
#include <mach/hardware.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_mxc_nand_data_entry_single(soc, _devid, _size) \ #define imx_mxc_nand_data_entry_single(soc, _devid, _size) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size) \ #define imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
struct imx_mxc_rnga_data { struct imx_mxc_rnga_data {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_mxc_rtc_data_entry_single(soc, _devid) \ #define imx_mxc_rtc_data_entry_single(soc, _devid) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_mxc_w1_data_entry_single(soc) \ #define imx_mxc_w1_data_entry_single(soc) \
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_pata_imx_data_entry_single(soc, _size) \ #define imx_pata_imx_data_entry_single(soc, _size) \
......
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h>
#include <linux/platform_data/mmc-esdhc-imx.h> #include <linux/platform_data/mmc-esdhc-imx.h>
#include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \ #define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/hardware.h> #include "../hardware.h"
#include "devices-common.h" #include "devices-common.h"
#define imx_spi_imx_data_entry_single(soc, type, _devid, _id, hwid, _size) \ #define imx_spi_imx_data_entry_single(soc, type, _devid, _id, hwid, _size) \
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include <linux/platform_data/usb-ehci-mxc.h> #include <linux/platform_data/usb-ehci-mxc.h>
#include "hardware.h"
#define USBCTRL_OTGBASE_OFFSET 0x600 #define USBCTRL_OTGBASE_OFFSET 0x600
#define MX25_OTG_SIC_SHIFT 29 #define MX25_OTG_SIC_SHIFT 29
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include <linux/platform_data/usb-ehci-mxc.h> #include <linux/platform_data/usb-ehci-mxc.h>
#include "hardware.h"
#define USBCTRL_OTGBASE_OFFSET 0x600 #define USBCTRL_OTGBASE_OFFSET 0x600
#define MX27_OTG_SIC_SHIFT 29 #define MX27_OTG_SIC_SHIFT 29
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include <linux/platform_data/usb-ehci-mxc.h> #include <linux/platform_data/usb-ehci-mxc.h>
#include "hardware.h"
#define USBCTRL_OTGBASE_OFFSET 0x600 #define USBCTRL_OTGBASE_OFFSET 0x600
#define MX31_OTG_SIC_SHIFT 29 #define MX31_OTG_SIC_SHIFT 29
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include <linux/platform_data/usb-ehci-mxc.h> #include <linux/platform_data/usb-ehci-mxc.h>
#include "hardware.h"
#define USBCTRL_OTGBASE_OFFSET 0x600 #define USBCTRL_OTGBASE_OFFSET 0x600
#define MX35_OTG_SIC_SHIFT 29 #define MX35_OTG_SIC_SHIFT 29
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include <linux/platform_data/usb-ehci-mxc.h> #include <linux/platform_data/usb-ehci-mxc.h>
#include "hardware.h"
#define MXC_OTG_OFFSET 0 #define MXC_OTG_OFFSET 0
#define MXC_H1_OFFSET 0x200 #define MXC_H1_OFFSET 0x200
#define MXC_H2_OFFSET 0x400 #define MXC_H2_OFFSET 0x400
......
...@@ -51,11 +51,10 @@ ...@@ -51,11 +51,10 @@
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/err.h> #include <linux/err.h>
#include <mach/hardware.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include "common.h" #include "common.h"
#include "hardware.h"
static struct clock_event_device clockevent_epit; static struct clock_event_device clockevent_epit;
static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED; static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED;
......
...@@ -29,10 +29,9 @@ ...@@ -29,10 +29,9 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "hardware.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
static const int eukrea_mbimx27_pins[] __initconst = { static const int eukrea_mbimx27_pins[] __initconst = {
......
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <video/platform_lcd.h> #include <video/platform_lcd.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/mx25.h>
#include "common.h" #include "common.h"
#include "devices-imx25.h" #include "devices-imx25.h"
#include "hardware.h"
#include "iomux-mx25.h" #include "iomux-mx25.h"
#include "mx25.h"
static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = { static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {
/* LCD */ /* LCD */
......
...@@ -36,10 +36,9 @@ ...@@ -36,10 +36,9 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx35.h" #include "devices-imx35.h"
#include "hardware.h"
#include "iomux-mx35.h" #include "iomux-mx35.h"
static const struct fb_videomode fb_modedb[] = { static const struct fb_videomode fb_modedb[] = {
......
...@@ -36,10 +36,9 @@ ...@@ -36,10 +36,9 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx51.h" #include "devices-imx51.h"
#include "hardware.h"
#include "iomux-mx51.h" #include "iomux-mx51.h"
static iomux_v3_cfg_t eukrea_mbimxsd51_pads[] = { static iomux_v3_cfg_t eukrea_mbimxsd51_pads[] = {
......
...@@ -105,20 +105,20 @@ ...@@ -105,20 +105,20 @@
#define IMX_IO_ADDRESS(x) IOMEM(IMX_IO_P2V(x)) #define IMX_IO_ADDRESS(x) IOMEM(IMX_IO_P2V(x))
#include <mach/mxc.h> #include "mxc.h"
#include <mach/mx6q.h> #include "mx6q.h"
#include <mach/mx50.h> #include "mx50.h"
#include <mach/mx51.h> #include "mx51.h"
#include <mach/mx53.h> #include "mx53.h"
#include <mach/mx3x.h> #include "mx3x.h"
#include <mach/mx31.h> #include "mx31.h"
#include <mach/mx35.h> #include "mx35.h"
#include <mach/mx2x.h> #include "mx2x.h"
#include <mach/mx21.h> #include "mx21.h"
#include <mach/mx27.h> #include "mx27.h"
#include <mach/mx1.h> #include "mx1.h"
#include <mach/mx25.h> #include "mx25.h"
#define imx_map_entry(soc, name, _type) { \ #define imx_map_entry(soc, name, _type) { \
.virtual = soc ## _IO_P2V(soc ## _ ## name ## _BASE_ADDR), \ .virtual = soc ## _IO_P2V(soc ## _ ## name ## _BASE_ADDR), \
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/mx27.h>
#include "common.h" #include "common.h"
#include "mx27.h"
static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = { 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_UART1_BASE_ADDR, "imx21-uart.0", NULL),
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/mx31.h>
#include "common.h" #include "common.h"
#include "mx31.h"
static const struct of_dev_auxdata imx31_auxdata_lookup[] __initconst = { static const struct of_dev_auxdata imx31_auxdata_lookup[] __initconst = {
OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART1_BASE_ADDR, OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART1_BASE_ADDR,
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/mx51.h>
#include "common.h" #include "common.h"
#include "mx51.h"
/* /*
* Lookup table for attaching a specific name and platform_data pointer to * Lookup table for attaching a specific name and platform_data pointer to
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <mach/hardware.h>
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
/* /*
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <mach/hardware.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include "hardware.h"
#include "iomux-v1.h" #include "iomux-v1.h"
static void __iomem *imx_iomuxv1_baseaddr; static void __iomem *imx_iomuxv1_baseaddr;
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <mach/hardware.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include "hardware.h"
#include "iomux-v3.h" #include "iomux-v3.h"
static void __iomem *base; static void __iomem *base;
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#include "hardware.h"
static struct map_desc imx_lluart_desc = { static struct map_desc imx_lluart_desc = {
#ifdef CONFIG_DEBUG_IMX6Q_UART2 #ifdef CONFIG_DEBUG_IMX6Q_UART2
......
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx1.h" #include "devices-imx1.h"
#include "hardware.h"
#include "iomux-mx1.h" #include "iomux-mx1.h"
static const int apf9328_pins[] __initconst = { static const int apf9328_pins[] __initconst = {
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#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 <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
...@@ -51,6 +50,7 @@ ...@@ -51,6 +50,7 @@
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "crmregs-imx3.h" #include "crmregs-imx3.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -19,14 +19,13 @@ ...@@ -19,14 +19,13 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <mach/hardware.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
static const struct imxuart_platform_data uart_pdata __initconst = { static const struct imxuart_platform_data uart_pdata __initconst = {
......
...@@ -34,11 +34,10 @@ ...@@ -34,11 +34,10 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "eukrea-baseboards.h" #include "eukrea-baseboards.h"
#include "hardware.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -37,11 +37,10 @@ ...@@ -37,11 +37,10 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx35.h" #include "devices-imx35.h"
#include "eukrea-baseboards.h" #include "eukrea-baseboards.h"
#include "hardware.h"
#include "iomux-mx35.h" #include "iomux-mx35.h"
static const struct imxuart_platform_data uart_pdata __initconst = { static const struct imxuart_platform_data uart_pdata __initconst = {
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/can/platform/mcp251x.h> #include <linux/can/platform/mcp251x.h>
#include <mach/hardware.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
...@@ -37,6 +35,7 @@ ...@@ -37,6 +35,7 @@
#include "devices-imx51.h" #include "devices-imx51.h"
#include "cpu_op-mx51.h" #include "cpu_op-mx51.h"
#include "eukrea-baseboards.h" #include "eukrea-baseboards.h"
#include "hardware.h"
#include "iomux-mx51.h" #include "iomux-mx51.h"
#define USBH1_RST IMX_GPIO_NR(2, 28) #define USBH1_RST IMX_GPIO_NR(2, 28)
......
...@@ -27,18 +27,18 @@ ...@@ -27,18 +27,18 @@
#include <linux/usb/otg.h> #include <linux/usb/otg.h>
#include <linux/usb/ulpi.h> #include <linux/usb/ulpi.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mx25.h>
#include "common.h" #include "common.h"
#include "devices-imx25.h" #include "devices-imx25.h"
#include "eukrea-baseboards.h" #include "eukrea-baseboards.h"
#include "hardware.h"
#include "iomux-mx25.h" #include "iomux-mx25.h"
#include "mx25.h"
static const struct imxuart_platform_data uart_pdata __initconst = { static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS, .flags = IMXUART_HAVE_RTSCTS,
......
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/system_info.h> #include <asm/system_info.h>
#include <asm/memblock.h> #include <asm/memblock.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "hardware.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
#define TVP5150_RSTN (GPIO_PORTC + 18) #define TVP5150_RSTN (GPIO_PORTC + 18)
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h>
#include "hardware.h"
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "hardware.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
static const int mx27lite_pins[] __initconst = { static const int mx27lite_pins[] __initconst = {
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/mx53.h>
#include "common.h" #include "common.h"
#include "mx53.h"
/* /*
* Lookup table for attaching a specific name and platform_data pointer to * Lookup table for attaching a specific name and platform_data pointer to
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "cpuidle.h" #include "cpuidle.h"
#include "hardware.h"
void imx6q_restart(char mode, const char *cmd) void imx6q_restart(char mode, const char *cmd)
{ {
......
...@@ -36,10 +36,9 @@ ...@@ -36,10 +36,9 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
#define KZM_ARM11_IO_ADDRESS(x) (IOMEM( \ #define KZM_ARM11_IO_ADDRESS(x) (IOMEM( \
......
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx1.h" #include "devices-imx1.h"
#include "hardware.h"
#include "iomux-mx1.h" #include "iomux-mx1.h"
static const int mx1ads_pins[] __initconst = { static const int mx1ads_pins[] __initconst = {
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
...@@ -26,6 +25,7 @@ ...@@ -26,6 +25,7 @@
#include "common.h" #include "common.h"
#include "devices-imx21.h" #include "devices-imx21.h"
#include "hardware.h"
#include "iomux-mx21.h" #include "iomux-mx21.h"
/* /*
......
...@@ -31,17 +31,17 @@ ...@@ -31,17 +31,17 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/usb/otg.h> #include <linux/usb/otg.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mx25.h>
#include "common.h" #include "common.h"
#include "devices-imx25.h" #include "devices-imx25.h"
#include "hardware.h"
#include "iomux-mx25.h" #include "iomux-mx25.h"
#include "mx25.h"
#define MX25PDK_CAN_PWDN IMX_GPIO_NR(4, 6) #define MX25PDK_CAN_PWDN IMX_GPIO_NR(4, 6)
......
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h>
#include "3ds_debugboard.h" #include "3ds_debugboard.h"
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "hardware.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
...@@ -29,6 +28,7 @@ ...@@ -29,6 +28,7 @@
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "hardware.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
/* /*
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <media/soc_camera.h> #include <media/soc_camera.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
...@@ -41,6 +40,7 @@ ...@@ -41,6 +40,7 @@
#include "3ds_debugboard.h" #include "3ds_debugboard.h"
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1 #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
#include <linux/mfd/wm8350/audio.h> #include <linux/mfd/wm8350/audio.h>
...@@ -38,6 +37,7 @@ ...@@ -38,6 +37,7 @@
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
/* Base address of PBC controller */ /* Base address of PBC controller */
......
...@@ -42,11 +42,10 @@ ...@@ -42,11 +42,10 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#include "board-mx31lilly.h" #include "board-mx31lilly.h"
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -39,11 +39,10 @@ ...@@ -39,11 +39,10 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <mach/hardware.h>
#include "board-mx31lite.h" #include "board-mx31lite.h"
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/memblock.h> #include <asm/memblock.h>
#include <mach/hardware.h>
#include <linux/platform_data/asoc-imx-ssi.h> #include <linux/platform_data/asoc-imx-ssi.h>
#include "board-mx31moboard.h" #include "board-mx31moboard.h"
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/memblock.h> #include <asm/memblock.h>
#include <mach/hardware.h>
#include <video/platform_lcd.h> #include <video/platform_lcd.h>
#include <media/soc_camera.h> #include <media/soc_camera.h>
...@@ -51,6 +50,7 @@ ...@@ -51,6 +50,7 @@
#include "3ds_debugboard.h" #include "3ds_debugboard.h"
#include "common.h" #include "common.h"
#include "devices-imx35.h" #include "devices-imx35.h"
#include "hardware.h"
#include "iomux-mx35.h" #include "iomux-mx35.h"
#define GPIO_MC9S08DZ60_GPS_ENABLE 0 #define GPIO_MC9S08DZ60_GPS_ENABLE 0
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -34,6 +32,7 @@ ...@@ -34,6 +32,7 @@
#include "common.h" #include "common.h"
#include "devices-imx50.h" #include "devices-imx50.h"
#include "hardware.h"
#include "iomux-mx50.h" #include "iomux-mx50.h"
#define FEC_EN IMX_GPIO_NR(6, 23) #define FEC_EN IMX_GPIO_NR(6, 23)
......
...@@ -19,11 +19,10 @@ ...@@ -19,11 +19,10 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h>
#include "3ds_debugboard.h" #include "3ds_debugboard.h"
#include "common.h" #include "common.h"
#include "devices-imx51.h" #include "devices-imx51.h"
#include "hardware.h"
#include "iomux-mx51.h" #include "iomux-mx51.h"
#define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28) #define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28)
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <mach/hardware.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
...@@ -30,6 +28,7 @@ ...@@ -30,6 +28,7 @@
#include "common.h" #include "common.h"
#include "devices-imx51.h" #include "devices-imx51.h"
#include "cpu_op-mx51.h" #include "cpu_op-mx51.h"
#include "hardware.h"
#include "iomux-mx51.h" #include "iomux-mx51.h"
#define BABBAGE_USB_HUB_RESET IMX_GPIO_NR(1, 7) #define BABBAGE_USB_HUB_RESET IMX_GPIO_NR(1, 7)
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
...@@ -31,6 +30,7 @@ ...@@ -31,6 +30,7 @@
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "hardware.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
static const int mxt_td60_pins[] __initconst = { static const int mxt_td60_pins[] __initconst = {
......
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/hardware.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "hardware.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/memblock.h> #include <asm/memblock.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
#include "pcm037.h" #include "pcm037.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -33,11 +33,10 @@ ...@@ -33,11 +33,10 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h>
#include "board-pcm038.h" #include "board-pcm038.h"
#include "common.h" #include "common.h"
#include "devices-imx27.h" #include "devices-imx27.h"
#include "hardware.h"
#include "iomux-mx27.h" #include "iomux-mx27.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -33,10 +33,9 @@ ...@@ -33,10 +33,9 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx35.h" #include "devices-imx35.h"
#include "hardware.h"
#include "iomux-mx35.h" #include "iomux-mx35.h"
#include "ulpi.h" #include "ulpi.h"
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
...@@ -31,6 +30,7 @@ ...@@ -31,6 +30,7 @@
#include "common.h" #include "common.h"
#include "devices-imx31.h" #include "devices-imx31.h"
#include "hardware.h"
#include "iomux-mx3.h" #include "iomux-mx3.h"
/* FPGA defines */ /* FPGA defines */
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices-imx1.h" #include "devices-imx1.h"
#include "hardware.h"
#include "iomux-mx1.h" #include "iomux-mx1.h"
/* /*
......
...@@ -28,14 +28,13 @@ ...@@ -28,14 +28,13 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c/at24.h> #include <linux/i2c/at24.h>
#include <linux/mfd/mc13xxx.h> #include <linux/mfd/mc13xxx.h>
#include "common.h" #include "common.h"
#include "devices-imx35.h" #include "devices-imx35.h"
#include "hardware.h"
#include "iomux-mx35.h" #include "iomux-mx35.h"
#define GPIO_LCDPWR IMX_GPIO_NR(1, 2) #define GPIO_LCDPWR IMX_GPIO_NR(1, 2)
......
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "devices/devices-common.h" #include "devices/devices-common.h"
#include "hardware.h"
#include "iomux-v1.h" #include "iomux-v1.h"
static struct map_desc imx_io_desc[] __initdata = { static struct map_desc imx_io_desc[] __initdata = {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment