aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khc@pm.waw.pl>2009-11-16 15:56:56 -0500
committerKrzysztof Hałasa <khc@pm.waw.pl>2009-12-05 10:58:40 -0500
commit395e71276cd394c103931bfb60ceec9a97c0eaee (patch)
tree5310d887fc8c6a68b6e8554ae79b5b1b4d99b04f /arch/arm/mach-ixp4xx
parent23fa6846a2e2ac6fcb6529f047570244ecbd957c (diff)
IXP4xx: move DSM G600 platform macros to the platform code.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r--arch/arm/mach-ixp4xx/dsmg600-pci.c19
-rw-r--r--arch/arm/mach-ixp4xx/dsmg600-setup.c17
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/dsmg600.h52
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/hardware.h1
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/irqs.h10
5 files changed, 35 insertions, 64 deletions
diff --git a/arch/arm/mach-ixp4xx/dsmg600-pci.c b/arch/arm/mach-ixp4xx/dsmg600-pci.c
index 926d15f885f..29a9e41fdf8 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-pci.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-pci.c
@@ -19,10 +19,27 @@
19#include <linux/pci.h> 19#include <linux/pci.h>
20#include <linux/init.h> 20#include <linux/init.h>
21#include <linux/irq.h> 21#include <linux/irq.h>
22
23#include <asm/mach/pci.h> 22#include <asm/mach/pci.h>
24#include <asm/mach-types.h> 23#include <asm/mach-types.h>
25 24
25#define DSMG600_PCI_MAX_DEV 4
26#define DSMG600_PCI_IRQ_LINES 3
27
28/* PCI controller GPIO to IRQ pin mappings */
29#define DSMG600_PCI_INTA_PIN 11
30#define DSMG600_PCI_INTB_PIN 10
31#define DSMG600_PCI_INTC_PIN 9
32#define DSMG600_PCI_INTD_PIN 8
33#define DSMG600_PCI_INTE_PIN 7
34#define DSMG600_PCI_INTF_PIN 6
35
36#define IRQ_DSMG600_PCI_INTA IRQ_IXP4XX_GPIO11
37#define IRQ_DSMG600_PCI_INTB IRQ_IXP4XX_GPIO10
38#define IRQ_DSMG600_PCI_INTC IRQ_IXP4XX_GPIO9
39#define IRQ_DSMG600_PCI_INTD IRQ_IXP4XX_GPIO8
40#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
41#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6
42
26void __init dsmg600_pci_preinit(void) 43void __init dsmg600_pci_preinit(void)
27{ 44{
28 set_irq_type(IRQ_DSMG600_PCI_INTA, IRQ_TYPE_LEVEL_LOW); 45 set_irq_type(IRQ_DSMG600_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index a51bfa6978b..7c1fa54a614 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -33,6 +33,23 @@
33#include <asm/mach/time.h> 33#include <asm/mach/time.h>
34#include <asm/gpio.h> 34#include <asm/gpio.h>
35 35
36#define DSMG600_SDA_PIN 5
37#define DSMG600_SCL_PIN 4
38
39/* DSM-G600 Timer Setting */
40#define DSMG600_FREQ 66000000
41
42/* Buttons */
43#define DSMG600_PB_GPIO 15 /* power button */
44#define DSMG600_RB_GPIO 3 /* reset button */
45
46/* Power control */
47#define DSMG600_PO_GPIO 2 /* power off */
48
49/* LEDs */
50#define DSMG600_LED_PWR_GPIO 0
51#define DSMG600_LED_WLAN_GPIO 14
52
36static struct flash_platform_data dsmg600_flash_data = { 53static struct flash_platform_data dsmg600_flash_data = {
37 .map_name = "cfi_probe", 54 .map_name = "cfi_probe",
38 .width = 2, 55 .width = 2,
diff --git a/arch/arm/mach-ixp4xx/include/mach/dsmg600.h b/arch/arm/mach-ixp4xx/include/mach/dsmg600.h
deleted file mode 100644
index dc087a34a26..00000000000
--- a/arch/arm/mach-ixp4xx/include/mach/dsmg600.h
+++ /dev/null
@@ -1,52 +0,0 @@
1/*
2 * DSM-G600 platform specific definitions
3 *
4 * Copyright (C) 2006 Tower Technologies
5 * Author: Alessandro Zummo <a.zummo@towertech.it>
6 *
7 * based on ixdp425.h:
8 * Copyright 2004 (C) MontaVista, Software, Inc.
9 *
10 * This file is licensed under the terms of the GNU General Public
11 * License version 2. This program is licensed "as is" without any
12 * warranty of any kind, whether express or implied.
13 */
14
15#ifndef __ASM_ARCH_HARDWARE_H__
16#error "Do not include this directly, instead #include <mach/hardware.h>"
17#endif
18
19#define DSMG600_SDA_PIN 5
20#define DSMG600_SCL_PIN 4
21
22/*
23 * DSMG600 PCI IRQs
24 */
25#define DSMG600_PCI_MAX_DEV 4
26#define DSMG600_PCI_IRQ_LINES 3
27
28
29/* PCI controller GPIO to IRQ pin mappings */
30#define DSMG600_PCI_INTA_PIN 11
31#define DSMG600_PCI_INTB_PIN 10
32#define DSMG600_PCI_INTC_PIN 9
33#define DSMG600_PCI_INTD_PIN 8
34#define DSMG600_PCI_INTE_PIN 7
35#define DSMG600_PCI_INTF_PIN 6
36
37/* DSM-G600 Timer Setting */
38#define DSMG600_FREQ 66000000
39
40/* Buttons */
41
42#define DSMG600_PB_GPIO 15 /* power button */
43#define DSMG600_RB_GPIO 3 /* reset button */
44
45/* Power control */
46
47#define DSMG600_PO_GPIO 2 /* power off */
48
49/* LEDs */
50
51#define DSMG600_LED_PWR_GPIO 0
52#define DSMG600_LED_WLAN_GPIO 14
diff --git a/arch/arm/mach-ixp4xx/include/mach/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h
index 05db6357661..555b8e19c53 100644
--- a/arch/arm/mach-ixp4xx/include/mach/hardware.h
+++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h
@@ -45,7 +45,6 @@
45 45
46/* Platform specific details */ 46/* Platform specific details */
47#include "prpmc1100.h" 47#include "prpmc1100.h"
48#include "dsmg600.h"
49#include "fsg.h" 48#include "fsg.h"
50 49
51#endif /* _ASM_ARCH_HARDWARE_H */ 50#endif /* _ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-ixp4xx/include/mach/irqs.h b/arch/arm/mach-ixp4xx/include/mach/irqs.h
index dff26af20ab..20053beb90a 100644
--- a/arch/arm/mach-ixp4xx/include/mach/irqs.h
+++ b/arch/arm/mach-ixp4xx/include/mach/irqs.h
@@ -79,16 +79,6 @@
79#define IRQ_PRPMC1100_PCI_INTD IRQ_IXP4XX_GPIO8 79#define IRQ_PRPMC1100_PCI_INTD IRQ_IXP4XX_GPIO8
80 80
81/* 81/*
82 * D-Link DSM-G600 RevA board IRQs
83 */
84#define IRQ_DSMG600_PCI_INTA IRQ_IXP4XX_GPIO11
85#define IRQ_DSMG600_PCI_INTB IRQ_IXP4XX_GPIO10
86#define IRQ_DSMG600_PCI_INTC IRQ_IXP4XX_GPIO9
87#define IRQ_DSMG600_PCI_INTD IRQ_IXP4XX_GPIO8
88#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
89#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6
90
91/*
92 * Freecom FSG-3 Board IRQs 82 * Freecom FSG-3 Board IRQs
93 */ 83 */
94#define IRQ_FSG_PCI_INTA IRQ_IXP4XX_GPIO6 84#define IRQ_FSG_PCI_INTA IRQ_IXP4XX_GPIO6