mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
ARM: OMAP: No need to include board-h3.h from hardware.h
Also move board-h3.h to mach-omap1. Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
eb6b0b1832
commit
228fe42e5e
4 changed files with 8 additions and 8 deletions
|
@ -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,
|
||||
|
|
|
@ -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[] = {
|
||||
|
|
|
@ -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)
|
||||
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue