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

IXP4xx: move NAS100D platform macros to the platform code. 



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

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 "nas100d.h"

#include "dsmg600.h"

#include "fsg.h"

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

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

#define	IRQ_PRPMC1100_PCI_INTD	IRQ_IXP4XX_GPIO8



/*

 * NAS100D board IRQs

 */

#define        IRQ_NAS100D_PCI_INTA    IRQ_IXP4XX_GPIO11

#define        IRQ_NAS100D_PCI_INTB    IRQ_IXP4XX_GPIO10

#define        IRQ_NAS100D_PCI_INTC    IRQ_IXP4XX_GPIO9

#define        IRQ_NAS100D_PCI_INTD    IRQ_IXP4XX_GPIO8

#define        IRQ_NAS100D_PCI_INTE    IRQ_IXP4XX_GPIO7



/*

 * D-Link DSM-G600 RevA board IRQs

 */

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

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

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

 *

 * NAS100D platform specific definitions

 *

 * Copyright (c) 2005 Tower Technologies

 *

 * Author: Alessandro Zummo <a.zummo@towertech.it>

 *

 * 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 NAS100D_SDA_PIN		5

#define NAS100D_SCL_PIN		6



/*

 * NAS100D PCI IRQs

 */

#define NAS100D_PCI_MAX_DEV	3

#define NAS100D_PCI_IRQ_LINES	3





/* PCI controller GPIO to IRQ pin mappings */

#define NAS100D_PCI_INTA_PIN	11

#define NAS100D_PCI_INTB_PIN	10

#define NAS100D_PCI_INTC_PIN	9

#define NAS100D_PCI_INTD_PIN	8

#define NAS100D_PCI_INTE_PIN	7



/* Buttons */



#define NAS100D_PB_GPIO         14   /* power button */

#define NAS100D_RB_GPIO         4    /* reset button */



/* Power control */



#define NAS100D_PO_GPIO         12   /* power off */



/* LEDs */



#define NAS100D_LED_WLAN_GPIO	0

#define NAS100D_LED_DISK_GPIO	3

#define NAS100D_LED_PWR_GPIO	15

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

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

#include <linux/init.h>

#include <linux/irq.h>



#include <asm/mach/pci.h>

#include <asm/mach-types.h>



#define NAS100D_PCI_MAX_DEV	3

#define NAS100D_PCI_IRQ_LINES	3



/* PCI controller GPIO to IRQ pin mappings */

#define NAS100D_PCI_INTA_PIN	11

#define NAS100D_PCI_INTB_PIN	10

#define NAS100D_PCI_INTC_PIN	9

#define NAS100D_PCI_INTD_PIN	8

#define NAS100D_PCI_INTE_PIN	7



#define IRQ_NAS100D_PCI_INTA    IRQ_IXP4XX_GPIO11

#define IRQ_NAS100D_PCI_INTB    IRQ_IXP4XX_GPIO10

#define IRQ_NAS100D_PCI_INTC    IRQ_IXP4XX_GPIO9

#define IRQ_NAS100D_PCI_INTD    IRQ_IXP4XX_GPIO8

#define IRQ_NAS100D_PCI_INTE    IRQ_IXP4XX_GPIO7



void __init nas100d_pci_preinit(void)

{

	set_irq_type(IRQ_NAS100D_PCI_INTA, IRQ_TYPE_LEVEL_LOW);

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

+15 −1
Original line number Diff line number Diff line
@@ -29,12 +29,26 @@ 
#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/gpio.h>



#define NAS100D_SDA_PIN		5

#define NAS100D_SCL_PIN		6



/* Buttons */

#define NAS100D_PB_GPIO         14   /* power button */

#define NAS100D_RB_GPIO         4    /* reset button */



/* Power control */

#define NAS100D_PO_GPIO         12   /* power off */



/* LEDs */

#define NAS100D_LED_WLAN_GPIO	0

#define NAS100D_LED_DISK_GPIO	3

#define NAS100D_LED_PWR_GPIO	15



static struct flash_platform_data nas100d_flash_data = {

	.map_name		= "cfi_probe",

	.width			= 2,