[media] v4l: omap3isp: Drop platform data support (78c66fbc) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/media/platform/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ config VIDEO_M32R_AR_M64278
		config VIDEO_OMAP3
		tristate "OMAP 3 Camera support"
		depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
		depends on HAS_DMA
		depends on HAS_DMA && OF
		depends on OMAP_IOMMU
		select ARM_DMA_USE_IOMMU
		select VIDEOBUF2_DMA_CONTIG

drivers/media/platform/omap3isp/isp.c

+20 −113

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ static const struct isp_res_mapping isp_res_maps[] = {
		0x0000, /* csi2a, len 0x0170 */
		0x0170, /* csiphy2, len 0x000c */
		},
		.syscon_offset = 0xdc,
		.phy_type = ISP_PHY_TYPE_3430,
		},
		{
		@@ -124,7 +123,6 @@ static const struct isp_res_mapping isp_res_maps[] = {
		0x0570, /* csiphy1, len 0x000c */
		0x05c0, /* csi2c, len 0x0040 (2nd area) */
		},
		.syscon_offset = 0x2f0,
		.phy_type = ISP_PHY_TYPE_3630,
		},
		};
		@@ -1796,47 +1794,6 @@ static void isp_unregister_entities(struct isp_device *isp)
		media_device_unregister(&isp->media_dev);
		}

		/*
		* isp_register_subdev - Register a sub-device
		* @isp: OMAP3 ISP device
		* @isp_subdev: platform data related to a sub-device
		*
		* Register an I2C sub-device which has not been registered by other
		* means (such as the Device Tree).
		*
		* Return a pointer to the sub-device if it has been successfully
		* registered, or NULL otherwise.
		*/
		static struct v4l2_subdev *
		isp_register_subdev(struct isp_device *isp,
		struct isp_platform_subdev *isp_subdev)
		{
		struct i2c_adapter *adapter;
		struct v4l2_subdev *sd;

		if (isp_subdev->board_info == NULL)
		return NULL;

		adapter = i2c_get_adapter(isp_subdev->i2c_adapter_id);
		if (adapter == NULL) {
		dev_err(isp->dev,
		"%s: Unable to get I2C adapter %d for device %s\n",
		__func__, isp_subdev->i2c_adapter_id,
		isp_subdev->board_info->type);
		return NULL;
		}

		sd = v4l2_i2c_new_subdev_board(&isp->v4l2_dev, adapter,
		isp_subdev->board_info, NULL);
		if (sd == NULL) {
		dev_err(isp->dev, "%s: Unable to register subdev %s\n",
		__func__, isp_subdev->board_info->type);
		return NULL;
		}

		return sd;
		}

		static int isp_link_entity(
		struct isp_device isp, struct media_entity entity,
		enum isp_interface_type interface)
		@@ -1910,8 +1867,6 @@ static int isp_link_entity(

		static int isp_register_entities(struct isp_device *isp)
		{
		struct isp_platform_data *pdata = isp->pdata;
		struct isp_platform_subdev *isp_subdev;
		int ret;

		isp->media_dev.dev = isp->dev;
		@@ -1968,37 +1923,6 @@ static int isp_register_entities(struct isp_device *isp)
		if (ret < 0)
		goto done;

		/*
		* Device Tree --- the external sub-devices will be registered
		* later. The same goes for the sub-device node registration.
		*/
		if (isp->dev->of_node)
		return 0;

		/* Register external entities */
		for (isp_subdev = pdata ? pdata->subdevs : NULL;
		isp_subdev && isp_subdev->board_info; isp_subdev++) {
		struct v4l2_subdev *sd;

		sd = isp_register_subdev(isp, isp_subdev);

		/*
		* No bus information --- this is either a flash or a
		* lens subdev.
		*/
		if (!sd \|\| !isp_subdev->bus)
		continue;

		sd->host_priv = isp_subdev->bus;

		ret = isp_link_entity(isp, &sd->entity,
		isp_subdev->bus->interface);
		if (ret < 0)
		goto done;
		}

		ret = v4l2_device_register_subdev_nodes(&isp->v4l2_dev);

		done:
		if (ret < 0)
		isp_unregister_entities(isp);
		@@ -2402,7 +2326,6 @@ static int isp_probe(struct platform_device *pdev)
		return -ENOMEM;
		}

		if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {
		ret = of_property_read_u32(pdev->dev.of_node, "ti,phy-type",
		&isp->phy_type);
		if (ret)
		@@ -2421,14 +2344,6 @@ static int isp_probe(struct platform_device *pdev)
		ret = isp_of_parse_nodes(&pdev->dev, &isp->notifier);
		if (ret < 0)
		return ret;
		} else {
		isp->pdata = pdev->dev.platform_data;
		isp->syscon = syscon_regmap_lookup_by_pdevname("syscon.0");
		if (IS_ERR(isp->syscon))
		return PTR_ERR(isp->syscon);
		dev_warn(&pdev->dev,
		"Platform data support is deprecated! Please move to DT now!\n");
		}

		isp->autoidle = autoidle;

		@@ -2507,11 +2422,6 @@ static int isp_probe(struct platform_device *pdev)
		goto error_isp;
		}

		if (!IS_ENABLED(CONFIG_OF) \|\| !pdev->dev.of_node) {
		isp->syscon_offset = isp_res_maps[m].syscon_offset;
		isp->phy_type = isp_res_maps[m].phy_type;
		}

		for (i = 1; i < OMAP3_ISP_IOMEM_CSI2A_REGS1; i++)
		isp->mmio_base[i] =
		isp->mmio_base[0] + isp_res_maps[m].offset[i];
		@@ -2555,15 +2465,12 @@ static int isp_probe(struct platform_device *pdev)
		if (ret < 0)
		goto error_modules;

		if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {
		isp->notifier.bound = isp_subdev_notifier_bound;
		isp->notifier.complete = isp_subdev_notifier_complete;

		ret = v4l2_async_notifier_register(&isp->v4l2_dev,
		&isp->notifier);
		ret = v4l2_async_notifier_register(&isp->v4l2_dev, &isp->notifier);
		if (ret)
		goto error_register_entities;
		}

		isp_core_init(isp, 1);
		omap3isp_put(isp);

drivers/media/platform/omap3isp/isp.h

+1 −6

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#ifndef OMAP3_ISP_CORE_H
		#define OMAP3_ISP_CORE_H

		#include <media/omap3isp.h>
		#include <media/v4l2-async.h>
		#include <media/v4l2-device.h>
		#include <linux/clk-provider.h>
		@@ -27,6 +26,7 @@
		#include <linux/platform_device.h>
		#include <linux/wait.h>

		#include "omap3isp.h"
		#include "ispstat.h"
		#include "ispccdc.h"
		#include "ispreg.h"
		@@ -101,15 +101,11 @@ struct regmap;
		* struct isp_res_mapping - Map ISP io resources to ISP revision.
		* @isp_rev: ISP_REVISION_x_x
		* @offset: register offsets of various ISP sub-blocks
		* @syscon_offset: offset of the syscon register for 343x / 3630
		* (CONTROL_CSIRXFE / CONTROL_CAMERA_PHY_CTRL, respectively)
		* from the syscon base address
		* @phy_type: ISP_PHY_TYPE_{3430,3630}
		*/
		struct isp_res_mapping {
		u32 isp_rev;
		u32 offset[OMAP3_ISP_IOMEM_LAST];
		u32 syscon_offset;
		u32 phy_type;
		};

		@@ -184,7 +180,6 @@ struct isp_device {
		u32 revision;

		/* platform HW resources */
		struct isp_platform_data *pdata;
		unsigned int irq_num;

		void __iomem *mmio_base[OMAP3_ISP_IOMEM_LAST];

drivers/media/platform/omap3isp/ispcsiphy.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		#ifndef OMAP3_ISP_CSI_PHY_H
		#define OMAP3_ISP_CSI_PHY_H

		#include <media/omap3isp.h>
		#include "omap3isp.h"

		struct isp_csi2_device;
		struct regulator;

drivers/media/platform/omap3isp/ispvideo.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -1018,8 +1018,7 @@ isp_video_streamon(struct file file, void fh, enum v4l2_buf_type type)

		pipe->entities = 0;

		if (video->isp->pdata && video->isp->pdata->set_constraints)
		video->isp->pdata->set_constraints(video->isp, true);
		/* TODO: Implement PM QoS */
		pipe->l3_ick = clk_get_rate(video->isp->clock[ISP_CLK_L3_ICK]);
		pipe->max_rate = pipe->l3_ick;

		@@ -1100,8 +1099,7 @@ isp_video_streamon(struct file file, void fh, enum v4l2_buf_type type)
		err_check_format:
		media_entity_pipeline_stop(&video->video.entity);
		err_pipeline_start:
		if (video->isp->pdata && video->isp->pdata->set_constraints)
		video->isp->pdata->set_constraints(video->isp, false);
		/* TODO: Implement PM QoS */
		/* The DMA queue must be emptied here, otherwise CCDC interrupts that
		* will get triggered the next time the CCDC is powered up will try to
		* access buffers that might have been freed but still present in the
		@@ -1161,8 +1159,7 @@ isp_video_streamoff(struct file file, void fh, enum v4l2_buf_type type)
		video->queue = NULL;
		video->error = false;

		if (video->isp->pdata && video->isp->pdata->set_constraints)
		video->isp->pdata->set_constraints(video->isp, false);
		/* TODO: Implement PM QoS */
		media_entity_pipeline_stop(&video->video.entity);

		done: