Skip to content

Commit

Permalink
IXP4xx: move DSM G600 platform macros to the platform code.
Browse files Browse the repository at this point in the history
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
  • Loading branch information
Krzysztof Hałasa committed Dec 5, 2009
1 parent 23fa684 commit 395e712
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 64 deletions.
19 changes: 18 additions & 1 deletion arch/arm/mach-ixp4xx/dsmg600-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,27 @@
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/irq.h>

#include <asm/mach/pci.h>
#include <asm/mach-types.h>

#define DSMG600_PCI_MAX_DEV 4
#define DSMG600_PCI_IRQ_LINES 3

/* PCI controller GPIO to IRQ pin mappings */
#define DSMG600_PCI_INTA_PIN 11
#define DSMG600_PCI_INTB_PIN 10
#define DSMG600_PCI_INTC_PIN 9
#define DSMG600_PCI_INTD_PIN 8
#define DSMG600_PCI_INTE_PIN 7
#define DSMG600_PCI_INTF_PIN 6

#define IRQ_DSMG600_PCI_INTA IRQ_IXP4XX_GPIO11
#define IRQ_DSMG600_PCI_INTB IRQ_IXP4XX_GPIO10
#define IRQ_DSMG600_PCI_INTC IRQ_IXP4XX_GPIO9
#define IRQ_DSMG600_PCI_INTD IRQ_IXP4XX_GPIO8
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6

void __init dsmg600_pci_preinit(void)
{
set_irq_type(IRQ_DSMG600_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
Expand Down
17 changes: 17 additions & 0 deletions arch/arm/mach-ixp4xx/dsmg600-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,23 @@
#include <asm/mach/time.h>
#include <asm/gpio.h>

#define DSMG600_SDA_PIN 5
#define DSMG600_SCL_PIN 4

/* DSM-G600 Timer Setting */
#define DSMG600_FREQ 66000000

/* Buttons */
#define DSMG600_PB_GPIO 15 /* power button */
#define DSMG600_RB_GPIO 3 /* reset button */

/* Power control */
#define DSMG600_PO_GPIO 2 /* power off */

/* LEDs */
#define DSMG600_LED_PWR_GPIO 0
#define DSMG600_LED_WLAN_GPIO 14

static struct flash_platform_data dsmg600_flash_data = {
.map_name = "cfi_probe",
.width = 2,
Expand Down
52 changes: 0 additions & 52 deletions arch/arm/mach-ixp4xx/include/mach/dsmg600.h

This file was deleted.

1 change: 0 additions & 1 deletion arch/arm/mach-ixp4xx/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@

/* Platform specific details */
#include "prpmc1100.h"
#include "dsmg600.h"
#include "fsg.h"

#endif /* _ASM_ARCH_HARDWARE_H */
10 changes: 0 additions & 10 deletions arch/arm/mach-ixp4xx/include/mach/irqs.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,6 @@
#define IRQ_PRPMC1100_PCI_INTC IRQ_IXP4XX_GPIO9
#define IRQ_PRPMC1100_PCI_INTD IRQ_IXP4XX_GPIO8

/*
* D-Link DSM-G600 RevA board IRQs
*/
#define IRQ_DSMG600_PCI_INTA IRQ_IXP4XX_GPIO11
#define IRQ_DSMG600_PCI_INTB IRQ_IXP4XX_GPIO10
#define IRQ_DSMG600_PCI_INTC IRQ_IXP4XX_GPIO9
#define IRQ_DSMG600_PCI_INTD IRQ_IXP4XX_GPIO8
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6

/*
* Freecom FSG-3 Board IRQs
*/
Expand Down

0 comments on commit 395e712

Please sign in to comment.