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-perseus2.h or board-fsample.h from hardware.h
Move defines to the board file and remove the now unnecessary headers. Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren
parent
8dff0fa55d
commit
d9558b19f2
4 changed files with 33 additions and 99 deletions
|
|
@ -34,7 +34,39 @@
|
||||||
#include <mach/keypad.h>
|
#include <mach/keypad.h>
|
||||||
#include <mach/common.h>
|
#include <mach/common.h>
|
||||||
#include <mach/board.h>
|
#include <mach/board.h>
|
||||||
#include <mach/board-fsample.h>
|
|
||||||
|
/* fsample is pretty close to p2-sample */
|
||||||
|
|
||||||
|
#define fsample_cpld_read(reg) __raw_readb(reg)
|
||||||
|
#define fsample_cpld_write(val, reg) __raw_writeb(val, reg)
|
||||||
|
|
||||||
|
#define FSAMPLE_CPLD_BASE 0xE8100000
|
||||||
|
#define FSAMPLE_CPLD_SIZE SZ_4K
|
||||||
|
#define FSAMPLE_CPLD_START 0x05080000
|
||||||
|
|
||||||
|
#define FSAMPLE_CPLD_REG_A (FSAMPLE_CPLD_BASE + 0x00)
|
||||||
|
#define FSAMPLE_CPLD_SWITCH (FSAMPLE_CPLD_BASE + 0x02)
|
||||||
|
#define FSAMPLE_CPLD_UART (FSAMPLE_CPLD_BASE + 0x02)
|
||||||
|
#define FSAMPLE_CPLD_REG_B (FSAMPLE_CPLD_BASE + 0x04)
|
||||||
|
#define FSAMPLE_CPLD_VERSION (FSAMPLE_CPLD_BASE + 0x06)
|
||||||
|
#define FSAMPLE_CPLD_SET_CLR (FSAMPLE_CPLD_BASE + 0x06)
|
||||||
|
|
||||||
|
#define FSAMPLE_CPLD_BIT_BT_RESET 0
|
||||||
|
#define FSAMPLE_CPLD_BIT_LCD_RESET 1
|
||||||
|
#define FSAMPLE_CPLD_BIT_CAM_PWDN 2
|
||||||
|
#define FSAMPLE_CPLD_BIT_CHARGER_ENABLE 3
|
||||||
|
#define FSAMPLE_CPLD_BIT_SD_MMC_EN 4
|
||||||
|
#define FSAMPLE_CPLD_BIT_aGPS_PWREN 5
|
||||||
|
#define FSAMPLE_CPLD_BIT_BACKLIGHT 6
|
||||||
|
#define FSAMPLE_CPLD_BIT_aGPS_EN_RESET 7
|
||||||
|
#define FSAMPLE_CPLD_BIT_aGPS_SLEEPx_N 8
|
||||||
|
#define FSAMPLE_CPLD_BIT_OTG_RESET 9
|
||||||
|
|
||||||
|
#define fsample_cpld_set(bit) \
|
||||||
|
fsample_cpld_write((((bit) & 15) << 4) | 0x0f, FSAMPLE_CPLD_SET_CLR)
|
||||||
|
|
||||||
|
#define fsample_cpld_clear(bit) \
|
||||||
|
fsample_cpld_write(0xf0 | ((bit) & 15), FSAMPLE_CPLD_SET_CLR)
|
||||||
|
|
||||||
static int fsample_keymap[] = {
|
static int fsample_keymap[] = {
|
||||||
KEY(0,0,KEY_UP),
|
KEY(0,0,KEY_UP),
|
||||||
|
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
/*
|
|
||||||
* arch/arm/plat-omap/include/mach/board-fsample.h
|
|
||||||
*
|
|
||||||
* Board-specific goodies for TI F-Sample.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2006 Google, Inc.
|
|
||||||
* Author: Brian Swetland <swetland@google.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 __ASM_ARCH_OMAP_FSAMPLE_H
|
|
||||||
#define __ASM_ARCH_OMAP_FSAMPLE_H
|
|
||||||
|
|
||||||
/* fsample is pretty close to p2-sample */
|
|
||||||
#include <mach/board-perseus2.h>
|
|
||||||
|
|
||||||
#define fsample_cpld_read(reg) __raw_readb(reg)
|
|
||||||
#define fsample_cpld_write(val, reg) __raw_writeb(val, reg)
|
|
||||||
|
|
||||||
#define FSAMPLE_CPLD_BASE 0xE8100000
|
|
||||||
#define FSAMPLE_CPLD_SIZE SZ_4K
|
|
||||||
#define FSAMPLE_CPLD_START 0x05080000
|
|
||||||
|
|
||||||
#define FSAMPLE_CPLD_REG_A (FSAMPLE_CPLD_BASE + 0x00)
|
|
||||||
#define FSAMPLE_CPLD_SWITCH (FSAMPLE_CPLD_BASE + 0x02)
|
|
||||||
#define FSAMPLE_CPLD_UART (FSAMPLE_CPLD_BASE + 0x02)
|
|
||||||
#define FSAMPLE_CPLD_REG_B (FSAMPLE_CPLD_BASE + 0x04)
|
|
||||||
#define FSAMPLE_CPLD_VERSION (FSAMPLE_CPLD_BASE + 0x06)
|
|
||||||
#define FSAMPLE_CPLD_SET_CLR (FSAMPLE_CPLD_BASE + 0x06)
|
|
||||||
|
|
||||||
#define FSAMPLE_CPLD_BIT_BT_RESET 0
|
|
||||||
#define FSAMPLE_CPLD_BIT_LCD_RESET 1
|
|
||||||
#define FSAMPLE_CPLD_BIT_CAM_PWDN 2
|
|
||||||
#define FSAMPLE_CPLD_BIT_CHARGER_ENABLE 3
|
|
||||||
#define FSAMPLE_CPLD_BIT_SD_MMC_EN 4
|
|
||||||
#define FSAMPLE_CPLD_BIT_aGPS_PWREN 5
|
|
||||||
#define FSAMPLE_CPLD_BIT_BACKLIGHT 6
|
|
||||||
#define FSAMPLE_CPLD_BIT_aGPS_EN_RESET 7
|
|
||||||
#define FSAMPLE_CPLD_BIT_aGPS_SLEEPx_N 8
|
|
||||||
#define FSAMPLE_CPLD_BIT_OTG_RESET 9
|
|
||||||
|
|
||||||
#define fsample_cpld_set(bit) \
|
|
||||||
fsample_cpld_write((((bit) & 15) << 4) | 0x0f, FSAMPLE_CPLD_SET_CLR)
|
|
||||||
|
|
||||||
#define fsample_cpld_clear(bit) \
|
|
||||||
fsample_cpld_write(0xf0 | ((bit) & 15), FSAMPLE_CPLD_SET_CLR)
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
/*
|
|
||||||
* arch/arm/plat-omap/include/mach/board-perseus2.h
|
|
||||||
*
|
|
||||||
* Copyright 2003 by Texas Instruments Incorporated
|
|
||||||
* OMAP730 / Perseus2 support by Jean Pihet
|
|
||||||
*
|
|
||||||
* Copyright (C) 2001 RidgeRun, Inc. (http://www.ridgerun.com)
|
|
||||||
* Author: 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_PERSEUS2_H
|
|
||||||
#define __ASM_ARCH_OMAP_PERSEUS2_H
|
|
||||||
|
|
||||||
#include <mach/fpga.h>
|
|
||||||
|
|
||||||
#ifndef OMAP_SDRAM_DEVICE
|
|
||||||
#define OMAP_SDRAM_DEVICE D256M_1X16_4B
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -302,14 +302,6 @@
|
||||||
#include "board-h2.h"
|
#include "board-h2.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_OMAP_PERSEUS2
|
|
||||||
#include "board-perseus2.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_OMAP_FSAMPLE
|
|
||||||
#include "board-fsample.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_OMAP_H3
|
#ifdef CONFIG_MACH_OMAP_H3
|
||||||
#include "board-h3.h"
|
#include "board-h3.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue