Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code »

Commit 9bf4d676898b1f083a7ee20a0c6aacf2886eb49d

Authored by Krzysztof Hałasa
1 parent ed5b9fa0d1
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

IXP4xx: move IXDP425 platform macros to the platform code. 

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

Showing 5 changed files with 25 additions and 52 deletions Side-by-side Diff

arch/arm/mach-ixp4xx/include/mach/hardware.h
Diff comments   View file @ 9bf4d67
... ... @@ -44,7 +44,6 @@
44 44 #include "platform.h"
45 45  
46 46 /* Platform specific details */
47   -#include "ixdp425.h"
48 47 #include "avila.h"
49 48 #include "coyote.h"
50 49 #include "prpmc1100.h"
arch/arm/mach-ixp4xx/include/mach/irqs.h
Diff comments   View file @ 9bf4d67
... ... @@ -71,14 +71,6 @@
71 71 #define XSCALE_PMU_IRQ (IRQ_IXP4XX_XSCALE_PMU)
72 72  
73 73 /*
74   - * IXDP425 board IRQs
75   - */
76   -#define IRQ_IXDP425_PCI_INTA IRQ_IXP4XX_GPIO11
77   -#define IRQ_IXDP425_PCI_INTB IRQ_IXP4XX_GPIO10
78   -#define IRQ_IXDP425_PCI_INTC IRQ_IXP4XX_GPIO9
79   -#define IRQ_IXDP425_PCI_INTD IRQ_IXP4XX_GPIO8
80   -
81   -/*
82 74 * Gateworks Avila board IRQs
83 75 */
84 76 #define IRQ_AVILA_PCI_INTA IRQ_IXP4XX_GPIO11
arch/arm/mach-ixp4xx/include/mach/ixdp425.h
View file @ 9bf4d67
1   -/*
2   - * arch/arm/mach-ixp4xx/include/mach/ixdp425.h
3   - *
4   - * IXDP425 platform specific definitions
5   - *
6   - * Author: Deepak Saxena <dsaxena@plexity.net>
7   - *
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 IXDP425_SDA_PIN 7
20   -#define IXDP425_SCL_PIN 6
21   -
22   -/*
23   - * IXDP425 PCI IRQs
24   - */
25   -#define IXDP425_PCI_MAX_DEV 4
26   -#define IXDP425_PCI_IRQ_LINES 4
27   -
28   -
29   -/* PCI controller GPIO to IRQ pin mappings */
30   -#define IXDP425_PCI_INTA_PIN 11
31   -#define IXDP425_PCI_INTB_PIN 10
32   -#define IXDP425_PCI_INTC_PIN 9
33   -#define IXDP425_PCI_INTD_PIN 8
34   -
35   -/* NAND Flash pins */
36   -#define IXDP425_NAND_NCE_PIN 12
37   -
38   -#define IXDP425_NAND_CMD_BYTE 0x01
39   -#define IXDP425_NAND_ADDR_BYTE 0x02
arch/arm/mach-ixp4xx/ixdp425-pci.c
Diff comments   View file @ 9bf4d67
1 1 /*
2   - * arch/arm/mach-ixp4xx/ixdp425-pci.c
  2 + * arch/arm/mach-ixp4xx/ixdp425-pci.c
3 3 *
4 4 * IXDP425 board-level PCI initialization
5 5 *
6 6  
... ... @@ -19,11 +19,24 @@
19 19 #include <linux/init.h>
20 20 #include <linux/irq.h>
21 21 #include <linux/delay.h>
22   -
23 22 #include <asm/mach/pci.h>
24 23 #include <asm/irq.h>
25 24 #include <mach/hardware.h>
26 25 #include <asm/mach-types.h>
  26 +
  27 +#define IXDP425_PCI_MAX_DEV 4
  28 +#define IXDP425_PCI_IRQ_LINES 4
  29 +
  30 +/* PCI controller GPIO to IRQ pin mappings */
  31 +#define IXDP425_PCI_INTA_PIN 11
  32 +#define IXDP425_PCI_INTB_PIN 10
  33 +#define IXDP425_PCI_INTC_PIN 9
  34 +#define IXDP425_PCI_INTD_PIN 8
  35 +
  36 +#define IRQ_IXDP425_PCI_INTA IRQ_IXP4XX_GPIO11
  37 +#define IRQ_IXDP425_PCI_INTB IRQ_IXP4XX_GPIO10
  38 +#define IRQ_IXDP425_PCI_INTC IRQ_IXP4XX_GPIO9
  39 +#define IRQ_IXDP425_PCI_INTD IRQ_IXP4XX_GPIO8
27 40  
28 41 void __init ixdp425_pci_preinit(void)
29 42 {
arch/arm/mach-ixp4xx/ixdp425-setup.c
Diff comments   View file @ 9bf4d67
1 1 /*
2 2 * arch/arm/mach-ixp4xx/ixdp425-setup.c
3 3 *
4   - * IXDP425/IXCDP1100 board-setup
  4 + * IXDP425/IXCDP1100 board-setup
5 5 *
6 6 * Copyright (C) 2003-2005 MontaVista Software, Inc.
7 7 *
... ... @@ -21,7 +21,6 @@
21 21 #include <linux/mtd/nand.h>
22 22 #include <linux/mtd/partitions.h>
23 23 #include <linux/delay.h>
24   -
25 24 #include <asm/types.h>
26 25 #include <asm/setup.h>
27 26 #include <asm/memory.h>
... ... @@ -30,6 +29,15 @@
30 29 #include <asm/irq.h>
31 30 #include <asm/mach/arch.h>
32 31 #include <asm/mach/flash.h>
  32 +
  33 +#define IXDP425_SDA_PIN 7
  34 +#define IXDP425_SCL_PIN 6
  35 +
  36 +/* NAND Flash pins */
  37 +#define IXDP425_NAND_NCE_PIN 12
  38 +
  39 +#define IXDP425_NAND_CMD_BYTE 0x01
  40 +#define IXDP425_NAND_ADDR_BYTE 0x02
33 41  
34 42 static struct flash_platform_data ixdp425_flash_data = {
35 43 .map_name = "cfi_probe",