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

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

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



Move 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.

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

arch/arm/mach-omap2/board-2430sdp.c

+8 −5
Original line number Diff line number Diff line
@@ -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

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * arch/arm/plat-omap/include/mach/board-2430sdp.h

 *

 * Hardware definitions for TI OMAP2430 SDP board.

 *

 * Based on board-h4.h by Dirk Behme <dirk.behme@de.bosch.com>

 *

 * 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_2430SDP_H

#define __ASM_ARCH_OMAP_2430SDP_H



/* Placeholder for 2430SDP specific defines */

#define OMAP24XX_ETHR_START		0x08000300

#define OMAP24XX_ETHR_GPIO_IRQ		149

#define SDP2430_CS0_BASE		0x04000000



/* Function prototypes */

extern void sdp2430_flash_init(void);

extern void sdp2430_usb_init(void);



#endif /* __ASM_ARCH_OMAP_2430SDP_H */

arch/arm/plat-omap/include/mach/hardware.h

+0 −4
Original line number Diff line number Diff line
@@ -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