diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-10 11:45:23 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-24 09:40:43 -0400 |
commit | 68a9c5ba14856d3738c906764aa38336f02e2e11 (patch) | |
tree | befe9b58c1b3d8a3ab82fd83257c6550218f2a99 /arch | |
parent | e9ec2a17eea971f1af91a37a1c685afad0f5a8b4 (diff) |
ARM: imx1: rename imx_csi_device to match its .name
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx1/devices.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-mx1/devices.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-mx1/devices.c b/arch/arm/mach-mx1/devices.c index 860cbb7397d5..fa3809d2d1bf 100644 --- a/arch/arm/mach-mx1/devices.c +++ b/arch/arm/mach-mx1/devices.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include "devices.h" | 30 | #include "devices.h" |
31 | 31 | ||
32 | static struct resource imx_csi_resources[] = { | 32 | static struct resource imx1_camera_resources[] = { |
33 | { | 33 | { |
34 | .start = 0x00224000, | 34 | .start = 0x00224000, |
35 | .end = 0x00224010, | 35 | .end = 0x00224010, |
@@ -41,17 +41,17 @@ static struct resource imx_csi_resources[] = { | |||
41 | }, | 41 | }, |
42 | }; | 42 | }; |
43 | 43 | ||
44 | static u64 imx_csi_dmamask = DMA_BIT_MASK(32); | 44 | static u64 imx1_camera_dmamask = DMA_BIT_MASK(32); |
45 | 45 | ||
46 | struct platform_device imx_csi_device = { | 46 | struct platform_device imx1_camera_device = { |
47 | .name = "mx1-camera", | 47 | .name = "mx1-camera", |
48 | .id = 0, /* This is used to put cameras on this interface */ | 48 | .id = 0, /* This is used to put cameras on this interface */ |
49 | .dev = { | 49 | .dev = { |
50 | .dma_mask = &imx_csi_dmamask, | 50 | .dma_mask = &imx1_camera_dmamask, |
51 | .coherent_dma_mask = DMA_BIT_MASK(32), | 51 | .coherent_dma_mask = DMA_BIT_MASK(32), |
52 | }, | 52 | }, |
53 | .resource = imx_csi_resources, | 53 | .resource = imx1_camera_resources, |
54 | .num_resources = ARRAY_SIZE(imx_csi_resources), | 54 | .num_resources = ARRAY_SIZE(imx1_camera_resources), |
55 | }; | 55 | }; |
56 | 56 | ||
57 | static struct resource imx_i2c_resources[] = { | 57 | static struct resource imx_i2c_resources[] = { |
diff --git a/arch/arm/mach-mx1/devices.h b/arch/arm/mach-mx1/devices.h index 0da5d7cce3a2..899f8d97e682 100644 --- a/arch/arm/mach-mx1/devices.h +++ b/arch/arm/mach-mx1/devices.h | |||
@@ -1,4 +1,4 @@ | |||
1 | extern struct platform_device imx_csi_device; | 1 | extern struct platform_device imx1_camera_device; |
2 | extern struct platform_device imx_i2c_device; | 2 | extern struct platform_device imx_i2c_device; |
3 | extern struct platform_device imx_uart1_device; | 3 | extern struct platform_device imx_uart1_device; |
4 | extern struct platform_device imx_uart2_device; | 4 | extern struct platform_device imx_uart2_device; |