All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: linux-omap@vger.kernel.org
Subject: [PATCH 03/13] ARM: OMAP: No need to include board-h3.h from hardware.h
Date: Thu, 26 Feb 2009 15:56:08 -0800	[thread overview]
Message-ID: <20090226235608.20192.53441.stgit@localhost> (raw)
In-Reply-To: <20090226235042.20192.38338.stgit@localhost>

Also move board-h3.h to mach-omap1.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap1/board-h3-mmc.c         |    2 ++
 arch/arm/mach-omap1/board-h3.c             |    5 +++++
 arch/arm/mach-omap1/board-h3.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-h3.h => mach-omap1/board-h3.h} (90%)

diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c
index fdfe793..0d8a3c1 100644
--- a/arch/arm/mach-omap1/board-h3-mmc.c
+++ b/arch/arm/mach-omap1/board-h3-mmc.c
@@ -19,6 +19,8 @@
 #include <mach/mmc.h>
 #include <mach/gpio.h>
 
+#include "board-h3.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-h3.c b/arch/arm/mach-omap1/board-h3.c
index bf08b6a..4b872f3 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -50,6 +50,11 @@
 #include <mach/dma.h>
 #include <mach/common.h>
 
+#include "board-h3.h"
+
+/* In OMAP1710 H3 the Ethernet is directly connected to CS1 */
+#define OMAP1710_ETHR_START		0x04000300
+
 #define H3_TS_GPIO	48
 
 static int h3_keymap[] = {
diff --git a/arch/arm/plat-omap/include/mach/board-h3.h b/arch/arm/mach-omap1/board-h3.h
similarity index 90%
rename from arch/arm/plat-omap/include/mach/board-h3.h
rename to arch/arm/mach-omap1/board-h3.h
index 1888326..78de535 100644
--- a/arch/arm/plat-omap/include/mach/board-h3.h
+++ b/arch/arm/mach-omap1/board-h3.h
@@ -1,5 +1,5 @@
 /*
- * arch/arm/plat-omap/include/mach/board-h3.h
+ * arch/arm/mach-omap1/board-h3.h
  *
  * Copyright (C) 2001 RidgeRun, Inc.
  * Copyright (C) 2004 Texas Instruments, Inc.
@@ -27,9 +27,6 @@
 #ifndef __ASM_ARCH_OMAP_H3_H
 #define __ASM_ARCH_OMAP_H3_H
 
-/* In OMAP1710 H3 the Ethernet is directly connected to CS1 */
-#define OMAP1710_ETHR_START		0x04000300
-
 #define H3_TPS_GPIO_BASE		(OMAP_MAX_GPIO_LINES + 16 /* MPUIO */)
 #	define H3_TPS_GPIO_MMC_PWR_EN	(H3_TPS_GPIO_BASE + 4)
 
diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h
index ac4d8d0..040244c 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_H3
-#include "board-h3.h"
-#endif
-
 #ifdef CONFIG_MACH_OMAP_H4
 #include "board-h4.h"
 #endif


  parent reply	other threads:[~2009-02-26 23:56 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 ` [PATCH 02/13] ARM: OMAP: No need to include board-h2.h " Tony Lindgren
2009-02-26 23:56 ` Tony Lindgren [this message]
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=20090226235608.20192.53441.stgit@localhost \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.arm.linux.org.uk \
    --cc=linux-omap@vger.kernel.org \
    --subject='Re: [PATCH 03/13] ARM: OMAP: No need to include board-h3.h from hardware.h' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.