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

IXP4xx: move NSLU2 platform macros to the platform code. 



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

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

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 


/* Platform specific details */

#include "prpmc1100.h"

#include "nslu2.h"

#include "nas100d.h"

#include "dsmg600.h"

#include "fsg.h"

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

+0 −7
Original line number Diff line number Diff line
@@ -78,13 +78,6 @@ 
#define	IRQ_PRPMC1100_PCI_INTC	IRQ_IXP4XX_GPIO9

#define	IRQ_PRPMC1100_PCI_INTD	IRQ_IXP4XX_GPIO8



/*

 * NSLU2 board IRQs

 */

#define        IRQ_NSLU2_PCI_INTA      IRQ_IXP4XX_GPIO11

#define        IRQ_NSLU2_PCI_INTB      IRQ_IXP4XX_GPIO10

#define        IRQ_NSLU2_PCI_INTC      IRQ_IXP4XX_GPIO9



/*

 * NAS100D board IRQs

 */

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

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

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

 *

 * NSLU2 platform specific definitions

 *

 * Author: Mark Rakes <mrakes AT mac.com>

 * Maintainers: http://www.nslu2-linux.org

 *

 * based on ixdp425.h:

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

#define NSLU2_SCL_PIN		6



/*

 * NSLU2 PCI IRQs

 */

#define NSLU2_PCI_MAX_DEV	3

#define NSLU2_PCI_IRQ_LINES	3





/* PCI controller GPIO to IRQ pin mappings */

#define NSLU2_PCI_INTA_PIN	11

#define NSLU2_PCI_INTB_PIN	10

#define NSLU2_PCI_INTC_PIN	9

#define NSLU2_PCI_INTD_PIN	8



/* NSLU2 Timer */

#define NSLU2_FREQ 66000000



/* Buttons */



#define NSLU2_PB_GPIO		5	/* power button */

#define NSLU2_PO_GPIO		8	/* power off */

#define NSLU2_RB_GPIO		12	/* reset button */



/* Buzzer */



#define NSLU2_GPIO_BUZZ		4



/* LEDs */



#define NSLU2_LED_RED_GPIO	0

#define NSLU2_LED_GRN_GPIO	1

#define NSLU2_LED_DISK1_GPIO	3

#define NSLU2_LED_DISK2_GPIO	2

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

+12 −1
Original line number Diff line number Diff line
@@ -18,10 +18,21 @@ 
#include <linux/pci.h>

#include <linux/init.h>

#include <linux/irq.h>



#include <asm/mach/pci.h>

#include <asm/mach-types.h>



#define NSLU2_PCI_MAX_DEV	3

#define NSLU2_PCI_IRQ_LINES	3



/* PCI controller GPIO to IRQ pin mappings */

#define NSLU2_PCI_INTA_PIN	11

#define NSLU2_PCI_INTB_PIN	10

#define NSLU2_PCI_INTC_PIN	9

#define NSLU2_PCI_INTD_PIN	8

#define IRQ_NSLU2_PCI_INTA      IRQ_IXP4XX_GPIO11

#define IRQ_NSLU2_PCI_INTB      IRQ_IXP4XX_GPIO10

#define IRQ_NSLU2_PCI_INTC      IRQ_IXP4XX_GPIO9



void __init nslu2_pci_preinit(void)

{

	set_irq_type(IRQ_NSLU2_PCI_INTA, IRQ_TYPE_LEVEL_LOW);

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

+20 −1
Original line number Diff line number Diff line
@@ -26,13 +26,32 @@ 
#include <linux/i2c.h>

#include <linux/i2c-gpio.h>

#include <linux/io.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/flash.h>

#include <asm/mach/time.h>

#include <asm/gpio.h>



#define NSLU2_SDA_PIN		7

#define NSLU2_SCL_PIN		6



/* NSLU2 Timer */

#define NSLU2_FREQ 66000000



/* Buttons */

#define NSLU2_PB_GPIO		5	/* power button */

#define NSLU2_PO_GPIO		8	/* power off */

#define NSLU2_RB_GPIO		12	/* reset button */



/* Buzzer */

#define NSLU2_GPIO_BUZZ		4



/* LEDs */

#define NSLU2_LED_RED_GPIO	0

#define NSLU2_LED_GRN_GPIO	1

#define NSLU2_LED_DISK1_GPIO	3

#define NSLU2_LED_DISK2_GPIO	2



static struct flash_platform_data nslu2_flash_data = {

	.map_name		= "cfi_probe",

	.width			= 2,