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

media: mach-omap1: board-ams-delta.c: remove soc_camera dependencies 



The soc_camera 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 omap1_camera.c was removed from soc_camera).

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c694107a

arch/arm/mach-omap1/board-ams-delta.c

+0 −32
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include <linux/io.h>

#include <linux/platform_data/gpio-omap.h>



#include <media/soc_camera.h>



#include <asm/serial.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -40,7 +38,6 @@ 
#include <mach/mux.h>



#include <mach/hardware.h>

#include "camera.h"

#include <mach/usb.h>



#include "ams-delta-fiq.h"
@@ -459,12 +456,6 @@ static struct gpiod_lookup_table leds_gpio_table = { 
	},

};



static struct i2c_board_info ams_delta_camera_board_info[] = {

	{

		I2C_BOARD_INFO("ov6650", 0x60),

	},

};



#ifdef CONFIG_LEDS_TRIGGERS

DEFINE_LED_TRIGGER(ams_delta_camera_led_trigger);
@@ -483,27 +474,6 @@ static int ams_delta_camera_power(struct device *dev, int power) 
#define ams_delta_camera_power	NULL

#endif



static struct soc_camera_link ams_delta_iclink = {

	.bus_id         = 0,	/* OMAP1 SoC camera bus */

	.i2c_adapter_id = 1,

	.board_info     = &ams_delta_camera_board_info[0],

	.module_name    = "ov6650",

	.power		= ams_delta_camera_power,

};



static struct platform_device ams_delta_camera_device = {

	.name   = "soc-camera-pdrv",

	.id     = 0,

	.dev    = {

		.platform_data = &ams_delta_iclink,

	},

};



static struct omap1_cam_platform_data ams_delta_camera_platform_data = {

	.camexclk_khz	= 12000,	/* default 12MHz clock, no extra DPLL */

	.lclk_khz_max	= 1334,		/* results in 5fps CIF, 10fps QCIF */

};



static struct platform_device ams_delta_audio_device = {

	.name   = "ams-delta-audio",

	.id     = -1,
@@ -598,7 +568,6 @@ static struct platform_device *ams_delta_devices[] __initdata = { 
	&latch1_gpio_device,

	&latch2_gpio_device,

	&ams_delta_kp_device,

	&ams_delta_camera_device,

	&ams_delta_audio_device,

	&ams_delta_serio_device,

	&ams_delta_nand_device,
@@ -750,7 +719,6 @@ static void __init ams_delta_init(void) 
	omap_register_i2c_bus(1, 100, NULL, 0);



	omap1_usb_init(&ams_delta_usb_config);

	omap1_set_camera_info(&ams_delta_camera_platform_data);

#ifdef CONFIG_LEDS_TRIGGERS

	led_trigger_register_simple("ams_delta_camera",

			&ams_delta_camera_led_trigger);

arch/arm/mach-omap1/camera.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ASM_ARCH_CAMERA_H_

#define __ASM_ARCH_CAMERA_H_



#include <linux/platform_data/media/omap1_camera.h>



void omap1_camera_init(void *);



static inline void omap1_set_camera_info(struct omap1_cam_platform_data *info)

{

	omap1_camera_init(info);

}



#endif /* __ASM_ARCH_CAMERA_H_ */

arch/arm/mach-omap1/devices.c

+0 −43
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <mach/mux.h>



#include <mach/omap7xx.h>

#include "camera.h"

#include <mach/hardware.h>



#include "common.h"
@@ -258,48 +257,6 @@ static inline void omap_init_spi100k(void) 
}

#endif





#define OMAP1_CAMERA_BASE	0xfffb6800

#define OMAP1_CAMERA_IOSIZE	0x1c



static struct resource omap1_camera_resources[] = {

	[0] = {

		.start	= OMAP1_CAMERA_BASE,

		.end	= OMAP1_CAMERA_BASE + OMAP1_CAMERA_IOSIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= INT_CAMERA,

		.flags	= IORESOURCE_IRQ,

	},

};



static u64 omap1_camera_dma_mask = DMA_BIT_MASK(32);



static struct platform_device omap1_camera_device = {

	.name		= "omap1-camera",

	.id		= 0, /* This is used to put cameras on this interface */

	.dev		= {

		.dma_mask		= &omap1_camera_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

	.num_resources	= ARRAY_SIZE(omap1_camera_resources),

	.resource	= omap1_camera_resources,

};



void __init omap1_camera_init(void *info)

{

	struct platform_device *dev = &omap1_camera_device;

	int ret;



	dev->dev.platform_data = info;



	ret = platform_device_register(dev);

	if (ret)

		dev_err(&dev->dev, "unable to register device: %d\n", ret);

}





/*-------------------------------------------------------------------------*/



static inline void omap_init_sti(void) {}

include/linux/platform_data/media/omap1_camera.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Header for V4L2 SoC Camera driver for OMAP1 Camera Interface

 *

 * Copyright (C) 2010, Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>

 */



#ifndef __MEDIA_OMAP1_CAMERA_H_

#define __MEDIA_OMAP1_CAMERA_H_



#include <linux/bitops.h>



#define OMAP1_CAMERA_IOSIZE		0x1c



enum omap1_cam_vb_mode {

	OMAP1_CAM_DMA_CONTIG = 0,

	OMAP1_CAM_DMA_SG,

};



#define OMAP1_CAMERA_MIN_BUF_COUNT(x)	((x) == OMAP1_CAM_DMA_CONTIG ? 3 : 2)



struct omap1_cam_platform_data {

	unsigned long	camexclk_khz;

	unsigned long	lclk_khz_max;

	unsigned long	flags;

};



#define OMAP1_CAMERA_LCLK_RISING	BIT(0)

#define OMAP1_CAMERA_RST_LOW		BIT(1)

#define OMAP1_CAMERA_RST_HIGH		BIT(2)



#endif /* __MEDIA_OMAP1_CAMERA_H_ */