Commit c694107a authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: mach-imx: mach-imx27_visstrim_m10.c: remove soc_camera dependencies 



The soc_camera.h header driver is about to be removed, so drop camera
support from this board. Note that the soc_camera driver itself has
long since been deprecated and can't be compiled anymore (it depends
on BROKEN), so camera support on this board has been broken for a long
time (at least since 4.6 when the mx2_camera.c was removed from soc_camera).

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 5a55b647

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

+0 −31
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/dma-mapping.h>

#include <linux/leds.h>

#include <linux/platform_data/asoc-mx27vis.h>

#include <media/soc_camera.h>

#include <sound/tlv320aic32x4.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -191,34 +190,6 @@ static const struct gpio visstrim_m10_gpios[] __initconst = { 
};



/* Camera */

static int visstrim_camera_power(struct device *dev, int on)

{

	gpio_set_value(TVP5150_PWDN, on);



	return 0;

};



static int visstrim_camera_reset(struct device *dev)

{

	gpio_set_value(TVP5150_RSTN, 0);

	ndelay(500);

	gpio_set_value(TVP5150_RSTN, 1);



	return 0;

};



static struct i2c_board_info visstrim_i2c_camera =  {

	I2C_BOARD_INFO("tvp5150", 0x5d),

};



static struct soc_camera_link iclink_tvp5150 = {

	.bus_id         = 0,

	.board_info     = &visstrim_i2c_camera,

	.i2c_adapter_id = 0,

	.power = visstrim_camera_power,

	.reset = visstrim_camera_reset,

};



static struct mx2_camera_platform_data visstrim_camera = {

	.flags = MX2_CAMERA_CCIR | MX2_CAMERA_CCIR_INTERLACE |

		 MX2_CAMERA_PCLK_SAMPLE_RISING,
@@ -549,8 +520,6 @@ static void __init visstrim_m10_late_init(void) 


	imx_add_platform_device("mx27vis", 0, NULL, 0, &snd_mx27vis_pdata,

				sizeof(snd_mx27vis_pdata));

	platform_device_register_resndata(NULL, "soc-camera-pdrv", 0, NULL, 0,

				      &iclink_tvp5150, sizeof(iclink_tvp5150));



	gpio_led_register_device(0, &visstrim_m10_led_data);