mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
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: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
3a0110cdae
commit
b2830810fd
9 changed files with 34 additions and 93 deletions
|
@ -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();
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
/*
|
||||
* arch/arm/plat-omap/include/mach/board-palmte.h
|
||||
*
|
||||
* Hardware definitions for the Palm Tungsten E device.
|
||||
*
|
||||
* Maintainters : http://palmtelinux.sf.net
|
||||
* palmtelinux-developpers@lists.sf.net
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __OMAP_BOARD_PALMTE_H
|
||||
#define __OMAP_BOARD_PALMTE_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)
|
||||
|
||||
#endif /* __OMAP_BOARD_PALMTE_H */
|
|
@ -1,23 +0,0 @@
|
|||
/*
|
||||
* arch/arm/plat-omap/include/mach/board-palmte.h
|
||||
*
|
||||
* Hardware definitions for the Palm Tungsten|T device.
|
||||
*
|
||||
* Maintainters : Marek Vasut <marek.vasut@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __OMAP_BOARD_PALMTT_H
|
||||
#define __OMAP_BOARD_PALMTT_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
|
||||
|
||||
#endif /* __OMAP_BOARD_PALMTT_H */
|
|
@ -1,26 +0,0 @@
|
|||
/*
|
||||
* arch/arm/plat-omap/include/mach/board-palmz71.h
|
||||
*
|
||||
* Hardware definitions for the Palm Zire71 device.
|
||||
*
|
||||
* Maintainters : Marek Vasut <marek.vasut@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __OMAP_BOARD_PALMZ71_H
|
||||
#define __OMAP_BOARD_PALMZ71_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)
|
||||
|
||||
#endif /* __OMAP_BOARD_PALMZ71_H */
|
|
@ -318,18 +318,6 @@
|
|||
#include "board-voiceblue.h"
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MACH_OMAP_PALMTE
|
||||
#include "board-palmte.h"
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MACH_OMAP_PALMZ71
|
||||
#include "board-palmz71.h"
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MACH_OMAP_PALMTT
|
||||
#include "board-palmtt.h"
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MACH_SX1
|
||||
#include "board-sx1.h"
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue