From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: linux-omap@vger.kernel.org
Subject: [PATCH 12/13] ARM: OMAP: No need to include board-nokia.h from hardware.h
Date: Thu, 26 Feb 2009 16:07:40 -0800 [thread overview]
Message-ID: <20090227000740.20192.91013.stgit@localhost> (raw)
In-Reply-To: <20090226235042.20192.38338.stgit@localhost>
Move the defines to the associated board file and remove
the now unnecessary header file.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/plat-omap/include/mach/board-nokia.h | 54 -------------------------
arch/arm/plat-omap/include/mach/board.h | 3 -
2 files changed, 0 insertions(+), 57 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/mach/board-nokia.h
diff --git a/arch/arm/plat-omap/include/mach/board-nokia.h b/arch/arm/plat-omap/include/mach/board-nokia.h
deleted file mode 100644
index 2abbe00..0000000
--- a/arch/arm/plat-omap/include/mach/board-nokia.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * arch/arm/plat-omap/include/mach/board-nokia.h
- *
- * Information structures for Nokia-specific board config data
- *
- * Copyright (C) 2005 Nokia Corporation
- */
-
-#ifndef _OMAP_BOARD_NOKIA_H
-#define _OMAP_BOARD_NOKIA_H
-
-#include <linux/types.h>
-
-#define OMAP_TAG_NOKIA_BT 0x4e01
-#define OMAP_TAG_WLAN_CX3110X 0x4e02
-#define OMAP_TAG_CBUS 0x4e03
-#define OMAP_TAG_EM_ASIC_BB5 0x4e04
-
-
-#define BT_CHIP_CSR 1
-#define BT_CHIP_TI 2
-
-#define BT_SYSCLK_12 1
-#define BT_SYSCLK_38_4 2
-
-struct omap_bluetooth_config {
- u8 chip_type;
- u8 bt_wakeup_gpio;
- u8 host_wakeup_gpio;
- u8 reset_gpio;
- u8 bt_uart;
- u8 bd_addr[6];
- u8 bt_sysclk;
-};
-
-struct omap_wlan_cx3110x_config {
- u8 chip_type;
- s16 power_gpio;
- s16 irq_gpio;
- s16 spi_cs_gpio;
-};
-
-struct omap_cbus_config {
- s16 clk_gpio;
- s16 dat_gpio;
- s16 sel_gpio;
-};
-
-struct omap_em_asic_bb5_config {
- s16 retu_irq_gpio;
- s16 tahvo_irq_gpio;
-};
-
-#endif
diff --git a/arch/arm/plat-omap/include/mach/board.h b/arch/arm/plat-omap/include/mach/board.h
index 9466772..4a0afd2 100644
--- a/arch/arm/plat-omap/include/mach/board.h
+++ b/arch/arm/plat-omap/include/mach/board.h
@@ -133,9 +133,6 @@ struct omap_version_config {
char version[12];
};
-
-#include <mach/board-nokia.h>
-
struct omap_board_config_entry {
u16 tag;
u16 len;
next prev parent reply other threads:[~2009-02-27 0:07 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 ` [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 ` Tony Lindgren [this message]
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=20090227000740.20192.91013.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