diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-qong.c')
-rw-r--r-- | arch/arm/mach-imx/mach-qong.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c index 260621055b6b..39ceb8c10d5c 100644 --- a/arch/arm/mach-imx/mach-qong.c +++ b/arch/arm/mach-imx/mach-qong.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
23 | 23 | ||
24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
25 | #include <mach/irqs.h> | ||
26 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
27 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
28 | #include <asm/mach/time.h> | 27 | #include <asm/mach/time.h> |
@@ -51,8 +50,6 @@ | |||
51 | (QONG_FPGA_BASEADDR + QONG_DNET_ID * QONG_FPGA_PERIPH_SIZE) | 50 | (QONG_FPGA_BASEADDR + QONG_DNET_ID * QONG_FPGA_PERIPH_SIZE) |
52 | #define QONG_DNET_SIZE 0x00001000 | 51 | #define QONG_DNET_SIZE 0x00001000 |
53 | 52 | ||
54 | #define QONG_FPGA_IRQ IOMUX_TO_IRQ(MX31_PIN_DTR_DCE1) | ||
55 | |||
56 | static const struct imxuart_platform_data uart_pdata __initconst = { | 53 | static const struct imxuart_platform_data uart_pdata __initconst = { |
57 | .flags = IMXUART_HAVE_RTSCTS, | 54 | .flags = IMXUART_HAVE_RTSCTS, |
58 | }; | 55 | }; |
@@ -78,8 +75,7 @@ static struct resource dnet_resources[] = { | |||
78 | .end = QONG_DNET_BASEADDR + QONG_DNET_SIZE - 1, | 75 | .end = QONG_DNET_BASEADDR + QONG_DNET_SIZE - 1, |
79 | .flags = IORESOURCE_MEM, | 76 | .flags = IORESOURCE_MEM, |
80 | }, { | 77 | }, { |
81 | .start = QONG_FPGA_IRQ, | 78 | /* irq number is run-time assigned */ |
82 | .end = QONG_FPGA_IRQ, | ||
83 | .flags = IORESOURCE_IRQ, | 79 | .flags = IORESOURCE_IRQ, |
84 | }, | 80 | }, |
85 | }; | 81 | }; |
@@ -95,6 +91,10 @@ static int __init qong_init_dnet(void) | |||
95 | { | 91 | { |
96 | int ret; | 92 | int ret; |
97 | 93 | ||
94 | dnet_resources[1].start = | ||
95 | gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1)); | ||
96 | dnet_resources[1].end = | ||
97 | gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1)); | ||
98 | ret = platform_device_register(&dnet_device); | 98 | ret = platform_device_register(&dnet_device); |
99 | return ret; | 99 | return ret; |
100 | } | 100 | } |