Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175878
b: refs/heads/master
c: a8b7b34
h: refs/heads/master
v: v3
  • Loading branch information
Krzysztof Hałasa committed Dec 5, 2009
1 parent 0495df6 commit 3cb9b40
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 122 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 31bcde37853f2a3795aaac3541d51bd2afc09d66
refs/heads/master: a8b7b34075f693632cd1483b817d4211c7a63257
18 changes: 15 additions & 3 deletions trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,26 @@
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/irq.h>

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

#define GTWX5715_PCI_SLOT0_DEVID 0
#define GTWX5715_PCI_SLOT0_INTA_GPIO 10
#define GTWX5715_PCI_SLOT0_INTB_GPIO 11
#define GTWX5715_PCI_SLOT0_INTA_IRQ IRQ_IXP4XX_GPIO10
#define GTWX5715_PCI_SLOT0_INTB_IRQ IRQ_IXP4XX_GPIO11

#define GTWX5715_PCI_SLOT1_DEVID 1
#define GTWX5715_PCI_SLOT1_INTA_GPIO 11
#define GTWX5715_PCI_SLOT1_INTB_GPIO 10
#define GTWX5715_PCI_SLOT1_INTA_IRQ IRQ_IXP4XX_GPIO11
#define GTWX5715_PCI_SLOT1_INTB_IRQ IRQ_IXP4XX_GPIO10

#define GTWX5715_PCI_SLOT_COUNT 2
#define GTWX5715_PCI_INT_PIN_COUNT 2

/*
* The exact GPIO pins and IRQs are defined in arch-ixp4xx/gtwx5715.h
* Slot 0 isn't actually populated with a card connector but
* we initialize it anyway in case a future version has the
* slot populated or someone with good soldering skills has
Expand Down
30 changes: 28 additions & 2 deletions trunk/arch/arm/mach-ixp4xx/gtwx5715-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <linux/tty.h>
#include <linux/serial_8250.h>
#include <linux/slab.h>

#include <asm/types.h>
#include <asm/setup.h>
#include <asm/memory.h>
Expand All @@ -37,7 +36,34 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <mach/gtwx5715.h>

/* GPIO 5,6,7 and 12 are hard wired to the Kendin KS8995M Switch
and operate as an SPI type interface. The details of the interface
are available on Kendin/Micrel's web site. */

#define GTWX5715_KSSPI_SELECT 5
#define GTWX5715_KSSPI_TXD 6
#define GTWX5715_KSSPI_CLOCK 7
#define GTWX5715_KSSPI_RXD 12

/* The "reset" button is wired to GPIO 3.
The GPIO is brought "low" when the button is pushed. */

#define GTWX5715_BUTTON_GPIO 3

/* Board Label Front Label
LED1 Power
LED2 Wireless-G
LED3 not populated but could be
LED4 Internet
LED5 - LED8 Controlled by KS8995M Switch
LED9 DMZ */

#define GTWX5715_LED1_GPIO 2
#define GTWX5715_LED2_GPIO 9
#define GTWX5715_LED3_GPIO 8
#define GTWX5715_LED4_GPIO 1
#define GTWX5715_LED9_GPIO 4

/*
* Xscale UART registers are 32 bits wide with only the least
Expand Down
116 changes: 0 additions & 116 deletions trunk/arch/arm/mach-ixp4xx/include/mach/gtwx5715.h

This file was deleted.

0 comments on commit 3cb9b40

Please sign in to comment.