Commit b755063e authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Mauro Carvalho Chehab
Browse files

media: i2c: s5c73m3: remove support for platform data 



There are no existing users of s5c73m3_platform_data in the tree, and
new users should either be using device tree, ACPI, or static device
properties, so let's remove it from the driver.

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 8d46c5cd

drivers/media/i2c/s5c73m3/s5c73m3-core.c

+5 −15
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <media/v4l2-device.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-mediabus.h>

#include <media/i2c/s5c73m3.h>

#include <media/v4l2-fwnode.h>



#include "s5c73m3.h"
@@ -1522,25 +1521,16 @@ static const struct v4l2_subdev_ops oif_subdev_ops = { 
	.video	= &s5c73m3_oif_video_ops,

};



static int s5c73m3_get_platform_data(struct s5c73m3 *state)

static int s5c73m3_get_dt_data(struct s5c73m3 *state)

{

	struct i2c_client *c = state->i2c_client;

	struct device *dev = &c->dev;

	const struct s5c73m3_platform_data *pdata = dev->platform_data;

	struct device *dev = &state->i2c_client->dev;

	struct device_node *node = dev->of_node;

	struct device_node *node_ep;

	struct v4l2_fwnode_endpoint ep = { .bus_type = 0 };

	int ret;



	if (!node) {

		if (!pdata) {

			dev_err(dev, "Platform data not specified\n");

	if (!node)

		return -EINVAL;

		}



		state->mclk_frequency = pdata->mclk_frequency;

		return 0;

	}



	state->clock = devm_clk_get(dev, S5C73M3_CLK_NAME);

	if (IS_ERR(state->clock))
@@ -1603,7 +1593,7 @@ static int s5c73m3_probe(struct i2c_client *client) 
		return -ENOMEM;



	state->i2c_client = client;

	ret = s5c73m3_get_platform_data(state);

	ret = s5c73m3_get_dt_data(state);

	if (ret < 0)

		return ret;

drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <media/v4l2-device.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-mediabus.h>

#include <media/i2c/s5c73m3.h>



#include "s5c73m3.h"

drivers/media/i2c/s5c73m3/s5c73m3.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <media/v4l2-common.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-subdev.h>

#include <media/i2c/s5c73m3.h>



#define DRIVER_NAME			"S5C73M3"

include/media/i2c/s5c73m3.h

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * Samsung LSI S5C73M3 8M pixel camera driver

 *

 * Copyright (C) 2012, Samsung Electronics, Co., Ltd.

 * Sylwester Nawrocki <s.nawrocki@samsung.com>

 * Andrzej Hajda <a.hajda@samsung.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * version 2 as published by the Free Software Foundation.

 *

 * 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 MEDIA_S5C73M3__

#define MEDIA_S5C73M3__



#include <linux/videodev2.h>

#include <media/v4l2-mediabus.h>



/**

 * struct s5c73m3_platform_data - s5c73m3 driver platform data

 * @mclk_frequency: sensor's master clock frequency in Hz

 * @bus_type:    bus type

 * @nlanes:      maximum number of MIPI-CSI lanes used

 * @horiz_flip:  default horizontal image flip value, non zero to enable

 * @vert_flip:   default vertical image flip value, non zero to enable

 */



struct s5c73m3_platform_data {

	unsigned long mclk_frequency;



	enum v4l2_mbus_type bus_type;

	u8 nlanes;

	u8 horiz_flip;

	u8 vert_flip;

};



#endif /* MEDIA_S5C73M3__ */