Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

IXP4xx: move DSM G600 platform macros to the platform code.



Signed-off-by: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
parent 23fa6846
Loading
Loading
Loading
Loading
+18 −1
Original line number Diff line number Diff line
@@ -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);
+17 −0
Original line number Diff line number Diff line
@@ -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,
+0 −52
Original line number Diff line number Diff line
/*
 * DSM-G600 platform specific definitions
 *
 * Copyright (C) 2006 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 DSMG600_SDA_PIN		5
#define DSMG600_SCL_PIN		4

/*
 * DSMG600 PCI IRQs
 */
#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

/* 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
+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@

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

#endif  /* _ASM_ARCH_HARDWARE_H */
+0 −10
Original line number Diff line number Diff line
@@ -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
 */