Commit ec669696 authored by Krzysztof Hałasa's avatar Krzysztof Hałasa
Browse files

IXP4xx: move AVILA platform macros to the platform code. 



Signed-off-by: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
parent 9bf4d676

arch/arm/mach-ixp4xx/avila-pci.c

+15 −1
Original line number Diff line number Diff line
@@ -22,12 +22,26 @@ 
#include <linux/init.h>

#include <linux/irq.h>

#include <linux/delay.h>



#include <asm/mach/pci.h>

#include <asm/irq.h>

#include <mach/hardware.h>

#include <asm/mach-types.h>



#define AVILA_PCI_MAX_DEV	4

#define LOFT_PCI_MAX_DEV	6

#define AVILA_PCI_IRQ_LINES	4



/* PCI controller GPIO to IRQ pin mappings */

#define AVILA_PCI_INTA_PIN	11

#define AVILA_PCI_INTB_PIN	10

#define AVILA_PCI_INTC_PIN	9

#define AVILA_PCI_INTD_PIN	8



#define IRQ_AVILA_PCI_INTA	IRQ_IXP4XX_GPIO11

#define IRQ_AVILA_PCI_INTB	IRQ_IXP4XX_GPIO10

#define IRQ_AVILA_PCI_INTC	IRQ_IXP4XX_GPIO9

#define IRQ_AVILA_PCI_INTD	IRQ_IXP4XX_GPIO8



void __init avila_pci_preinit(void)

{

	set_irq_type(IRQ_AVILA_PCI_INTA, IRQ_TYPE_LEVEL_LOW);

arch/arm/mach-ixp4xx/avila-setup.c

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/serial_8250.h>

#include <linux/slab.h>

#include <linux/i2c-gpio.h>



#include <asm/types.h>

#include <asm/setup.h>

#include <asm/memory.h>
@@ -29,6 +28,9 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/flash.h>



#define AVILA_SDA_PIN	7

#define AVILA_SCL_PIN	6



static struct flash_platform_data avila_flash_data = {

	.map_name	= "cfi_probe",

	.width		= 2,

arch/arm/mach-ixp4xx/include/mach/avila.h

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

 * arch/arm/mach-ixp4xx/include/mach/avila.h

 *

 * Gateworks Avila platform specific definitions

 *

 * Author: Michael-Luke Jones <mlj28@cam.ac.uk>

 *

 * Based on ixdp425.h

 * Author: Deepak Saxena <dsaxena@plexity.net>

 *

 * Copyright 2004 (c) MontaVista, Software, Inc.

 *

 * This file is licensed under  the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#ifndef __ASM_ARCH_HARDWARE_H__

#error "Do not include this directly, instead #include <mach/hardware.h>"

#endif



#define	AVILA_SDA_PIN		7

#define	AVILA_SCL_PIN		6



/*

 * AVILA PCI IRQs

 */

#define AVILA_PCI_MAX_DEV	4

#define LOFT_PCI_MAX_DEV    6

#define AVILA_PCI_IRQ_LINES	4





/* PCI controller GPIO to IRQ pin mappings */

#define AVILA_PCI_INTA_PIN	11

#define AVILA_PCI_INTB_PIN	10

#define AVILA_PCI_INTC_PIN	9

#define AVILA_PCI_INTD_PIN	8

arch/arm/mach-ixp4xx/include/mach/hardware.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include "platform.h"



/* Platform specific details */

#include "avila.h"

#include "coyote.h"

#include "prpmc1100.h"

#include "nslu2.h"

arch/arm/mach-ixp4xx/include/mach/irqs.h

+0 −9
Original line number Diff line number Diff line
@@ -70,15 +70,6 @@ 


#define	XSCALE_PMU_IRQ		(IRQ_IXP4XX_XSCALE_PMU)



/*

 * Gateworks Avila board IRQs

 */

#define	IRQ_AVILA_PCI_INTA	IRQ_IXP4XX_GPIO11

#define	IRQ_AVILA_PCI_INTB	IRQ_IXP4XX_GPIO10

#define	IRQ_AVILA_PCI_INTC	IRQ_IXP4XX_GPIO9

#define	IRQ_AVILA_PCI_INTD	IRQ_IXP4XX_GPIO8





/*

 * PrPMC1100 Board IRQs

 */