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

Commit 21d182bd authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Fix relative includes for fpga.h 

As discussed on linux-arm-kernel, we want to avoid
relative includes for the arch/arm/*omap* code:

http://www.spinics.net/lists/linux-omap/msg80520.html



Fix includes for fpga.h by making fpga.h local
to mach-omap1. The common code in plat-omap just
needs to know the struct h2p2_dbg_fpga, which can
be local to debug-leds.c.

This also fixes the braindead <../*.h> style includes
that got accidentally added with search and replace
during the cleanup.

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

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,13 +30,13 @@ 
#include <mach/tc.h>

#include <mach/tc.h>

#include <mach/mux.h>

#include <mach/mux.h>

#include <mach/flash.h>

#include <mach/flash.h>

#include <../plat-omap/fpga.h>

#include <linux/platform_data/keypad-omap.h>

#include <linux/platform_data/keypad-omap.h>





#include <mach/hardware.h>

#include <mach/hardware.h>





#include "iomap.h"

#include "iomap.h"

#include "common.h"

#include "common.h"

#include "fpga.h"





/* fsample is pretty close to p2-sample */

/* fsample is pretty close to p2-sample */

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ 




#include <mach/mux.h>

#include <mach/mux.h>

#include <mach/flash.h>

#include <mach/flash.h>

#include <../plat-omap/fpga.h>

#include <mach/tc.h>

#include <mach/tc.h>

#include <linux/platform_data/keypad-omap.h>

#include <linux/platform_data/keypad-omap.h>

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,13 +30,13 @@ 




#include <mach/tc.h>

#include <mach/tc.h>

#include <mach/mux.h>

#include <mach/mux.h>

#include <../plat-omap/fpga.h>

#include <mach/flash.h>

#include <mach/flash.h>





#include <mach/hardware.h>

#include <mach/hardware.h>





#include "iomap.h"

#include "iomap.h"

#include "common.h"

#include "common.h"

#include "fpga.h"





static const unsigned int p2_keymap[] = {

static const unsigned int p2_keymap[] = {

	KEY(0, 0, KEY_UP),

	KEY(0, 0, KEY_UP),

arch/arm/mach-omap1/fpga.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -27,12 +27,11 @@ 
#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/mach/irq.h>

#include <asm/mach/irq.h>





#include <../plat-omap/fpga.h>



#include <mach/hardware.h>

#include <mach/hardware.h>





#include "iomap.h"

#include "iomap.h"

#include "common.h"

#include "common.h"

#include "fpga.h"





static void fpga_mask_irq(struct irq_data *d)

static void fpga_mask_irq(struct irq_data *d)

{

{

arch/arm/plat-omap/fpga.h→arch/arm/mach-omap1/fpga.h

+0 −22
Original line number Original line Diff line number Diff line 
/*

/*

 * arch/arm/plat-omap/include/mach/fpga.h

 *

 * Interrupt handler for OMAP-1510 FPGA

 * Interrupt handler for OMAP-1510 FPGA

 *

 *

 * Copyright (C) 2001 RidgeRun, Inc.

 * Copyright (C) 2001 RidgeRun, Inc.
@@ -38,26 +36,6 @@ 
#define H2P2_DBG_FPGA_LAN_STATUS	IOMEM(H2P2_DBG_FPGA_BASE + 0x1A)	/* LAN Status line */

#define H2P2_DBG_FPGA_LAN_STATUS	IOMEM(H2P2_DBG_FPGA_BASE + 0x1A)	/* LAN Status line */

#define H2P2_DBG_FPGA_LAN_RESET		IOMEM(H2P2_DBG_FPGA_BASE + 0x1C)	/* LAN Reset line */

#define H2P2_DBG_FPGA_LAN_RESET		IOMEM(H2P2_DBG_FPGA_BASE + 0x1C)	/* LAN Reset line */





/* NOTE:  most boards don't have a static mapping for the FPGA ... */

struct h2p2_dbg_fpga {

	/* offset 0x00 */

	u16		smc91x[8];

	/* offset 0x10 */

	u16		fpga_rev;

	u16		board_rev;

	u16		gpio_outputs;

	u16		leds;

	/* offset 0x18 */

	u16		misc_inputs;

	u16		lan_status;

	u16		lan_reset;

	u16		reserved0;

	/* offset 0x20 */

	u16		ps2_data;

	u16		ps2_ctrl;

	/* plus also 4 rs232 ports ... */

};



/* LEDs definition on debug board (16 LEDs, all physically green) */

/* LEDs definition on debug board (16 LEDs, all physically green) */

#define H2P2_DBG_FPGA_LED_GREEN		(1 << 15)

#define H2P2_DBG_FPGA_LED_GREEN		(1 << 15)

#define H2P2_DBG_FPGA_LED_AMBER		(1 << 14)

#define H2P2_DBG_FPGA_LED_AMBER		(1 << 14)