ARM: OMAP2+: Make l4_3xxx.h local

This can be local to mach-omap2.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/l4_3xxx.h b/arch/arm/mach-omap2/l4_3xxx.h
new file mode 100644 (file)
index 0000000..881a858
--- /dev/null
+++ b/arch/arm/mach-omap2/l4_3xxx.h
@@ -0,0 +1,34 @@
+/*
+ * arch/arm/plat-omap/include/mach/l4_3xxx.h - L4 firewall definitions
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Paul Walmsley
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_L4_3XXX_H
+#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_L4_3XXX_H
+
+/* L4 CORE */
+#define OMAP3_L4_CORE_FW_I2C1_REGION                           21
+#define OMAP3_L4_CORE_FW_I2C1_TA_REGION                                22
+#define OMAP3_L4_CORE_FW_I2C2_REGION                           23
+#define OMAP3_L4_CORE_FW_I2C2_TA_REGION                                24
+#define OMAP3_L4_CORE_FW_I2C3_REGION                           73
+#define OMAP3_L4_CORE_FW_I2C3_TA_REGION                                74
+
+/* Display Sub system (DSS) */
+#define OMAP3_L4_CORE_FW_DSS_PROT_GROUP                                2
+
+#define OMAP3_L4_CORE_FW_DSS_DSI_REGION                                104
+#define OMAP3ES1_L4_CORE_FW_DSS_CORE_REGION                    3
+#define OMAP3_L4_CORE_FW_DSS_CORE_REGION                       4
+#define OMAP3_L4_CORE_FW_DSS_DISPC_REGION                      4
+#define OMAP3_L4_CORE_FW_DSS_RFBI_REGION                       5
+#define OMAP3_L4_CORE_FW_DSS_VENC_REGION                       6
+#define OMAP3_L4_CORE_FW_DSS_TA_REGION                         7
+#endif

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index d7710560bb7b6a3576dbd97cc4eb0a0a5a4aee60..9f85c04202d1c9c476f15785f191e57f0698e58e 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -21,7 +21,7 @@
 #include <plat/dma.h>
 #include <plat/serial.h>
 #include "l3_3xxx.h"
-#include <plat/l4_3xxx.h>
+#include "l4_3xxx.h"
 #include <plat/i2c.h>
 #include <plat/mmc.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>

diff --git a/arch/arm/plat-omap/include/plat/l4_3xxx.h b/arch/arm/plat-omap/include/plat/l4_3xxx.h
deleted file mode 100644 (file)
index 881a858..0000000
--- a/arch/arm/plat-omap/include/plat/l4_3xxx.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/arm/plat-omap/include/mach/l4_3xxx.h - L4 firewall definitions
- *
- * Copyright (C) 2009 Nokia Corporation
- * Paul Walmsley
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- */
-#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_L4_3XXX_H
-#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_L4_3XXX_H
-
-/* L4 CORE */
-#define OMAP3_L4_CORE_FW_I2C1_REGION                           21
-#define OMAP3_L4_CORE_FW_I2C1_TA_REGION                                22
-#define OMAP3_L4_CORE_FW_I2C2_REGION                           23
-#define OMAP3_L4_CORE_FW_I2C2_TA_REGION                                24
-#define OMAP3_L4_CORE_FW_I2C3_REGION                           73
-#define OMAP3_L4_CORE_FW_I2C3_TA_REGION                                74
-
-/* Display Sub system (DSS) */
-#define OMAP3_L4_CORE_FW_DSS_PROT_GROUP                                2
-
-#define OMAP3_L4_CORE_FW_DSS_DSI_REGION                                104
-#define OMAP3ES1_L4_CORE_FW_DSS_CORE_REGION                    3
-#define OMAP3_L4_CORE_FW_DSS_CORE_REGION                       4
-#define OMAP3_L4_CORE_FW_DSS_DISPC_REGION                      4
-#define OMAP3_L4_CORE_FW_DSS_RFBI_REGION                       5
-#define OMAP3_L4_CORE_FW_DSS_VENC_REGION                       6
-#define OMAP3_L4_CORE_FW_DSS_TA_REGION                         7
-#endif