summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-colibri_t30.c
diff options
context:
space:
mode:
authorWojciech Bieganski <wbieganski@antmicro.com>2014-04-03 13:13:53 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-04-04 22:47:50 +0200
commit39989815e732886a763d41b0067eb9ce64a7e84f (patch)
tree9bd56bd2d2536f7d013b0de92c09d813f1087eb5 /arch/arm/mach-tegra/board-colibri_t30.c
parent09752a9d4cd2685f8f5859d8b2a6547f68ccbcbb (diff)
media: fixes in board-*.c files for Colibri T20/T30 and Apalis T30
This commit fixes the crash that occures while loading tegra_v4l2_camera module caused by its new features (private data per sensor). updated files: arch/arm/mach-tegra/board-apalis_t30.c arch/arm/mach-tegra/board-colibri_t20.c arch/arm/mach-tegra/board-colibri_t30.c
Diffstat (limited to 'arch/arm/mach-tegra/board-colibri_t30.c')
-rw-r--r--arch/arm/mach-tegra/board-colibri_t30.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c
index c35f2737f9df..1195cb2847b7 100644
--- a/arch/arm/mach-tegra/board-colibri_t30.c
+++ b/arch/arm/mach-tegra/board-colibri_t30.c
@@ -121,12 +121,13 @@ static struct tegra_camera_platform_data tegra_camera_platform_data = {
#if defined(CONFIG_SOC_CAMERA_MAX9526) || defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
static struct i2c_board_info camera_i2c_max9526 = {
- I2C_BOARD_INFO("max9526", 0x21),
+ I2C_BOARD_INFO("max9526", 0x20),
};
static struct soc_camera_link iclink_max9526 = {
.board_info = &camera_i2c_max9526,
.bus_id = -1, /* This must match the .id of tegra_vi01_device */
+ .priv = &tegra_camera_platform_data,
.i2c_adapter_id = 0,
};
@@ -141,21 +142,22 @@ static struct platform_device soc_camera_max9526 = {
#if defined(CONFIG_VIDEO_ADV7180) || defined(CONFIG_VIDEO_ADV7180_MODULE)
static struct i2c_board_info camera_i2c_adv7180 = {
- I2C_BOARD_INFO("adv7180", 0x21),
+ I2C_BOARD_INFO("adv7180", 0x21),
};
static struct soc_camera_link iclink_adv7180 = {
- .board_info = &camera_i2c_adv7180,
- .bus_id = -1, /* This must match the .id of tegra_vi01_device */
- .i2c_adapter_id = 0,
+ .board_info = &camera_i2c_adv7180,
+ .bus_id = -1, /* This must match the .id of tegra_vi01_device */
+ .priv = &tegra_camera_platform_data,
+ .i2c_adapter_id = 0,
};
static struct platform_device soc_camera_adv7180 = {
- .name = "soc-camera-pdrv",
- .id = 1,
- .dev = {
- .platform_data = &iclink_adv7180,
- },
+ .name = "soc-camera-pdrv",
+ .id = 1,
+ .dev = {
+ .platform_data = &iclink_adv7180,
+ },
};
#endif /* CONFIG_VIDEO_ADV7180 | CONFIG_VIDEO_ADV7180_MODULE */
@@ -167,6 +169,7 @@ static struct i2c_board_info camera_i2c_tvp5150soc = {
static struct soc_camera_link iclink_tvp5150soc = {
.board_info = &camera_i2c_tvp5150soc,
.bus_id = -1, /* This must match the .id of tegra_vi01_device */
+ .priv = &tegra_camera_platform_data,
.i2c_adapter_id = 0,
};
@@ -187,6 +190,7 @@ static struct i2c_board_info camera_i2c_ov7670soc = {
static struct soc_camera_link iclink_ov7670soc = {
.board_info = &camera_i2c_ov7670soc,
.bus_id = -1, /* This must match the .id of tegra_vi01_device */
+ .priv = &tegra_camera_platform_data,
.i2c_adapter_id = 0,
};
@@ -198,7 +202,6 @@ static struct platform_device soc_camera_ov7670soc = {
},
};
#endif /* CONFIG_SOC_CAMERA_OV7670SOC | CONFIG_SOC_CAMERA_OV7670SOC_MODULE */
-
#endif /* CONFIG_VIDEO_TEGRA | CONFIG_VIDEO_TEGRA_MODULE */
/* CAN */
@@ -1546,7 +1549,6 @@ static void __init colibri_t30_init(void)
colibri_t30_gpio_init();
#if defined(CONFIG_VIDEO_TEGRA) || defined(CONFIG_VIDEO_TEGRA_MODULE)
- t30_get_tegra_vi01_device()->dev.platform_data = &tegra_camera_platform_data;
#if defined(CONFIG_SOC_CAMERA_MAX9526) || defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
platform_device_register(&soc_camera_max9526);
#endif