Commit 278267be authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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



Move the defines to the board file and remove the now unnecessary
header file.

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

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

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
#include <mach/common.h>

#include <mach/mmc.h>



/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */

#define INNOVATOR1610_ETHR_START	0x04000300



static int innovator_keymap[] = {

	KEY(0, 0, KEY_F1),

	KEY(0, 3, KEY_DOWN),

arch/arm/plat-omap/include/mach/board-innovator.h

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/*

 * arch/arm/plat-omap/include/mach/board-innovator.h

 *

 * Copyright (C) 2001 RidgeRun, 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_INNOVATOR_H

#define __ASM_ARCH_OMAP_INNOVATOR_H



#if defined (CONFIG_ARCH_OMAP15XX)



#ifndef OMAP_SDRAM_DEVICE

#define OMAP_SDRAM_DEVICE			D256M_1X16_4B

#endif



#define OMAP1510P1_IMIF_PRI_VALUE		0x00

#define OMAP1510P1_EMIFS_PRI_VALUE		0x00

#define OMAP1510P1_EMIFF_PRI_VALUE		0x00



#ifndef __ASSEMBLY__

void fpga_write(unsigned char val, int reg);

unsigned char fpga_read(int reg);

#endif



#endif /* CONFIG_ARCH_OMAP15XX */



#if defined (CONFIG_ARCH_OMAP16XX)



/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */

#define INNOVATOR1610_ETHR_START	0x04000300



#endif /* CONFIG_ARCH_OMAP1610 */

#endif /* __ASM_ARCH_OMAP_INNOVATOR_H */

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

+0 −4
Original line number Diff line number Diff line
@@ -294,10 +294,6 @@ 
 * ---------------------------------------------------------------------------

 */



#ifdef CONFIG_MACH_OMAP_INNOVATOR

#include "board-innovator.h"

#endif



#ifdef CONFIG_MACH_OMAP_H4

#include "board-h4.h"

#endif