[media] rcar_vin: Remove obsolete platform data support (22bc8625) · Commits · 戴 / test

drivers/media/platform/soc_camera/rcar_vin.c

+29 −46

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@
		#include <linux/module.h>
		#include <linux/of.h>
		#include <linux/of_device.h>
		#include <linux/platform_data/media/camera-rcar.h>
		#include <linux/platform_device.h>
		#include <linux/pm_runtime.h>
		#include <linux/slab.h>
		@@ -138,6 +137,11 @@

		#define TIMEOUT_MS 100

		#define RCAR_VIN_HSYNC_ACTIVE_LOW (1 << 0)
		#define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1)
		#define RCAR_VIN_BT601 (1 << 2)
		#define RCAR_VIN_BT656 (1 << 3)

		enum chip_id {
		RCAR_GEN2,
		RCAR_H1,
		@@ -1853,29 +1857,17 @@ static const struct of_device_id rcar_vin_of_table[] = {
		MODULE_DEVICE_TABLE(of, rcar_vin_of_table);
		#endif

		static struct platform_device_id rcar_vin_id_table[] = {
		{ "r8a7779-vin", RCAR_H1 },
		{ "r8a7778-vin", RCAR_M1 },
		{ "uPD35004-vin", RCAR_E1 },
		{},
		};
		MODULE_DEVICE_TABLE(platform, rcar_vin_id_table);

		static int rcar_vin_probe(struct platform_device *pdev)
		{
		const struct of_device_id *match = NULL;
		struct rcar_vin_priv *priv;
		struct v4l2_of_endpoint ep;
		struct device_node *np;
		struct resource *mem;
		struct rcar_vin_platform_data *pdata;
		unsigned int pdata_flags;
		int irq, ret;

		if (pdev->dev.of_node) {
		struct v4l2_of_endpoint ep;
		struct device_node *np;

		match = of_match_device(of_match_ptr(rcar_vin_of_table),
		&pdev->dev);
		match = of_match_device(of_match_ptr(rcar_vin_of_table), &pdev->dev);

		np = of_graph_get_next_endpoint(pdev->dev.of_node, NULL);
		if (!np) {
		@@ -1902,14 +1894,6 @@ static int rcar_vin_probe(struct platform_device *pdev)
		of_node_put(np);

		dev_dbg(&pdev->dev, "pdata_flags = %08x\n", pdata_flags);
		} else {
		pdata = pdev->dev.platform_data;
		if (!pdata \|\| !pdata->flags) {
		dev_err(&pdev->dev, "platform data not set\n");
		return -EINVAL;
		}
		pdata_flags = pdata->flags;
		}

		mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		if (mem == NULL)
		@@ -1992,7 +1976,6 @@ static struct platform_driver rcar_vin_driver = {
		.name = DRV_NAME,
		.of_match_table = of_match_ptr(rcar_vin_of_table),
		},
		.id_table = rcar_vin_id_table,
		};

		module_platform_driver(rcar_vin_driver);

include/linux/platform_data/media/camera-rcar.h

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		/*
		* Platform data for Renesas R-Car VIN soc-camera driver
		*
		* Copyright (C) 2011-2013 Renesas Solutions Corp.
		* Copyright (C) 2013 Cogent Embedded, Inc., <source@cogentembedded.com>
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the
		* Free Software Foundation; either version 2 of the License, or (at your
		* option) any later version.
		*/

		#ifndef __CAMERA_RCAR_H_
		#define __CAMERA_RCAR_H_

		#define RCAR_VIN_HSYNC_ACTIVE_LOW (1 << 0)
		#define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1)
		#define RCAR_VIN_BT601 (1 << 2)
		#define RCAR_VIN_BT656 (1 << 3)

		struct rcar_vin_platform_data {
		unsigned int flags;
		};

		#endif /* __CAMERA_RCAR_H_ */

Admin message