summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-10-11 09:09:29 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-17 20:22:02 +0200
commitb1b76f60279aa53a9ba65acc2be028cb7c415d48 (patch)
tree7fc818a005bd612c309bdffaa19d4429b8119e33 /drivers
parentee372b8f281debe7564318367e23668a605092aa (diff)
downloadbarebox-b1b76f60279aa53a9ba65acc2be028cb7c415d48.tar.gz
barebox-b1b76f60279aa53a9ba65acc2be028cb7c415d48.tar.xz
ARM i.MX: get rid of imx-regs.h
- remove now unused __REG definitions - include individual SoC register files instead of imx-regs.h - move IMX_GPIO_NR to generic.h - finally remove imx-regs.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/nand_imx.c1
-rw-r--r--drivers/net/fec_imx.c1
-rw-r--r--drivers/serial/serial_imx.c1
-rw-r--r--drivers/video/imx-ipu-fb.c2
-rw-r--r--drivers/video/imx.c1
5 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c
index 0489d098b7..58dbd707eb 100644
--- a/drivers/mtd/nand/nand_imx.c
+++ b/drivers/mtd/nand/nand_imx.c
@@ -26,7 +26,6 @@
#include <linux/mtd/nand.h>
#include <mach/generic.h>
#include <mach/imx-nand.h>
-#include <mach/imx-regs.h>
#include <io.h>
#include <errno.h>
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 3432d04988..3b8b5f4010 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -30,7 +30,6 @@
#include <asm/mmu.h>
#include <mach/generic.h>
-#include <mach/imx-regs.h>
#include <mach/clock.h>
#ifndef CONFIG_ARCH_MXS
# include <mach/iim.h>
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index e3fe6ad567..694eac2918 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -15,7 +15,6 @@
*/
#include <common.h>
-#include <mach/imx-regs.h>
#include <driver.h>
#include <init.h>
#include <malloc.h>
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index 5b9d7d57d8..a29920d7dd 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -20,7 +20,7 @@
#include <common.h>
#include <init.h>
#include <io.h>
-#include <mach/imx-regs.h>
+#include <mach/imx35-regs.h>
#include <fb.h>
#include <mach/imxfb.h>
#include <malloc.h>
diff --git a/drivers/video/imx.c b/drivers/video/imx.c
index ae4c671cae..39ecf6ae9f 100644
--- a/drivers/video/imx.c
+++ b/drivers/video/imx.c
@@ -24,7 +24,6 @@
#include <init.h>
#include <linux/clk.h>
#include <linux/err.h>
-#include <mach/imx-regs.h>
#include <asm-generic/div64.h>
#define LCDC_SSA 0x00