ARM: OMAP: No need to include board-ldp.h from hardware.h
Move the defines to the associated board file and remove the now unnecessary header file. Also rename OMAP34XX_ETHR_START to LDP_ETHR_START. Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
40662d7731
commit
ec7558a62d
|
@ -28,7 +28,6 @@
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
|
|
||||||
#include <mach/board-ldp.h>
|
|
||||||
#include <mach/mcspi.h>
|
#include <mach/mcspi.h>
|
||||||
#include <mach/gpio.h>
|
#include <mach/gpio.h>
|
||||||
#include <mach/board.h>
|
#include <mach/board.h>
|
||||||
|
@ -41,12 +40,15 @@
|
||||||
|
|
||||||
#include "mmc-twl4030.h"
|
#include "mmc-twl4030.h"
|
||||||
|
|
||||||
#define SDP3430_SMC91X_CS 3
|
#define LDP_SMC911X_CS 1
|
||||||
|
#define LDP_SMC911X_GPIO 152
|
||||||
|
#define DEBUG_BASE 0x08000000
|
||||||
|
#define LDP_ETHR_START DEBUG_BASE
|
||||||
|
|
||||||
static struct resource ldp_smc911x_resources[] = {
|
static struct resource ldp_smc911x_resources[] = {
|
||||||
[0] = {
|
[0] = {
|
||||||
.start = OMAP34XX_ETHR_START,
|
.start = LDP_ETHR_START,
|
||||||
.end = OMAP34XX_ETHR_START + SZ_4K,
|
.end = LDP_ETHR_START + SZ_4K,
|
||||||
.flags = IORESOURCE_MEM,
|
.flags = IORESOURCE_MEM,
|
||||||
},
|
},
|
||||||
[1] = {
|
[1] = {
|
||||||
|
|
|
@ -1,39 +0,0 @@
|
||||||
/*
|
|
||||||
* arch/arm/plat-omap/include/mach/board-ldp.h
|
|
||||||
*
|
|
||||||
* Hardware definitions for TI OMAP3 LDP.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2008 Texas Instruments Inc.
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
||||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
||||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
|
||||||
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
||||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
||||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_OMAP_LDP_H
|
|
||||||
#define __ASM_ARCH_OMAP_LDP_H
|
|
||||||
|
|
||||||
extern void twl4030_bci_battery_init(void);
|
|
||||||
|
|
||||||
#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ
|
|
||||||
#define LDP_SMC911X_CS 1
|
|
||||||
#define LDP_SMC911X_GPIO 152
|
|
||||||
#define DEBUG_BASE 0x08000000
|
|
||||||
#define OMAP34XX_ETHR_START DEBUG_BASE
|
|
||||||
#endif /* __ASM_ARCH_OMAP_LDP_H */
|
|
|
@ -298,10 +298,6 @@
|
||||||
#include "board-omap3beagle.h"
|
#include "board-omap3beagle.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_OMAP_LDP
|
|
||||||
#include "board-ldp.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_VOICEBLUE
|
#ifdef CONFIG_MACH_VOICEBLUE
|
||||||
#include "board-voiceblue.h"
|
#include "board-voiceblue.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue