From 7a17b47240ab4a1de882f4975416dd08eb545450 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 4 Dec 2014 12:43:45 +0100
Subject: ARM: MXS: remove unnecessary mach/imx-regs.h include

And replace the ones needed with the SoC specific header.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-mxs/clocksource-imx23.c | 2 +-
 arch/arm/mach-mxs/clocksource-imx28.c | 2 +-
 arch/arm/mach-mxs/ocotp.c             | 1 -
 arch/arm/mach-mxs/soc-imx23.c         | 2 +-
 arch/arm/mach-mxs/soc-imx28.c         | 2 +-
 arch/arm/mach-mxs/usb-imx23.c         | 2 +-
 arch/arm/mach-mxs/usb-imx28.c         | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'arch/arm')

diff --git a/arch/arm/mach-mxs/clocksource-imx23.c b/arch/arm/mach-mxs/clocksource-imx23.c
index d9b7c1a570..8279ee2f2d 100644
--- a/arch/arm/mach-mxs/clocksource-imx23.c
+++ b/arch/arm/mach-mxs/clocksource-imx23.c
@@ -17,7 +17,7 @@
 #include <init.h>
 #include <clock.h>
 #include <notifier.h>
-#include <mach/imx-regs.h>
+#include <mach/imx23-regs.h>
 #include <mach/clock.h>
 #include <io.h>
 
diff --git a/arch/arm/mach-mxs/clocksource-imx28.c b/arch/arm/mach-mxs/clocksource-imx28.c
index d26aa93c36..4f38af68b4 100644
--- a/arch/arm/mach-mxs/clocksource-imx28.c
+++ b/arch/arm/mach-mxs/clocksource-imx28.c
@@ -16,7 +16,7 @@
 #include <init.h>
 #include <clock.h>
 #include <notifier.h>
-#include <mach/imx-regs.h>
+#include <mach/imx28-regs.h>
 #include <mach/clock.h>
 #include <io.h>
 
diff --git a/arch/arm/mach-mxs/ocotp.c b/arch/arm/mach-mxs/ocotp.c
index c7c24e0980..abdd445b5d 100644
--- a/arch/arm/mach-mxs/ocotp.c
+++ b/arch/arm/mach-mxs/ocotp.c
@@ -27,7 +27,6 @@
 
 #include <mach/generic.h>
 #include <mach/ocotp.h>
-#include <mach/imx-regs.h>
 #include <mach/power.h>
 
 #define DRIVERNAME "ocotp"
diff --git a/arch/arm/mach-mxs/soc-imx23.c b/arch/arm/mach-mxs/soc-imx23.c
index 825ea20a55..b21986536f 100644
--- a/arch/arm/mach-mxs/soc-imx23.c
+++ b/arch/arm/mach-mxs/soc-imx23.c
@@ -16,7 +16,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <mach/imx-regs.h>
+#include <mach/imx23-regs.h>
 #include <io.h>
 
 #define HW_CLKCTRL_RESET 0x120
diff --git a/arch/arm/mach-mxs/soc-imx28.c b/arch/arm/mach-mxs/soc-imx28.c
index 01bc20a6f0..c7252f537e 100644
--- a/arch/arm/mach-mxs/soc-imx28.c
+++ b/arch/arm/mach-mxs/soc-imx28.c
@@ -16,7 +16,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <mach/imx-regs.h>
+#include <mach/imx28-regs.h>
 #include <io.h>
 
 #define HW_CLKCTRL_RESET 0x1e0
diff --git a/arch/arm/mach-mxs/usb-imx23.c b/arch/arm/mach-mxs/usb-imx23.c
index 8bed11deb8..e626396f9d 100644
--- a/arch/arm/mach-mxs/usb-imx23.c
+++ b/arch/arm/mach-mxs/usb-imx23.c
@@ -15,7 +15,7 @@
  */
 #include <common.h>
 #include <io.h>
-#include <mach/imx-regs.h>
+#include <mach/imx23-regs.h>
 #include <mach/power.h>
 
 #define USBPHY_PWD			(IMX_USBPHY_BASE + 0x0)
diff --git a/arch/arm/mach-mxs/usb-imx28.c b/arch/arm/mach-mxs/usb-imx28.c
index 1c982a0266..a87d4f6cbc 100644
--- a/arch/arm/mach-mxs/usb-imx28.c
+++ b/arch/arm/mach-mxs/usb-imx28.c
@@ -17,7 +17,7 @@
 #include <common.h>
 #include <io.h>
 #include <errno.h>
-#include <mach/imx-regs.h>
+#include <mach/imx28-regs.h>
 
 #define POWER_CTRL			(IMX_POWER_BASE + 0x0)
 #define POWER_CTRL_CLKGATE		0x40000000
-- 
cgit v1.2.3