From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: linux-omap@vger.kernel.org
Subject: [PATCH 02/13] ARM: OMAP: No need to include board-h2.h from hardware.h
Date: Thu, 26 Feb 2009 15:54:51 -0800 [thread overview]
Message-ID: <20090226235451.20192.81270.stgit@localhost> (raw)
In-Reply-To: <20090226235042.20192.38338.stgit@localhost>
Also move board-h2.h to mach-omap1.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap1/board-h2-mmc.c | 2 ++
arch/arm/mach-omap1/board-h2.c | 5 +++++
arch/arm/mach-omap1/board-h2.h | 5 +----
arch/arm/plat-omap/include/mach/hardware.h | 4 ----
4 files changed, 8 insertions(+), 8 deletions(-)
rename arch/arm/{plat-omap/include/mach/board-h2.h => mach-omap1/board-h2.h} (90%)
diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
index 409fa56..44d4a96 100644
--- a/arch/arm/mach-omap1/board-h2-mmc.c
+++ b/arch/arm/mach-omap1/board-h2-mmc.c
@@ -19,6 +19,8 @@
#include <mach/mmc.h>
#include <mach/gpio.h>
+#include "board-h2.h"
+
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
static int mmc_set_power(struct device *dev, int slot, int power_on,
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 0d784a7..b31b6d9 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -46,6 +46,11 @@
#include <mach/keypad.h>
#include <mach/common.h>
+#include "board-h2.h"
+
+/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
+#define OMAP1610_ETHR_START 0x04000300
+
static int h2_keymap[] = {
KEY(0, 0, KEY_LEFT),
KEY(0, 1, KEY_RIGHT),
diff --git a/arch/arm/plat-omap/include/mach/board-h2.h b/arch/arm/mach-omap1/board-h2.h
similarity index 90%
rename from arch/arm/plat-omap/include/mach/board-h2.h
rename to arch/arm/mach-omap1/board-h2.h
index 15531c8..315e266 100644
--- a/arch/arm/plat-omap/include/mach/board-h2.h
+++ b/arch/arm/mach-omap1/board-h2.h
@@ -1,5 +1,5 @@
/*
- * arch/arm/plat-omap/include/mach/board-h2.h
+ * arch/arm/mach-omap1/board-h2.h
*
* Hardware definitions for TI OMAP1610 H2 board.
*
@@ -29,9 +29,6 @@
#ifndef __ASM_ARCH_OMAP_H2_H
#define __ASM_ARCH_OMAP_H2_H
-/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
-#define OMAP1610_ETHR_START 0x04000300
-
#define H2_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */)
# define H2_TPS_GPIO_MMC_PWR_EN (H2_TPS_GPIO_BASE + 3)
diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h
index 5b59188..ac4d8d0 100644
--- a/arch/arm/plat-omap/include/mach/hardware.h
+++ b/arch/arm/plat-omap/include/mach/hardware.h
@@ -298,10 +298,6 @@
#include "board-innovator.h"
#endif
-#ifdef CONFIG_MACH_OMAP_H2
-#include "board-h2.h"
-#endif
-
#ifdef CONFIG_MACH_OMAP_H3
#include "board-h3.h"
#endif
next prev parent reply other threads:[~2009-02-26 23:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-26 23:52 [PATCH 00/13] Omap header clean-up for next merge window Tony Lindgren
2009-02-26 23:53 ` [PATCH 01/13] ARM: OMAP: No need to include board-perseus2.h or board-fsample.h from hardware.h Tony Lindgren
2009-02-26 23:54 ` Tony Lindgren [this message]
2009-02-26 23:56 ` [PATCH 03/13] ARM: OMAP: No need to include board-h3.h " Tony Lindgren
2009-02-26 23:57 ` [PATCH 04/13] ARM: OMAP: No need to include board-innovator.h " Tony Lindgren
2009-02-26 23:58 ` [PATCH 05/13] ARM: OMAP: No need to include board-osk.h " Tony Lindgren
2009-02-26 23:59 ` [PATCH 06/13] ARM: OMAP: No need to include board-palm*.h " Tony Lindgren
2009-02-27 0:01 ` [PATCH 07/13] ARM: OMAP: No need to include board-omap2430sdp.h " Tony Lindgren
2009-02-27 0:13 ` Felipe Balbi
2009-02-27 3:11 ` Tony Lindgren
2009-02-27 0:02 ` [PATCH 08/13] ARM: OMAP: No need to include board-apollon.h " Tony Lindgren
2009-02-27 0:03 ` [PATCH 09/13] ARM: OMAP: No need to include board-h4.h " Tony Lindgren
2009-02-27 0:05 ` [PATCH 10/13] ARM: OMAP: No need to include board-ldp.h " Tony Lindgren
2009-02-27 0:06 ` [PATCH 11/13] ARM: OMAP: No need to include board-overo.h " Tony Lindgren
2009-02-27 0:07 ` [PATCH 12/13] ARM: OMAP: No need to include board-nokia.h " Tony Lindgren
2009-02-27 0:08 ` [PATCH 13/13] ARM: OMAP: Remove remaining board-*.h includes " Tony Lindgren
2009-02-27 20:11 ` [PATCH 00/13] Omap header clean-up for next merge window Russell King - ARM Linux
2009-03-04 17:53 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090226235451.20192.81270.stgit@localhost \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.arm.linux.org.uk \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox