Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eba4b8e authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: mx31moboard-smartbot: Remove camera support 



Since commit c93cc614 ("[media] staging/media: remove deprecated
mx3 driver") the mx3 camera driver has been removed, so remove the camera
support from the board file as well.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent a20bb25f

arch/arm/mach-imx/mx31moboard-smartbot.c

+0 −74
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include <linux/usb/otg.h>

#include <linux/usb/ulpi.h>



#include <media/soc_camera.h>



#include "board-mx31moboard.h"

#include "common.h"

#include "devices-imx31.h"
@@ -37,16 +35,6 @@ static unsigned int smartbot_pins[] = { 
	/* UART1 */

	MX31_PIN_CTS2__CTS2, MX31_PIN_RTS2__RTS2,

	MX31_PIN_TXD2__TXD2, MX31_PIN_RXD2__RXD2,

	/* CSI */

	MX31_PIN_CSI_D4__CSI_D4, MX31_PIN_CSI_D5__CSI_D5,

	MX31_PIN_CSI_D6__CSI_D6, MX31_PIN_CSI_D7__CSI_D7,

	MX31_PIN_CSI_D8__CSI_D8, MX31_PIN_CSI_D9__CSI_D9,

	MX31_PIN_CSI_D10__CSI_D10, MX31_PIN_CSI_D11__CSI_D11,

	MX31_PIN_CSI_D12__CSI_D12, MX31_PIN_CSI_D13__CSI_D13,

	MX31_PIN_CSI_D14__CSI_D14, MX31_PIN_CSI_D15__CSI_D15,

	MX31_PIN_CSI_HSYNC__CSI_HSYNC, MX31_PIN_CSI_MCLK__CSI_MCLK,

	MX31_PIN_CSI_PIXCLK__CSI_PIXCLK, MX31_PIN_CSI_VSYNC__CSI_VSYNC,

	MX31_PIN_GPIO3_0__GPIO3_0, MX31_PIN_GPIO3_1__GPIO3_1,

	/* ENABLES */

	MX31_PIN_DTR_DCE1__GPIO2_8, MX31_PIN_DSR_DCE1__GPIO2_9,

	MX31_PIN_RI_DCE1__GPIO2_10, MX31_PIN_DCD_DCE1__GPIO2_11,
@@ -56,65 +44,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = { 
	.flags = IMXUART_HAVE_RTSCTS,

};



#define CAM_POWER	IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)

#define CAM_RST_B	IOMUX_TO_GPIO(MX31_PIN_GPIO3_0)



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

{

	gpio_set_value(CAM_POWER, !on);

	return 0;

}



static int smartbot_cam_reset(struct device *dev)

{

	gpio_set_value(CAM_RST_B, 0);

	udelay(100);

	gpio_set_value(CAM_RST_B, 1);

	return 0;

}



static struct i2c_board_info smartbot_i2c_devices[] = {

	{

		I2C_BOARD_INFO("mt9t031", 0x5d),

	},

};



static struct soc_camera_link base_iclink = {

	.bus_id		= 0,		/* Must match with the camera ID */

	.power		= smartbot_cam_power,

	.reset		= smartbot_cam_reset,

	.board_info	= &smartbot_i2c_devices[0],

	.i2c_adapter_id	= 0,

};



static struct platform_device smartbot_camera[] = {

	{

		.name	= "soc-camera-pdrv",

		.id	= 0,

		.dev	= {

			.platform_data = &base_iclink,

		},

	},

};



static struct platform_device *smartbot_cameras[] __initdata = {

	&smartbot_camera[0],

};



static int __init smartbot_cam_init(void)

{

	int ret = gpio_request(CAM_RST_B, "cam-reset");

	if (ret)

		return ret;

	gpio_direction_output(CAM_RST_B, 1);

	ret = gpio_request(CAM_POWER, "cam-standby");

	if (ret)

		return ret;

	gpio_direction_output(CAM_POWER, 0);



	return 0;

}



static const struct fsl_usb2_platform_data usb_pdata __initconst = {

	.operating_mode	= FSL_USB2_DR_DEVICE,

	.phy_mode	= FSL_USB2_PHY_ULPI,
@@ -201,7 +130,4 @@ void __init mx31moboard_smartbot_init(int board) 
	}



	smartbot_resets_init();



	smartbot_cam_init();

	platform_add_devices(smartbot_cameras, ARRAY_SIZE(smartbot_cameras));

}