summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx1
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-10 17:45:23 +0200
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-24 15:40:43 +0200
commit68a9c5ba14856d3738c906764aa38336f02e2e11 (patch)
treebefe9b58c1b3d8a3ab82fd83257c6550218f2a99 /arch/arm/mach-mx1
parente9ec2a17eea971f1af91a37a1c685afad0f5a8b4 (diff)
downloadblackbird-op-linux-68a9c5ba14856d3738c906764aa38336f02e2e11.tar.gz
blackbird-op-linux-68a9c5ba14856d3738c906764aa38336f02e2e11.zip
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/arm/mach-mx1')
-rw-r--r--arch/arm/mach-mx1/devices.c12
-rw-r--r--arch/arm/mach-mx1/devices.h2
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 @@
#include "devices.h"
-static struct resource imx_csi_resources[] = {
+static struct resource imx1_camera_resources[] = {
{
.start = 0x00224000,
.end = 0x00224010,
@@ -41,17 +41,17 @@ static struct resource imx_csi_resources[] = {
},
};
-static u64 imx_csi_dmamask = DMA_BIT_MASK(32);
+static u64 imx1_camera_dmamask = DMA_BIT_MASK(32);
-struct platform_device imx_csi_device = {
+struct platform_device imx1_camera_device = {
.name = "mx1-camera",
.id = 0, /* This is used to put cameras on this interface */
.dev = {
- .dma_mask = &imx_csi_dmamask,
+ .dma_mask = &imx1_camera_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
- .resource = imx_csi_resources,
- .num_resources = ARRAY_SIZE(imx_csi_resources),
+ .resource = imx1_camera_resources,
+ .num_resources = ARRAY_SIZE(imx1_camera_resources),
};
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 @@
-extern struct platform_device imx_csi_device;
+extern struct platform_device imx1_camera_device;
extern struct platform_device imx_i2c_device;
extern struct platform_device imx_uart1_device;
extern struct platform_device imx_uart2_device;
OpenPOWER on IntegriCloud