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

Commit 3300a8fd authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] mt9v032: Use the common clock framework 



Configure the device external clock using the common clock framework
instead of a board code callback function.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 4ab0620b

drivers/media/i2c/mt9v032.c

+11 −6
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 */

 */





#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/log2.h>

#include <linux/log2.h>
@@ -135,6 +136,8 @@ struct mt9v032 { 
	struct mutex power_lock;

	struct mutex power_lock;

	int power_count;

	int power_count;





	struct clk *clk;



	struct mt9v032_platform_data *pdata;

	struct mt9v032_platform_data *pdata;





	u32 sysclk;

	u32 sysclk;
@@ -219,10 +222,9 @@ static int mt9v032_power_on(struct mt9v032 *mt9v032) 
	struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev);

	struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev);

	int ret;

	int ret;





	if (mt9v032->pdata->set_clock) {

	clk_set_rate(mt9v032->clk, mt9v032->sysclk);

		mt9v032->pdata->set_clock(&mt9v032->subdev, mt9v032->sysclk);

	clk_prepare_enable(mt9v032->clk);

	udelay(1);

	udelay(1);

	}





	/* Reset the chip and stop data read out */

	/* Reset the chip and stop data read out */

	ret = mt9v032_write(client, MT9V032_RESET, 1);

	ret = mt9v032_write(client, MT9V032_RESET, 1);
@@ -238,8 +240,7 @@ static int mt9v032_power_on(struct mt9v032 *mt9v032) 




static void mt9v032_power_off(struct mt9v032 *mt9v032)

static void mt9v032_power_off(struct mt9v032 *mt9v032)

{

{

	if (mt9v032->pdata->set_clock)

	clk_disable_unprepare(mt9v032->clk);

		mt9v032->pdata->set_clock(&mt9v032->subdev, 0);

}

}





static int __mt9v032_set_power(struct mt9v032 *mt9v032, bool on)

static int __mt9v032_set_power(struct mt9v032 *mt9v032, bool on)
@@ -748,6 +749,10 @@ static int mt9v032_probe(struct i2c_client *client, 
	if (!mt9v032)

	if (!mt9v032)

		return -ENOMEM;

		return -ENOMEM;





	mt9v032->clk = devm_clk_get(&client->dev, NULL);

	if (IS_ERR(mt9v032->clk))

		return PTR_ERR(mt9v032->clk);



	mutex_init(&mt9v032->power_lock);

	mutex_init(&mt9v032->power_lock);

	mt9v032->pdata = pdata;

	mt9v032->pdata = pdata;

include/media/mt9v032.h

+0 −4
Original line number Original line Diff line number Diff line 
#ifndef _MEDIA_MT9V032_H

#ifndef _MEDIA_MT9V032_H

#define _MEDIA_MT9V032_H

#define _MEDIA_MT9V032_H





struct v4l2_subdev;



struct mt9v032_platform_data {

struct mt9v032_platform_data {

	unsigned int clk_pol:1;

	unsigned int clk_pol:1;





	void (*set_clock)(struct v4l2_subdev *subdev, unsigned int rate);



	const s64 *link_freqs;

	const s64 *link_freqs;

	s64 link_def_freq;

	s64 link_def_freq;

};

};