Commit befd25a2 authored by Russell King's avatar Russell King Committed by Mauro Carvalho Chehab

[media] media: omap3isp: remove unused clkdev

No merged platform supplies xclks via platform data.  As we want to
slightly change the clkdev interface, rather than fixing this unused
code, remove it instead.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 9a1a8f99
...@@ -304,7 +304,6 @@ static struct clk *isp_xclk_src_get(struct of_phandle_args *clkspec, void *data) ...@@ -304,7 +304,6 @@ static struct clk *isp_xclk_src_get(struct of_phandle_args *clkspec, void *data)
static int isp_xclk_init(struct isp_device *isp) static int isp_xclk_init(struct isp_device *isp)
{ {
struct isp_platform_data *pdata = isp->pdata;
struct device_node *np = isp->dev->of_node; struct device_node *np = isp->dev->of_node;
struct clk_init_data init; struct clk_init_data init;
unsigned int i; unsigned int i;
...@@ -335,26 +334,6 @@ static int isp_xclk_init(struct isp_device *isp) ...@@ -335,26 +334,6 @@ static int isp_xclk_init(struct isp_device *isp)
xclk->clk = clk_register(NULL, &xclk->hw); xclk->clk = clk_register(NULL, &xclk->hw);
if (IS_ERR(xclk->clk)) if (IS_ERR(xclk->clk))
return PTR_ERR(xclk->clk); return PTR_ERR(xclk->clk);
/* When instantiated from DT we don't need to register clock
* aliases.
*/
if (np)
continue;
if (!pdata || (pdata->xclks[i].con_id == NULL &&
pdata->xclks[i].dev_id == NULL))
continue;
xclk->lookup = kzalloc(sizeof(*xclk->lookup), GFP_KERNEL);
if (xclk->lookup == NULL)
return -ENOMEM;
xclk->lookup->con_id = pdata->xclks[i].con_id;
xclk->lookup->dev_id = pdata->xclks[i].dev_id;
xclk->lookup->clk = xclk->clk;
clkdev_add(xclk->lookup);
} }
if (np) if (np)
...@@ -376,9 +355,6 @@ static void isp_xclk_cleanup(struct isp_device *isp) ...@@ -376,9 +355,6 @@ static void isp_xclk_cleanup(struct isp_device *isp)
if (!IS_ERR(xclk->clk)) if (!IS_ERR(xclk->clk))
clk_unregister(xclk->clk); clk_unregister(xclk->clk);
if (xclk->lookup)
clkdev_drop(xclk->lookup);
} }
} }
......
...@@ -132,7 +132,6 @@ enum isp_xclk_id { ...@@ -132,7 +132,6 @@ enum isp_xclk_id {
struct isp_xclk { struct isp_xclk {
struct isp_device *isp; struct isp_device *isp;
struct clk_hw hw; struct clk_hw hw;
struct clk_lookup *lookup;
struct clk *clk; struct clk *clk;
enum isp_xclk_id id; enum isp_xclk_id id;
......
...@@ -150,13 +150,7 @@ struct isp_platform_subdev { ...@@ -150,13 +150,7 @@ struct isp_platform_subdev {
struct isp_bus_cfg *bus; struct isp_bus_cfg *bus;
}; };
struct isp_platform_xclk {
const char *dev_id;
const char *con_id;
};
struct isp_platform_data { struct isp_platform_data {
struct isp_platform_xclk xclks[2];
struct isp_platform_subdev *subdevs; struct isp_platform_subdev *subdevs;
void (*set_constraints)(struct isp_device *isp, bool enable); void (*set_constraints)(struct isp_device *isp, bool enable);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment