Omap header clean-up for next merge window
Subsystems (4)
Tony Lindgren
maintainercover Omap header clean-up for next merge window
Hi all,
This series gets rid of the board-*.h includes from hardware.h as suggested earlier by Russell King.
Regards,
Tony
---
Tony Lindgren (13):
ARM: OMAP: Remove remaining board-*.h includes from hardware.h
ARM: OMAP: No need to include board-nokia.h from hardware.h
ARM: OMAP: No need to include board-overo.h from hardware.h
ARM: OMAP: No need to include board-ldp.h from hardware.h
ARM: OMAP: No need to include board-h4.h from hardware.h
ARM: OMAP: No need to include board-apollon.h from hardware.h
ARM: OMAP: No need to include board-omap2430sdp.h from hardware.h
ARM: OMAP: No need to include board-palm*.h from hardware.h
ARM: OMAP: No need to include board-osk.h from hardware.h
ARM: OMAP: No need to include board-innovator.h from hardware.h
ARM: OMAP: No need to include board-h3.h from hardware.h
ARM: OMAP: No need to include board-h2.h from hardware.h
ARM: OMAP: No need to include board-perseus2.h or board-fsample.h from hardware.h
arch/arm/mach-omap1/board-fsample.c | 34 +++++++++
arch/arm/mach-omap1/board-h2-mmc.c | 2 +
arch/arm/mach-omap1/board-h2.c | 5 +
arch/arm/mach-omap1/board-h2.h | 5 -
arch/arm/mach-omap1/board-h3-mmc.c | 2 +
arch/arm/mach-omap1/board-h3.c | 5 +
arch/arm/mach-omap1/board-h3.h | 5 -
arch/arm/mach-omap1/board-innovator.c | 3 +
arch/arm/mach-omap1/board-osk.c | 14 ++++
arch/arm/mach-omap1/board-palmte.c | 15 ++++
arch/arm/mach-omap1/board-palmtt.c | 7 ++
arch/arm/mach-omap1/board-palmz71.c | 10 +++
arch/arm/mach-omap1/board-sx1-mmc.c | 1
arch/arm/mach-omap1/board-sx1.c | 1
arch/arm/mach-omap2/board-2430sdp.c | 13 ++--
arch/arm/mach-omap2/board-apollon.c | 1
arch/arm/mach-omap2/board-h4.c | 4 +
arch/arm/mach-omap2/board-ldp.c | 10 ++-
arch/arm/mach-omap2/board-overo.c | 7 ++
arch/arm/plat-omap/include/mach/board-2430sdp.h | 41 -----------
arch/arm/plat-omap/include/mach/board-apollon.h | 46 ------------
arch/arm/plat-omap/include/mach/board-fsample.h | 51 --------------
arch/arm/plat-omap/include/mach/board-h4.h | 38 ----------
arch/arm/plat-omap/include/mach/board-innovator.h | 52 --------------
arch/arm/plat-omap/include/mach/board-ldp.h | 39 -----------
arch/arm/plat-omap/include/mach/board-nokia.h | 54 ---------------
.../arm/plat-omap/include/mach/board-omap3beagle.h | 33 ---------
arch/arm/plat-omap/include/mach/board-osk.h | 47 -------------
arch/arm/plat-omap/include/mach/board-overo.h | 26 -------
arch/arm/plat-omap/include/mach/board-palmte.h | 32 ---------
arch/arm/plat-omap/include/mach/board-palmtt.h | 23 ------
arch/arm/plat-omap/include/mach/board-palmz71.h | 26 -------
arch/arm/plat-omap/include/mach/board-perseus2.h | 39 -----------
arch/arm/plat-omap/include/mach/board-voiceblue.h | 1
arch/arm/plat-omap/include/mach/board.h | 3 -
arch/arm/plat-omap/include/mach/hardware.h | 74 --------------------
arch/arm/plat-omap/include/mach/system.h | 2 +
37 files changed, 126 insertions(+), 645 deletions(-)
rename arch/arm/{plat-omap/include/mach/board-h2.h => mach-omap1/board-h2.h} (90%)
rename arch/arm/{plat-omap/include/mach/board-h3.h => mach-omap1/board-h3.h} (90%)
delete mode 100644 arch/arm/plat-omap/include/mach/board-2430sdp.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-apollon.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-fsample.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-h4.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-innovator.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-ldp.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-nokia.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-omap3beagle.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-osk.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-overo.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-palmte.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-palmtt.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-palmz71.h
delete mode 100644 arch/arm/plat-omap/include/mach/board-perseus2.hSignature · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/13 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.
--- arch/arm/mach-omap1/board-fsample.c | 34 ++++++++++++++- arch/arm/plat-omap/include/mach/board-fsample.h | 51 ---------------------- arch/arm/plat-omap/include/mach/board-perseus2.h | 39 ----------------- arch/arm/plat-omap/include/mach/hardware.h | 8 --- 4 files changed, 33 insertions(+), 99 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-fsample.h delete mode 100644 arch/arm/plat-omap/include/mach/board-perseus2.h
arch/arm/mach-omap1/board-fsample.c +33 -1
@@ -34,7 +34,39 @@#include <mach/keypad.h> #include <mach/common.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[] = {KEY (0 ,0 ,KEY_UP ),
arch/arm/plat-omap/include/mach/board-fsample.h deleted +0 -51
51 lines not on this page · raw message
arch/arm/plat-omap/include/mach/board-perseus2.h deleted +0 -39
@@ -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
arch/arm/plat-omap/include/mach/hardware.h +0 -8
@@ -302,14 +302,6 @@#include "board-h2.h" #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 #include "board-h3.h" #endif
Tony Lindgren
maintainerPATCH 2/13 ARM: OMAP: No need to include board-h2.h from hardware.h
In reply to Tony LindgrenAlso move board-h2.h to mach-omap1.
---
arch/arm/mach-omap1/board-h2-mmc.c | 2 ++
arch/arm/mach-omap1/board-h2.c | 5 +++++
arch/arm/mach-omap1/board-h2.h | 5 +----
arch/arm/plat-omap/include/mach/hardware.h | 4 ----
4 files changed, 8 insertions(+), 8 deletions(-)
rename arch/arm/{plat-omap/include/mach/board-h2.h => mach-omap1/board-h2.h} (90%)arch/arm/mach-omap1/board-h2-mmc.c +2 -0
@@ -19,6 +19,8 @@#include <mach/mmc.h> #include <mach/gpio.h> +#include "board-h2.h" +#if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE ) static int mmc_set_power(struct device *dev, int slot, int power_on,
arch/arm/mach-omap1/board-h2.c +5 -0
@@ -46,6 +46,11 @@#include <mach/keypad.h> #include <mach/common.h> +#include "board-h2.h" + +/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ +#define OMAP1610_ETHR_START 0x04000300 +static int h2_keymap[] = {KEY (0 ,0 ,KEY_LEFT ),KEY (0 ,1 ,KEY_RIGHT ),
arch/arm/mach-omap1/board-h2.h renamed from arch/arm/plat-omap/include/mach/board-h2.h +1 -4
@@ -1,5 +1,5 @@/* -* arch/arm/plat-omap/include/mach/board-h2.h +* arch/arm/mach-omap1/board-h2.h * * Hardware definitions for TI OMAP1610 H2 board. *
@@ -29,9 +29,6 @@#ifndef __ASM_ARCH_OMAP_H2_H#define __ASM_ARCH_OMAP_H2_H -/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ -#define OMAP1610_ETHR_START 0x04000300 - #define H2_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */)# define H2_TPS_GPIO_MMC_PWR_EN (H2_TPS_GPIO_BASE + 3)
arch/arm/plat-omap/include/mach/hardware.h +0 -4
@@ -298,10 +298,6 @@#include "board-innovator.h" #endif -#ifdef CONFIG_MACH_OMAP_H2 -#include "board-h2.h" -#endif -#ifdef CONFIG_MACH_OMAP_H3 #include "board-h3.h" #endif
Tony Lindgren
maintainerPATCH 3/13 ARM: OMAP: No need to include board-h3.h from hardware.h
In reply to Tony LindgrenAlso move board-h3.h to mach-omap1.
---
arch/arm/mach-omap1/board-h3-mmc.c | 2 ++
arch/arm/mach-omap1/board-h3.c | 5 +++++
arch/arm/mach-omap1/board-h3.h | 5 +----
arch/arm/plat-omap/include/mach/hardware.h | 4 ----
4 files changed, 8 insertions(+), 8 deletions(-)
rename arch/arm/{plat-omap/include/mach/board-h3.h => mach-omap1/board-h3.h} (90%)arch/arm/mach-omap1/board-h3-mmc.c +2 -0
@@ -19,6 +19,8 @@#include <mach/mmc.h> #include <mach/gpio.h> +#include "board-h3.h" +#if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE ) static int mmc_set_power(struct device *dev, int slot, int power_on,
arch/arm/mach-omap1/board-h3.c +5 -0
@@ -50,6 +50,11 @@#include <mach/dma.h> #include <mach/common.h> +#include "board-h3.h" + +/* In OMAP1710 H3 the Ethernet is directly connected to CS1 */ +#define OMAP1710_ETHR_START 0x04000300 +#define H3_TS_GPIO 48static int h3_keymap[] = {
arch/arm/mach-omap1/board-h3.h renamed from arch/arm/plat-omap/include/mach/board-h3.h +1 -4
@@ -1,5 +1,5 @@/* -* arch/arm/plat-omap/include/mach/board-h3.h +* arch/arm/mach-omap1/board-h3.h * * Copyright (C) 2001 RidgeRun, Inc. * Copyright (C) 2004 Texas Instruments, Inc.
@@ -27,9 +27,6 @@#ifndef __ASM_ARCH_OMAP_H3_H#define __ASM_ARCH_OMAP_H3_H -/* In OMAP1710 H3 the Ethernet is directly connected to CS1 */ -#define OMAP1710_ETHR_START 0x04000300 - #define H3_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */)# define H3_TPS_GPIO_MMC_PWR_EN (H3_TPS_GPIO_BASE + 4)
arch/arm/plat-omap/include/mach/hardware.h +0 -4
@@ -298,10 +298,6 @@#include "board-innovator.h" #endif -#ifdef CONFIG_MACH_OMAP_H3 -#include "board-h3.h" -#endif -#ifdef CONFIG_MACH_OMAP_H4 #include "board-h4.h" #endif
Tony Lindgren
maintainerPATCH 4/13 ARM: OMAP: No need to include board-innovator.h from hardware.h
In reply to Tony LindgrenMove the defines to the board file and remove the now unnecessary header file.
--- arch/arm/mach-omap1/board-innovator.c | 3 + arch/arm/plat-omap/include/mach/board-innovator.h | 52 --------------------- arch/arm/plat-omap/include/mach/hardware.h | 4 -- 3 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-innovator.h
arch/arm/mach-omap1/board-innovator.c +3 -0
@@ -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 deleted +0 -52
52 lines not on this page · raw message
arch/arm/plat-omap/include/mach/hardware.h +0 -4
@@ -294,10 +294,6 @@* --------------------------------------------------------------------------- */ -#ifdef CONFIG_MACH_OMAP_INNOVATOR -#include "board-innovator.h" -#endif -#ifdef CONFIG_MACH_OMAP_H4 #include "board-h4.h" #endif
Tony Lindgren
maintainerPATCH 5/13 ARM: OMAP: No need to include board-osk.h from hardware.h
In reply to Tony LindgrenMove the defines to the board file and remove the now unnecessary header file.
--- arch/arm/mach-omap1/board-osk.c | 14 ++++++++ arch/arm/plat-omap/include/mach/board-osk.h | 47 --------------------------- arch/arm/plat-omap/include/mach/hardware.h | 4 -- 3 files changed, 14 insertions(+), 51 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-osk.h
arch/arm/mach-omap1/board-osk.c +14 -0
@@ -52,6 +52,20 @@#include <mach/tc.h> #include <mach/common.h> +/* At OMAP5912 OSK the Ethernet is directly connected to CS1 */ +#define OMAP_OSK_ETHR_START 0x04800300 + +/* TPS65010 has four GPIOs. nPG and LED2 can be treated like GPIOs with +* alternate pin configurations for hardware-controlled blinking. +*/ +#define OSK_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */) +# define OSK_TPS_GPIO_USB_PWR_EN (OSK_TPS_GPIO_BASE + 0) +# define OSK_TPS_GPIO_LED_D3 (OSK_TPS_GPIO_BASE + 1) +# define OSK_TPS_GPIO_LAN_RESET (OSK_TPS_GPIO_BASE + 2) +# define OSK_TPS_GPIO_DSP_PWR_EN (OSK_TPS_GPIO_BASE + 3) +# define OSK_TPS_GPIO_LED_D9 (OSK_TPS_GPIO_BASE + 4) +# define OSK_TPS_GPIO_LED_D2 (OSK_TPS_GPIO_BASE + 5) +static struct mtd_partition osk_partitions[] = {/* bootloader (U-Boot, etc) in first sector */ {
arch/arm/plat-omap/include/mach/board-osk.h deleted +0 -47
47 lines not on this page · raw message
arch/arm/plat-omap/include/mach/hardware.h +0 -4
@@ -314,10 +314,6 @@#include "board-apollon.h" #endif -#ifdef CONFIG_MACH_OMAP_OSK -#include "board-osk.h" -#endif -#ifdef CONFIG_MACH_VOICEBLUE #include "board-voiceblue.h" #endif
Tony Lindgren
maintainerPATCH 6/13 ARM: OMAP: No need to include board-palm*.h from hardware.h
In reply to Tony LindgrenMove the defines to the associated board file and remove the now unnecessary header files.
--- arch/arm/mach-omap1/board-palmte.c | 15 +++++++++++ arch/arm/mach-omap1/board-palmtt.c | 7 +++++ arch/arm/mach-omap1/board-palmz71.c | 10 +++++++ arch/arm/mach-omap1/board-sx1-mmc.c | 1 + arch/arm/mach-omap1/board-sx1.c | 1 + arch/arm/plat-omap/include/mach/board-palmte.h | 32 ----------------------- arch/arm/plat-omap/include/mach/board-palmtt.h | 23 ----------------- arch/arm/plat-omap/include/mach/board-palmz71.h | 26 ------------------- arch/arm/plat-omap/include/mach/hardware.h | 12 --------- 9 files changed, 34 insertions(+), 93 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-palmte.h delete mode 100644 arch/arm/plat-omap/include/mach/board-palmtt.h delete mode 100644 arch/arm/plat-omap/include/mach/board-palmz71.h
arch/arm/mach-omap1/board-palmte.c +15 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
arch/arm/plat-omap/include/mach/board-palmte.h deleted +0 -32
@@ -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 -* [email protected] -* -* 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 */
arch/arm/plat-omap/include/mach/board-palmtt.h deleted +0 -23
@@ -1,23 +0,0 @@ -/* -* arch/arm/plat-omap/include/mach/board-palmte.h -* -* Hardware definitions for the Palm Tungsten|T device. -* -* Maintainters : Marek Vasut <[email protected]> -* -* 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 */
arch/arm/plat-omap/include/mach/board-palmz71.h deleted +0 -26
@@ -1,26 +0,0 @@ -/* -* arch/arm/plat-omap/include/mach/board-palmz71.h -* -* Hardware definitions for the Palm Zire71 device. -* -* Maintainters : Marek Vasut <[email protected]> -* -* 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 */
arch/arm/plat-omap/include/mach/hardware.h +0 -12
@@ -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
Tony Lindgren
maintainerPATCH 7/13 ARM: OMAP: No need to include board-omap2430sdp.h from hardware.h
In reply to Tony LindgrenMove the defines to the associated board file and remove the now unnecessary header file. Also rename SDP2430_ETHR_GPIO_IRQ to SDP2430_ETHR_GPIO_IRQ.
--- arch/arm/mach-omap2/board-2430sdp.c | 13 ++++--- arch/arm/plat-omap/include/mach/board-2430sdp.h | 41 ----------------------- arch/arm/plat-omap/include/mach/hardware.h | 4 -- 3 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-2430sdp.h
arch/arm/mach-omap2/board-2430sdp.c +8 -5
@@ -38,9 +38,12 @@#include "mmc-twl4030.h" +#define SDP2430_CS0_BASE 0x04000000#define SDP2430_FLASH_CS 0#define SDP2430_SMC91X_CS 5 +#define SDP2430_ETHR_GPIO_IRQ 149 +static struct mtd_partition sdp2430_partitions[] = {/* bootloader (U-Boot, etc) in first sector */ {
@@ -102,8 +105,8 @@ static struct resource sdp2430_smc91x_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), - .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), + .start = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ), + .end = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ), .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, }, };
@@ -170,13 +173,13 @@ static inline void __init sdp2430_init_smc91x(void) sdp2430_smc91x_resources[0 ].end = cs_mem_base +0x30f ;udelay (100 ); -if (gpio_request (OMAP24XX_ETHR_GPIO_IRQ ,"SMC91x irq" ) <0 ) { +if (gpio_request (SDP2430_ETHR_GPIO_IRQ ,"SMC91x irq" ) <0 ) {printk (KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n" , -OMAP24XX_ETHR_GPIO_IRQ ); +SDP2430_ETHR_GPIO_IRQ );gpmc_cs_free (eth_cs); goto out; } -gpio_direction_input (OMAP24XX_ETHR_GPIO_IRQ ); +gpio_direction_input (SDP2430_ETHR_GPIO_IRQ ); out:clk_disable (gpmc_fck);
arch/arm/plat-omap/include/mach/board-2430sdp.h deleted +0 -41
41 lines not on this page · raw message
arch/arm/plat-omap/include/mach/hardware.h +0 -4
@@ -298,10 +298,6 @@#include "board-h4.h" #endif -#ifdef CONFIG_MACH_OMAP_2430SDP -#include "board-2430sdp.h" -#endif -#ifdef CONFIG_MACH_OMAP3_BEAGLE #include "board-omap3beagle.h" #endif
Tony Lindgren
maintainerPATCH 8/13 ARM: OMAP: No need to include board-apollon.h from hardware.h
In reply to Tony LindgrenMove the defines to the associated board file and remove the now unnecessary header file.
--- arch/arm/mach-omap2/board-apollon.c | 1 + arch/arm/plat-omap/include/mach/board-apollon.h | 46 ----------------------- arch/arm/plat-omap/include/mach/hardware.h | 4 -- 3 files changed, 1 insertions(+), 50 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-apollon.h
arch/arm/mach-omap2/board-apollon.c +1 -0
@@ -51,6 +51,7 @@#define APOLLON_FLASH_CS 0#define APOLLON_ETH_CS 1 +#define APOLLON_ETHR_GPIO_IRQ 74static struct mtd_partition apollon_partitions[] = { {
arch/arm/plat-omap/include/mach/board-apollon.h deleted +0 -46
46 lines not on this page · raw message
arch/arm/plat-omap/include/mach/hardware.h +0 -4
@@ -306,10 +306,6 @@#include "board-ldp.h" #endif -#ifdef CONFIG_MACH_OMAP_APOLLON -#include "board-apollon.h" -#endif -#ifdef CONFIG_MACH_VOICEBLUE #include "board-voiceblue.h" #endif
Tony Lindgren
maintainerPATCH 9/13 ARM: OMAP: No need to include board-h4.h from hardware.h
In reply to Tony LindgrenMove the defines to the associated board file and remove the now unnecessary header file. Also rename OMAP24XX_ETHR_GPIO_IRQ to H4_ETHR_GPIO_IRQ.
--- arch/arm/mach-omap2/board-h4.c | 4 ++- arch/arm/plat-omap/include/mach/board-h4.h | 38 ---------------------------- arch/arm/plat-omap/include/mach/hardware.h | 4 --- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-h4.h
arch/arm/mach-omap2/board-h4.c +3 -1
@@ -47,6 +47,8 @@#define H4_FLASH_CS 0#define H4_SMC91X_CS 1 +#define H4_ETHR_GPIO_IRQ 92 +static unsigned int row_gpios[6 ] = {88 ,89 ,124 ,11 ,6 ,96 };static unsigned int col_gpios[7 ] = {90 ,91 ,100 ,36 ,12 ,97 ,98 };
@@ -341,7 +343,7 @@ static inline void __init h4_init_debug(void)udelay (100 );omap_cfg_reg (M15_24XX_GPIO92 ); -if (debug_card_init (cs_mem_base,OMAP24XX_ETHR_GPIO_IRQ ) <0 ) +if (debug_card_init (cs_mem_base,H4_ETHR_GPIO_IRQ ) <0 )gpmc_cs_free (eth_cs); out:
arch/arm/plat-omap/include/mach/board-h4.h deleted +0 -38
@@ -1,38 +0,0 @@ -/* -* arch/arm/plat-omap/include/mach/board-h4.h -* -* Hardware definitions for TI OMAP2420 H4 board. -* -* Initial creation by Dirk Behme <[email protected]> -* -* 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_H4_H -#define __ASM_ARCH_OMAP_H4_H - -/* MMC Prototypes */ -extern void h4_mmc_init (void ); - -/* Placeholder for H4 specific defines */ -#define OMAP24XX_ETHR_GPIO_IRQ 92 -#endif /* __ASM_ARCH_OMAP_H4_H */ -
arch/arm/plat-omap/include/mach/hardware.h +0 -4
@@ -294,10 +294,6 @@* --------------------------------------------------------------------------- */ -#ifdef CONFIG_MACH_OMAP_H4 -#include "board-h4.h" -#endif -#ifdef CONFIG_MACH_OMAP3_BEAGLE #include "board-omap3beagle.h" #endif
Tony Lindgren
maintainerPATCH 10/13 ARM: OMAP: No need to include board-ldp.h from hardware.h
In reply to Tony LindgrenMove the defines to the associated board file and remove the now unnecessary header file. Also rename OMAP34XX_ETHR_START to LDP_ETHR_START.
--- arch/arm/mach-omap2/board-ldp.c | 10 ++++--- arch/arm/plat-omap/include/mach/board-ldp.h | 39 --------------------------- arch/arm/plat-omap/include/mach/hardware.h | 4 --- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-ldp.h
arch/arm/mach-omap2/board-ldp.c +6 -4
@@ -28,7 +28,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/board-ldp.h> #include <mach/mcspi.h> #include <mach/gpio.h> #include <mach/board.h>
@@ -41,12 +40,15 @@#include "mmc-twl4030.h" -#define SDP3430_SMC91X_CS 3 +#define LDP_SMC911X_CS 1 +#define LDP_SMC911X_GPIO 152 +#define DEBUG_BASE 0x08000000 +#define LDP_ETHR_START DEBUG_BASEstatic struct resource ldp_smc911x_resources[] = { [0 ] = { - .start =OMAP34XX_ETHR_START , - .end =OMAP34XX_ETHR_START +SZ_4K , + .start =LDP_ETHR_START , + .end =LDP_ETHR_START +SZ_4K , .flags =IORESOURCE_MEM , }, [1 ] = {
arch/arm/plat-omap/include/mach/board-ldp.h deleted +0 -39
@@ -1,39 +0,0 @@ -/* -* arch/arm/plat-omap/include/mach/board-ldp.h -* -* Hardware definitions for TI OMAP3 LDP. -* -* Copyright (C) 2008 Texas Instruments 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_LDP_H -#define __ASM_ARCH_OMAP_LDP_H - -extern void twl4030_bci_battery_init (void ); - -#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ -#define LDP_SMC911X_CS 1 -#define LDP_SMC911X_GPIO 152 -#define DEBUG_BASE 0x08000000 -#define OMAP34XX_ETHR_START DEBUG_BASE -#endif /* __ASM_ARCH_OMAP_LDP_H */
arch/arm/plat-omap/include/mach/hardware.h +0 -4
@@ -298,10 +298,6 @@#include "board-omap3beagle.h" #endif -#ifdef CONFIG_MACH_OMAP_LDP -#include "board-ldp.h" -#endif -#ifdef CONFIG_MACH_VOICEBLUE #include "board-voiceblue.h" #endif
Tony Lindgren
maintainerPATCH 11/13 ARM: OMAP: No need to include board-overo.h from hardware.h
In reply to Tony LindgrenMove the defines to the associated board file and remove the now unnecessary header file.
--- arch/arm/mach-omap2/board-overo.c | 7 ++++++- arch/arm/plat-omap/include/mach/board-overo.h | 26 ------------------------- 2 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-overo.h
arch/arm/mach-omap2/board-overo.c +6 -1
@@ -37,7 +37,6 @@#include <asm/mach/flash.h> #include <asm/mach/map.h> -#include <mach/board-overo.h> #include <mach/board.h> #include <mach/common.h> #include <mach/gpio.h>
@@ -47,6 +46,12 @@#include "mmc-twl4030.h" +#define OVERO_GPIO_BT_XGATE 15 +#define OVERO_GPIO_W2W_NRESET 16 +#define OVERO_GPIO_BT_NRESET 164 +#define OVERO_GPIO_USBH_CPEN 168 +#define OVERO_GPIO_USBH_NRESET 183 +#define NAND_BLOCK_SIZE SZ_128K#define GPMC_CS0_BASE 0x60#define GPMC_CS_SIZE 0x30
arch/arm/plat-omap/include/mach/board-overo.h deleted +0 -26
@@ -1,26 +0,0 @@ -/* -* board-overo.h (Gumstix Overo) -* -* Initial code: Steve Sakoman <[email protected]> -* -* 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. -* -* 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_OVERO_H -#define __ASM_ARCH_OVERO_H - -#define OVERO_GPIO_BT_XGATE 15 -#define OVERO_GPIO_W2W_NRESET 16 -#define OVERO_GPIO_BT_NRESET 164 -#define OVERO_GPIO_USBH_CPEN 168 -#define OVERO_GPIO_USBH_NRESET 183 - -#endif /* ____ASM_ARCH_OVERO_H */ -
Tony Lindgren
maintainerPATCH 12/13 ARM: OMAP: No need to include board-nokia.h from hardware.h
In reply to Tony LindgrenMove the defines to the associated board file and remove the now unnecessary header file.
--- arch/arm/plat-omap/include/mach/board-nokia.h | 54 ------------------------- arch/arm/plat-omap/include/mach/board.h | 3 - 2 files changed, 0 insertions(+), 57 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-nokia.h
arch/arm/plat-omap/include/mach/board-nokia.h deleted +0 -54
@@ -1,54 +0,0 @@ -/* -* arch/arm/plat-omap/include/mach/board-nokia.h -* -* Information structures for Nokia-specific board config data -* -* Copyright (C) 2005 Nokia Corporation -*/ - -#ifndef _OMAP_BOARD_NOKIA_H -#define _OMAP_BOARD_NOKIA_H - -#include <linux/types.h> - -#define OMAP_TAG_NOKIA_BT 0x4e01 -#define OMAP_TAG_WLAN_CX3110X 0x4e02 -#define OMAP_TAG_CBUS 0x4e03 -#define OMAP_TAG_EM_ASIC_BB5 0x4e04 - - -#define BT_CHIP_CSR 1 -#define BT_CHIP_TI 2 - -#define BT_SYSCLK_12 1 -#define BT_SYSCLK_38_4 2 - -struct omap_bluetooth_config { -u8 chip_type; -u8 bt_wakeup_gpio; -u8 host_wakeup_gpio; -u8 reset_gpio; -u8 bt_uart; -u8 bd_addr[6 ]; -u8 bt_sysclk; -}; - -struct omap_wlan_cx3110x_config { -u8 chip_type; -s16 power_gpio; -s16 irq_gpio; -s16 spi_cs_gpio; -}; - -struct omap_cbus_config { -s16 clk_gpio; -s16 dat_gpio; -s16 sel_gpio; -}; - -struct omap_em_asic_bb5_config { -s16 retu_irq_gpio; -s16 tahvo_irq_gpio; -}; - -#endif
arch/arm/plat-omap/include/mach/board.h +0 -3
@@ -133,9 +133,6 @@ struct omap_version_config {char version[12 ]; }; - -#include <mach/board-nokia.h> -struct omap_board_config_entry {u16 tag;u16 len;
Tony Lindgren
maintainerPATCH 13/13 ARM: OMAP: Remove remaining board-*.h includes from hardware.h
In reply to Tony LindgrenAlso remove board-omap3beagle.h that is not included anywhere, and move protoype for voiceblue_reset() from board-voiceblue.h to system.h.
After this patch there are still board-ams-delta.h, board-sx1.h and board-voiceblue.h that export some functions. These could be removed if the functions were moved under drivers.
--- .../arm/plat-omap/include/mach/board-omap3beagle.h | 33 -------------------- arch/arm/plat-omap/include/mach/board-voiceblue.h | 1 - arch/arm/plat-omap/include/mach/hardware.h | 22 ------------- arch/arm/plat-omap/include/mach/system.h | 2 + 4 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/board-omap3beagle.h
arch/arm/plat-omap/include/mach/board-omap3beagle.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* -* arch/arm/plat-omap/include/mach/board-omap3beagle.h -* -* Hardware definitions for TI OMAP3 BEAGLE. -* -* Initial creation by Syed Mohammed Khasim <[email protected]> -* -* 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_OMAP3_BEAGLE_H -#define __ASM_ARCH_OMAP3_BEAGLE_H - -#endif /* __ASM_ARCH_OMAP3_BEAGLE_H */ -
arch/arm/plat-omap/include/mach/board-voiceblue.h +0 -1
@@ -14,7 +14,6 @@extern void voiceblue_wdt_enable (void );extern void voiceblue_wdt_disable (void );extern void voiceblue_wdt_ping (void ); -extern void voiceblue_reset (void );#endif /* __ASM_ARCH_VOICEBLUE_H */
arch/arm/plat-omap/include/mach/hardware.h +0 -22
@@ -286,26 +286,4 @@#include "omap24xx.h" #include "omap34xx.h" -#ifndef __ASSEMBLER__ - -/* -* --------------------------------------------------------------------------- -* Board specific defines -* --------------------------------------------------------------------------- -*/ - -#ifdef CONFIG_MACH_OMAP3_BEAGLE -#include "board-omap3beagle.h" -#endif - -#ifdef CONFIG_MACH_VOICEBLUE -#include "board-voiceblue.h" -#endif - -#ifdef CONFIG_MACH_SX1 -#include "board-sx1.h" -#endif - -#endif /* !__ASSEMBLER__ */ -#endif /* __ASM_ARCH_OMAP_HARDWARE_H */
arch/arm/plat-omap/include/mach/system.h +2 -0
@@ -11,6 +11,8 @@#ifndef CONFIG_MACH_VOICEBLUE #define voiceblue_reset () do {} while (0) +#else +extern void voiceblue_reset (void );#endif extern void omap_prcm_arch_reset (char mode);
Re: [PATCH 07/13] ARM: OMAP: No need to include board-omap2430sdp.h from hardware.h
In reply to Tony LindgrenNothing to do with this patch in particular, but...
arch/arm/mach-omap2/board-2430sdp.c static struct resource sdp2430_smc91x_resources[] = { · line 110
Quoted 9 lines · Tony Lindgren
arch/arm/mach-omap2/board-2430sdp.c +2
-2@@ -102,8 +105,8 @@ static struct resource sdp2430_smc91x_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), - .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), + .start = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ), + .end = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ), .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
normally we only pass start and this should probably be using gpio_to_irq(), but for that...
Quoted 6 lines
arch/arm/mach-omap2/board-2430sdp.c +0
-0}, };@@ -170,13 +173,13 @@ static inline void __init sdp2430_init_smc91x(void) sdp2430_smc91x_resources[0 ].end = cs_mem_base +0x30f ;udelay (100 );
arch/arm/mach-omap2/board-2430sdp.c static inline void __init sdp2430_init_smc91x(void) · line 182
Quoted 10 lines
arch/arm/mach-omap2/board-2430sdp.c +3
-3-if (gpio_request (OMAP24XX_ETHR_GPIO_IRQ ,"SMC91x irq" ) <0 ) { +if (gpio_request (SDP2430_ETHR_GPIO_IRQ ,"SMC91x irq" ) <0 ) {printk (KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n" , -OMAP24XX_ETHR_GPIO_IRQ ); +SDP2430_ETHR_GPIO_IRQ );gpmc_cs_free (eth_cs); goto out; } -gpio_direction_input (OMAP24XX_ETHR_GPIO_IRQ ); +gpio_direction_input (SDP2430_ETHR_GPIO_IRQ );
we should probably add:
sdp2430_scm91x_resources[1].start = gpio_to_irq(OMAP24XX_ETHER_GPIO_IRQ);
here
Signature · 1 line
balbi
Tony Lindgren
maintainerRe: [PATCH 07/13] ARM: OMAP: No need to include board-omap2430sdp.h from hardware.h
Quoted 35 lines · Felipe Balbi
Nothing to do with this patch in particular, but...
arch/arm/mach-omap2/board-2430sdp.c static struct resource sdp2430_smc91x_resources[] = { · line 110
Quoted 9 lines · Tony Lindgren
arch/arm/mach-omap2/board-2430sdp.c +2
-2@@ -102,8 +105,8 @@ static struct resource sdp2430_smc91x_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), - .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), + .start = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ), + .end = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ), .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,normally we only pass start and this should probably be using
gpio_to_irq(), but for that...Quoted 6 lines
arch/arm/mach-omap2/board-2430sdp.c +0
-0}, };@@ -170,13 +173,13 @@ static inline void __init sdp2430_init_smc91x(void) sdp2430_smc91x_resources[0 ].end = cs_mem_base +0x30f ;udelay (100 );arch/arm/mach-omap2/board-2430sdp.c static inline void __init sdp2430_init_smc91x(void) · line 182
Quoted 10 lines
arch/arm/mach-omap2/board-2430sdp.c +3
-3-if (gpio_request (OMAP24XX_ETHR_GPIO_IRQ ,"SMC91x irq" ) <0 ) { +if (gpio_request (SDP2430_ETHR_GPIO_IRQ ,"SMC91x irq" ) <0 ) {printk (KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n" , -OMAP24XX_ETHR_GPIO_IRQ ); +SDP2430_ETHR_GPIO_IRQ );gpmc_cs_free (eth_cs); goto out; } -gpio_direction_input (OMAP24XX_ETHR_GPIO_IRQ ); +gpio_direction_input (SDP2430_ETHR_GPIO_IRQ );we should probably add:
Quoted 3 lines
sdp2430_scm91x_resources[1].start =
gpio_to_irq(OMAP24XX_ETHER_GPIO_IRQ);here
Yeah. But let's deal with that a bit later as I'm thinking about having a omap generic smc91x_init() which sets the GPMC timings too.
The problem with the current GPMC timings is that they are not cpufreq safe as they are not dynamically calculated.
Regards,
Tony
Quoted 2 lines · Tony Lindgren
This series gets rid of the board-*.h includes from
hardware.has suggested earlier by Russell King.
Great work, thanks for doing this.
-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
Tony Lindgren
maintainerQuoted 5 lines · Russell King - ARM Linux
Quoted 2 lines · Tony Lindgren
This series gets rid of the board-*.h includes from
hardware.has suggested earlier by Russell King.Great work, thanks for doing this.
Adding this series to my for-next branch to be pulled during the merge window.
Tony