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

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

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



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

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

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

+15 −0
Original line number Diff line number Diff line
@@ -43,6 +43,21 @@ 
#include <mach/keypad.h>

#include <mach/common.h>



#define PALMTE_USBDETECT_GPIO	0

#define PALMTE_USB_OR_DC_GPIO	1

#define PALMTE_TSC_GPIO		4

#define PALMTE_PINTDAV_GPIO	6

#define PALMTE_MMC_WP_GPIO	8

#define PALMTE_MMC_POWER_GPIO	9

#define PALMTE_HDQ_GPIO		11

#define PALMTE_HEADPHONES_GPIO	14

#define PALMTE_SPEAKER_GPIO	15

#define PALMTE_DC_GPIO		OMAP_MPUIO(2)

#define PALMTE_MMC_SWITCH_GPIO	OMAP_MPUIO(4)

#define PALMTE_MMC1_GPIO	OMAP_MPUIO(6)

#define PALMTE_MMC2_GPIO	OMAP_MPUIO(7)

#define PALMTE_MMC3_GPIO	OMAP_MPUIO(11)



static void __init omap_palmte_init_irq(void)

{

	omap1_init_common_hw();

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

+7 −0
Original line number Diff line number Diff line
@@ -43,6 +43,13 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>



#define PALMTT_USBDETECT_GPIO	0

#define PALMTT_CABLE_GPIO	1

#define PALMTT_LED_GPIO		3

#define PALMTT_PENIRQ_GPIO	6

#define PALMTT_MMC_WP_GPIO	8

#define PALMTT_HDQ_GPIO		11



static int palmtt_keymap[] = {

	KEY(0, 0, KEY_ESC),

	KEY(0, 1, KEY_SPACE),

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

+10 −0
Original line number Diff line number Diff line
@@ -46,6 +46,16 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>



#define PALMZ71_USBDETECT_GPIO	0

#define PALMZ71_PENIRQ_GPIO	6

#define PALMZ71_MMC_WP_GPIO	8

#define PALMZ71_HDQ_GPIO 	11



#define PALMZ71_HOTSYNC_GPIO	OMAP_MPUIO(1)

#define PALMZ71_CABLE_GPIO	OMAP_MPUIO(2)

#define PALMZ71_SLIDER_GPIO	OMAP_MPUIO(3)

#define PALMZ71_MMC_IN_GPIO	OMAP_MPUIO(4)



static void __init

omap_palmz71_init_irq(void)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <mach/hardware.h>

#include <mach/mmc.h>

#include <mach/gpio.h>

#include <mach/board-sx1.h>



#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <mach/board.h>

#include <mach/common.h>

#include <mach/keypad.h>

#include <mach/board-sx1.h>



/* Write to I2C device */

int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value)