aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-03-04 15:02:41 -0500
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-24 09:40:24 -0400
commit05a3185cad1bb4e1b2206fdca9041234c3662a25 (patch)
tree8ba67c86d4ab2b6d3f2318f3b32dce18b9b72f62 /arch/arm
parentc10ea4d60eb387dac4d3011e40d5536eb7642a93 (diff)
ARM: mx1: don't use deprecated symbol names
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mx1/Makefile1
-rw-r--r--arch/arm/mach-mx1/clock.c3
-rw-r--r--arch/arm/mach-mx1/crm_regs.h4
-rw-r--r--arch/arm/mach-mx1/devices.c117
-rw-r--r--arch/arm/mach-mx1/generic.c13
-rw-r--r--arch/arm/mach-mx1/mach-mx1ads.c12
-rw-r--r--arch/arm/mach-mx1/mach-scb9328.c12
7 files changed, 81 insertions, 81 deletions
diff --git a/arch/arm/mach-mx1/Makefile b/arch/arm/mach-mx1/Makefile
index fc2ddf82441..297d17210e1 100644
--- a/arch/arm/mach-mx1/Makefile
+++ b/arch/arm/mach-mx1/Makefile
@@ -4,7 +4,6 @@
4 4
5# Object file lists. 5# Object file lists.
6 6
7EXTRA_CFLAGS += -DIMX_NEEDS_DEPRECATED_SYMBOLS
8obj-y += generic.o clock.o devices.o 7obj-y += generic.o clock.o devices.o
9 8
10# Support for CMOS sensor interface 9# Support for CMOS sensor interface
diff --git a/arch/arm/mach-mx1/clock.c b/arch/arm/mach-mx1/clock.c
index 6cf2d4a7511..610b88d98a8 100644
--- a/arch/arm/mach-mx1/clock.c
+++ b/arch/arm/mach-mx1/clock.c
@@ -596,7 +596,8 @@ int __init mx1_clocks_init(unsigned long fref)
596 clk_enable(&hclk); 596 clk_enable(&hclk);
597 clk_enable(&fclk); 597 clk_enable(&fclk);
598 598
599 mxc_timer_init(&gpt_clk, IO_ADDRESS(TIM1_BASE_ADDR), TIM1_INT); 599 mxc_timer_init(&gpt_clk, MX1_IO_ADDRESS(MX1_TIM1_BASE_ADDR),
600 MX1_TIM1_INT);
600 601
601 return 0; 602 return 0;
602} 603}
diff --git a/arch/arm/mach-mx1/crm_regs.h b/arch/arm/mach-mx1/crm_regs.h
index 22e866ff0c0..13e81e6e589 100644
--- a/arch/arm/mach-mx1/crm_regs.h
+++ b/arch/arm/mach-mx1/crm_regs.h
@@ -9,8 +9,8 @@
9#ifndef __ARCH_ARM_MACH_MX1_CRM_REGS_H__ 9#ifndef __ARCH_ARM_MACH_MX1_CRM_REGS_H__
10#define __ARCH_ARM_MACH_MX1_CRM_REGS_H__ 10#define __ARCH_ARM_MACH_MX1_CRM_REGS_H__
11 11
12#define CCM_BASE IO_ADDRESS(CCM_BASE_ADDR) 12#define CCM_BASE MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR)
13#define SCM_BASE IO_ADDRESS(SCM_BASE_ADDR) 13#define SCM_BASE MX1_IO_ADDRESS(MX1_SCM_BASE_ADDR)
14 14
15/* CCM register addresses */ 15/* CCM register addresses */
16#define CCM_CSCR (CCM_BASE + 0x0) 16#define CCM_CSCR (CCM_BASE + 0x0)
diff --git a/arch/arm/mach-mx1/devices.c b/arch/arm/mach-mx1/devices.c
index b6be29d1cb0..8064f2c3b86 100644
--- a/arch/arm/mach-mx1/devices.c
+++ b/arch/arm/mach-mx1/devices.c
@@ -21,6 +21,7 @@
21 21
22#include <linux/kernel.h> 22#include <linux/kernel.h>
23#include <linux/init.h> 23#include <linux/init.h>
24#include <linux/dma-mapping.h>
24#include <linux/platform_device.h> 25#include <linux/platform_device.h>
25#include <linux/gpio.h> 26#include <linux/gpio.h>
26#include <mach/irqs.h> 27#include <mach/irqs.h>
@@ -34,20 +35,20 @@ static struct resource imx_csi_resources[] = {
34 .end = 0x00224010, 35 .end = 0x00224010,
35 .flags = IORESOURCE_MEM, 36 .flags = IORESOURCE_MEM,
36 }, { 37 }, {
37 .start = CSI_INT, 38 .start = MX1_CSI_INT,
38 .end = CSI_INT, 39 .end = MX1_CSI_INT,
39 .flags = IORESOURCE_IRQ, 40 .flags = IORESOURCE_IRQ,
40 }, 41 },
41}; 42};
42 43
43static u64 imx_csi_dmamask = 0xffffffffUL; 44static u64 imx_csi_dmamask = DMA_BIT_MASK(32);
44 45
45struct platform_device imx_csi_device = { 46struct platform_device imx_csi_device = {
46 .name = "mx1-camera", 47 .name = "mx1-camera",
47 .id = 0, /* This is used to put cameras on this interface */ 48 .id = 0, /* This is used to put cameras on this interface */
48 .dev = { 49 .dev = {
49 .dma_mask = &imx_csi_dmamask, 50 .dma_mask = &imx_csi_dmamask,
50 .coherent_dma_mask = 0xffffffff, 51 .coherent_dma_mask = DMA_BIT_MASK(32),
51 }, 52 },
52 .resource = imx_csi_resources, 53 .resource = imx_csi_resources,
53 .num_resources = ARRAY_SIZE(imx_csi_resources), 54 .num_resources = ARRAY_SIZE(imx_csi_resources),
@@ -59,8 +60,8 @@ static struct resource imx_i2c_resources[] = {
59 .end = 0x00217010, 60 .end = 0x00217010,
60 .flags = IORESOURCE_MEM, 61 .flags = IORESOURCE_MEM,
61 }, { 62 }, {
62 .start = I2C_INT, 63 .start = MX1_I2C_INT,
63 .end = I2C_INT, 64 .end = MX1_I2C_INT,
64 .flags = IORESOURCE_IRQ, 65 .flags = IORESOURCE_IRQ,
65 }, 66 },
66}; 67};
@@ -74,21 +75,21 @@ struct platform_device imx_i2c_device = {
74 75
75static struct resource imx_uart1_resources[] = { 76static struct resource imx_uart1_resources[] = {
76 { 77 {
77 .start = UART1_BASE_ADDR, 78 .start = MX1_UART1_BASE_ADDR,
78 .end = UART1_BASE_ADDR + 0xD0, 79 .end = MX1_UART1_BASE_ADDR + 0xD0,
79 .flags = IORESOURCE_MEM, 80 .flags = IORESOURCE_MEM,
80 }, { 81 }, {
81 .start = UART1_MINT_RX, 82 .start = MX1_UART1_MINT_RX,
82 .end = UART1_MINT_RX, 83 .end = MX1_UART1_MINT_RX,
83 .flags = IORESOURCE_IRQ, 84 .flags = IORESOURCE_IRQ,
84 }, { 85 }, {
85 .start = UART1_MINT_TX, 86 .start = MX1_UART1_MINT_TX,
86 .end = UART1_MINT_TX, 87 .end = MX1_UART1_MINT_TX,
87 .flags = IORESOURCE_IRQ, 88 .flags = IORESOURCE_IRQ,
88 }, { 89 }, {
89 .start = UART1_MINT_RTS, 90 .start = MX1_UART1_MINT_RTS,
90 .end = UART1_MINT_RTS, 91 .end = MX1_UART1_MINT_RTS,
91 .flags = IORESOURCE_IRQ, 92 .flags = IORESOURCE_IRQ,
92 }, 93 },
93}; 94};
94 95
@@ -101,21 +102,21 @@ struct platform_device imx_uart1_device = {
101 102
102static struct resource imx_uart2_resources[] = { 103static struct resource imx_uart2_resources[] = {
103 { 104 {
104 .start = UART2_BASE_ADDR, 105 .start = MX1_UART2_BASE_ADDR,
105 .end = UART2_BASE_ADDR + 0xD0, 106 .end = MX1_UART2_BASE_ADDR + 0xD0,
106 .flags = IORESOURCE_MEM, 107 .flags = IORESOURCE_MEM,
107 }, { 108 }, {
108 .start = UART2_MINT_RX, 109 .start = MX1_UART2_MINT_RX,
109 .end = UART2_MINT_RX, 110 .end = MX1_UART2_MINT_RX,
110 .flags = IORESOURCE_IRQ, 111 .flags = IORESOURCE_IRQ,
111 }, { 112 }, {
112 .start = UART2_MINT_TX, 113 .start = MX1_UART2_MINT_TX,
113 .end = UART2_MINT_TX, 114 .end = MX1_UART2_MINT_TX,
114 .flags = IORESOURCE_IRQ, 115 .flags = IORESOURCE_IRQ,
115 }, { 116 }, {
116 .start = UART2_MINT_RTS, 117 .start = MX1_UART2_MINT_RTS,
117 .end = UART2_MINT_RTS, 118 .end = MX1_UART2_MINT_RTS,
118 .flags = IORESOURCE_IRQ, 119 .flags = IORESOURCE_IRQ,
119 }, 120 },
120}; 121};
121 122
@@ -132,12 +133,12 @@ static struct resource imx_rtc_resources[] = {
132 .end = 0x00204024, 133 .end = 0x00204024,
133 .flags = IORESOURCE_MEM, 134 .flags = IORESOURCE_MEM,
134 }, { 135 }, {
135 .start = RTC_INT, 136 .start = MX1_RTC_INT,
136 .end = RTC_INT, 137 .end = MX1_RTC_INT,
137 .flags = IORESOURCE_IRQ, 138 .flags = IORESOURCE_IRQ,
138 }, { 139 }, {
139 .start = RTC_SAMINT, 140 .start = MX1_RTC_SAMINT,
140 .end = RTC_SAMINT, 141 .end = MX1_RTC_SAMINT,
141 .flags = IORESOURCE_IRQ, 142 .flags = IORESOURCE_IRQ,
142 }, 143 },
143}; 144};
@@ -155,8 +156,8 @@ static struct resource imx_wdt_resources[] = {
155 .end = 0x00201008, 156 .end = 0x00201008,
156 .flags = IORESOURCE_MEM, 157 .flags = IORESOURCE_MEM,
157 }, { 158 }, {
158 .start = WDT_INT, 159 .start = MX1_WDT_INT,
159 .end = WDT_INT, 160 .end = MX1_WDT_INT,
160 .flags = IORESOURCE_IRQ, 161 .flags = IORESOURCE_IRQ,
161 }, 162 },
162}; 163};
@@ -174,32 +175,32 @@ static struct resource imx_usb_resources[] = {
174 .end = 0x00212148, 175 .end = 0x00212148,
175 .flags = IORESOURCE_MEM, 176 .flags = IORESOURCE_MEM,
176 }, { 177 }, {
177 .start = USBD_INT0, 178 .start = MX1_USBD_INT0,
178 .end = USBD_INT0, 179 .end = MX1_USBD_INT0,
179 .flags = IORESOURCE_IRQ, 180 .flags = IORESOURCE_IRQ,
180 }, { 181 }, {
181 .start = USBD_INT1, 182 .start = MX1_USBD_INT1,
182 .end = USBD_INT1, 183 .end = MX1_USBD_INT1,
183 .flags = IORESOURCE_IRQ, 184 .flags = IORESOURCE_IRQ,
184 }, { 185 }, {
185 .start = USBD_INT2, 186 .start = MX1_USBD_INT2,
186 .end = USBD_INT2, 187 .end = MX1_USBD_INT2,
187 .flags = IORESOURCE_IRQ, 188 .flags = IORESOURCE_IRQ,
188 }, { 189 }, {
189 .start = USBD_INT3, 190 .start = MX1_USBD_INT3,
190 .end = USBD_INT3, 191 .end = MX1_USBD_INT3,
191 .flags = IORESOURCE_IRQ, 192 .flags = IORESOURCE_IRQ,
192 }, { 193 }, {
193 .start = USBD_INT4, 194 .start = MX1_USBD_INT4,
194 .end = USBD_INT4, 195 .end = MX1_USBD_INT4,
195 .flags = IORESOURCE_IRQ, 196 .flags = IORESOURCE_IRQ,
196 }, { 197 }, {
197 .start = USBD_INT5, 198 .start = MX1_USBD_INT5,
198 .end = USBD_INT5, 199 .end = MX1_USBD_INT5,
199 .flags = IORESOURCE_IRQ, 200 .flags = IORESOURCE_IRQ,
200 }, { 201 }, {
201 .start = USBD_INT6, 202 .start = MX1_USBD_INT6,
202 .end = USBD_INT6, 203 .end = MX1_USBD_INT6,
203 .flags = IORESOURCE_IRQ, 204 .flags = IORESOURCE_IRQ,
204 }, 205 },
205}; 206};
@@ -215,23 +216,23 @@ struct platform_device imx_usb_device = {
215static struct mxc_gpio_port imx_gpio_ports[] = { 216static struct mxc_gpio_port imx_gpio_ports[] = {
216 { 217 {
217 .chip.label = "gpio-0", 218 .chip.label = "gpio-0",
218 .base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR), 219 .base = (void __iomem *)MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR),
219 .irq = GPIO_INT_PORTA, 220 .irq = MX1_GPIO_INT_PORTA,
220 .virtual_irq_start = MXC_GPIO_IRQ_START, 221 .virtual_irq_start = MXC_GPIO_IRQ_START,
221 }, { 222 }, {
222 .chip.label = "gpio-1", 223 .chip.label = "gpio-1",
223 .base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR + 0x100), 224 .base = (void __iomem *)MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR + 0x100),
224 .irq = GPIO_INT_PORTB, 225 .irq = MX1_GPIO_INT_PORTB,
225 .virtual_irq_start = MXC_GPIO_IRQ_START + 32, 226 .virtual_irq_start = MXC_GPIO_IRQ_START + 32,
226 }, { 227 }, {
227 .chip.label = "gpio-2", 228 .chip.label = "gpio-2",
228 .base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR + 0x200), 229 .base = (void __iomem *)MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR + 0x200),
229 .irq = GPIO_INT_PORTC, 230 .irq = MX1_GPIO_INT_PORTC,
230 .virtual_irq_start = MXC_GPIO_IRQ_START + 64, 231 .virtual_irq_start = MXC_GPIO_IRQ_START + 64,
231 }, { 232 }, {
232 .chip.label = "gpio-3", 233 .chip.label = "gpio-3",
233 .base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR + 0x300), 234 .base = (void __iomem *)MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR + 0x300),
234 .irq = GPIO_INT_PORTD, 235 .irq = MX1_GPIO_INT_PORTD,
235 .virtual_irq_start = MXC_GPIO_IRQ_START + 96, 236 .virtual_irq_start = MXC_GPIO_IRQ_START + 96,
236 } 237 }
237}; 238};
diff --git a/arch/arm/mach-mx1/generic.c b/arch/arm/mach-mx1/generic.c
index 7f9fc1034c0..5a745d99e66 100644
--- a/arch/arm/mach-mx1/generic.c
+++ b/arch/arm/mach-mx1/generic.c
@@ -31,23 +31,22 @@
31 31
32static struct map_desc imx_io_desc[] __initdata = { 32static struct map_desc imx_io_desc[] __initdata = {
33 { 33 {
34 .virtual = IMX_IO_BASE, 34 .virtual = MX1_IO_BASE_ADDR_VIRT,
35 .pfn = __phys_to_pfn(IMX_IO_PHYS), 35 .pfn = __phys_to_pfn(MX1_IO_BASE_ADDR),
36 .length = IMX_IO_SIZE, 36 .length = MX1_IO_SIZE,
37 .type = MT_DEVICE 37 .type = MT_DEVICE
38 } 38 }
39}; 39};
40 40
41void __init mx1_map_io(void) 41void __init mx1_map_io(void)
42{ 42{
43 mxc_set_cpu_type(MXC_CPU_MX1); 43 mxc_set_cpu_type(MXC_CPU_MX1);
44 mxc_arch_reset_init(IO_ADDRESS(WDT_BASE_ADDR)); 44 mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR));
45 45
46 iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc)); 46 iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc));
47} 47}
48 48
49void __init mx1_init_irq(void) 49void __init mx1_init_irq(void)
50{ 50{
51 mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR)); 51 mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR));
52} 52}
53
diff --git a/arch/arm/mach-mx1/mach-mx1ads.c b/arch/arm/mach-mx1/mach-mx1ads.c
index 51f3cfd83db..27c8222092a 100644
--- a/arch/arm/mach-mx1/mach-mx1ads.c
+++ b/arch/arm/mach-mx1/mach-mx1ads.c
@@ -75,8 +75,8 @@ static struct physmap_flash_data mx1ads_flash_data = {
75}; 75};
76 76
77static struct resource flash_resource = { 77static struct resource flash_resource = {
78 .start = IMX_CS0_PHYS, 78 .start = MX1_CS0_PHYS,
79 .end = IMX_CS0_PHYS + SZ_32M - 1, 79 .end = MX1_CS0_PHYS + SZ_32M - 1,
80 .flags = IORESOURCE_MEM, 80 .flags = IORESOURCE_MEM,
81}; 81};
82 82
@@ -145,8 +145,8 @@ struct sys_timer mx1ads_timer = {
145 145
146MACHINE_START(MX1ADS, "Freescale MX1ADS") 146MACHINE_START(MX1ADS, "Freescale MX1ADS")
147 /* Maintainer: Sascha Hauer, Pengutronix */ 147 /* Maintainer: Sascha Hauer, Pengutronix */
148 .phys_io = IMX_IO_PHYS, 148 .phys_io = MX1_IO_BASE_ADDR,
149 .io_pg_offst = (IMX_IO_BASE >> 18) & 0xfffc, 149 .io_pg_offst = (MX1_IO_BASE_ADDR_VIRT >> 18) & 0xfffc,
150 .boot_params = MX1_PHYS_OFFSET + 0x100, 150 .boot_params = MX1_PHYS_OFFSET + 0x100,
151 .map_io = mx1_map_io, 151 .map_io = mx1_map_io,
152 .init_irq = mx1_init_irq, 152 .init_irq = mx1_init_irq,
@@ -155,8 +155,8 @@ MACHINE_START(MX1ADS, "Freescale MX1ADS")
155MACHINE_END 155MACHINE_END
156 156
157MACHINE_START(MXLADS, "Freescale MXLADS") 157MACHINE_START(MXLADS, "Freescale MXLADS")
158 .phys_io = IMX_IO_PHYS, 158 .phys_io = MX1_IO_BASE_ADDR,
159 .io_pg_offst = (IMX_IO_BASE >> 18) & 0xfffc, 159 .io_pg_offst = (MX1_IO_BASE_ADDR_VIRT >> 18) & 0xfffc,
160 .boot_params = MX1_PHYS_OFFSET + 0x100, 160 .boot_params = MX1_PHYS_OFFSET + 0x100,
161 .map_io = mx1_map_io, 161 .map_io = mx1_map_io,
162 .init_irq = mx1_init_irq, 162 .init_irq = mx1_init_irq,
diff --git a/arch/arm/mach-mx1/mach-scb9328.c b/arch/arm/mach-mx1/mach-scb9328.c
index 7587a7a1246..7c6bbe83545 100644
--- a/arch/arm/mach-mx1/mach-scb9328.c
+++ b/arch/arm/mach-mx1/mach-scb9328.c
@@ -31,8 +31,8 @@
31 * This scb9328 has a 32MiB flash 31 * This scb9328 has a 32MiB flash
32 */ 32 */
33static struct resource flash_resource = { 33static struct resource flash_resource = {
34 .start = IMX_CS0_PHYS, 34 .start = MX1_CS0_PHYS,
35 .end = IMX_CS0_PHYS + (32 * 1024 * 1024) - 1, 35 .end = MX1_CS0_PHYS + (32 * 1024 * 1024) - 1,
36 .flags = IORESOURCE_MEM, 36 .flags = IORESOURCE_MEM,
37}; 37};
38 38
@@ -70,13 +70,13 @@ static struct dm9000_plat_data dm9000_platdata = {
70static struct resource dm9000x_resources[] = { 70static struct resource dm9000x_resources[] = {
71 { 71 {
72 .name = "address area", 72 .name = "address area",
73 .start = IMX_CS5_PHYS, 73 .start = MX1_CS5_PHYS,
74 .end = IMX_CS5_PHYS + 1, 74 .end = MX1_CS5_PHYS + 1,
75 .flags = IORESOURCE_MEM, /* address access */ 75 .flags = IORESOURCE_MEM, /* address access */
76 }, { 76 }, {
77 .name = "data area", 77 .name = "data area",
78 .start = IMX_CS5_PHYS + 4, 78 .start = MX1_CS5_PHYS + 4,
79 .end = IMX_CS5_PHYS + 5, 79 .end = MX1_CS5_PHYS + 5,
80 .flags = IORESOURCE_MEM, /* data access */ 80 .flags = IORESOURCE_MEM, /* data access */
81 }, { 81 }, {
82 .start = IRQ_GPIOC(3), 82 .start = IRQ_GPIOC(3),
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-23 12:27:32 -0500