Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb6b0b18 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: No need to include board-h2.h from hardware.h 



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

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d9558b19

arch/arm/mach-omap1/board-h2-mmc.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-omap1/board-h2.c

+5 −0
Original line number Diff line number Diff line
@@ -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),

arch/arm/plat-omap/include/mach/board-h2.h→arch/arm/mach-omap1/board-h2.h

+1 −4
Original line number Diff line number Diff line 
/*

 * 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)

arch/arm/plat-omap/include/mach/hardware.h

+0 −4
Original line number Diff line number Diff line
@@ -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