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

Commit a354177f authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] smiapp: Call the clock "ext_clk" 



As the clock framework makes it possible to assign a device specific name to
the clocks, remove the ability to use a named clock in the driver.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent d0aae004

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

+3 −6
Original line number Diff line number Diff line
@@ -2363,11 +2363,9 @@ static int smiapp_registered(struct v4l2_subdev *subdev) 
	}



	if (!sensor->platform_data->set_xclk) {

		sensor->ext_clk = devm_clk_get(&client->dev,

					sensor->platform_data->ext_clk_name);

		sensor->ext_clk = devm_clk_get(&client->dev, "ext_clk");

		if (IS_ERR(sensor->ext_clk)) {

			dev_err(&client->dev, "could not get clock %s\n",

				sensor->platform_data->ext_clk_name);

			dev_err(&client->dev, "could not get clock\n");

			return -ENODEV;

		}
@@ -2375,8 +2373,7 @@ static int smiapp_registered(struct v4l2_subdev *subdev) 
				    sensor->platform_data->ext_clk);

		if (rval < 0) {

			dev_err(&client->dev,

				"unable to set clock %s freq to %u\n",

				sensor->platform_data->ext_clk_name,

				"unable to set clock freq to %u\n",

				sensor->platform_data->ext_clk);

			return -ENODEV;

		}

include/media/smiapp.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ struct smiapp_platform_data { 
	struct smiapp_flash_strobe_parms *strobe_setup;



	int (*set_xclk)(struct v4l2_subdev *sd, int hz);

	char *ext_clk_name;

	int xshutdown;			/* gpio or SMIAPP_NO_XSHUTDOWN */

};