mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
OMAPFB: fix wrong clock aliases and device name
The clock aliases and the dss platform device name have changed, and omapfb fails to initialize. Update the names to correct ones. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
943e4457ca
commit
c96c92d893
3 changed files with 4 additions and 4 deletions
|
@ -922,14 +922,14 @@ static int get_dss_clocks(void)
|
|||
return PTR_ERR(dispc.dss_ick);
|
||||
}
|
||||
|
||||
dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
|
||||
dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "fck");
|
||||
if (IS_ERR(dispc.dss1_fck)) {
|
||||
dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
|
||||
clk_put(dispc.dss_ick);
|
||||
return PTR_ERR(dispc.dss1_fck);
|
||||
}
|
||||
|
||||
dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck");
|
||||
dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_clk");
|
||||
if (IS_ERR(dispc.dss_54m_fck)) {
|
||||
dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
|
||||
clk_put(dispc.dss_ick);
|
||||
|
|
|
@ -90,7 +90,7 @@ static void omapdss_release(struct device *dev)
|
|||
|
||||
/* dummy device for clocks */
|
||||
static struct platform_device omapdss_device = {
|
||||
.name = "omapdss",
|
||||
.name = "omapdss_dss",
|
||||
.id = -1,
|
||||
.dev = {
|
||||
.release = omapdss_release,
|
||||
|
|
|
@ -90,7 +90,7 @@ static int rfbi_get_clocks(void)
|
|||
return PTR_ERR(rfbi.dss_ick);
|
||||
}
|
||||
|
||||
rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck");
|
||||
rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "fck");
|
||||
if (IS_ERR(rfbi.dss1_fck)) {
|
||||
dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
|
||||
clk_put(rfbi.dss_ick);
|
||||
|
|
Loading…
Reference in a new issue