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

Commit c96c92d8 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 943e4457

drivers/video/omap/dispc.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/video/omap/omapfb_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/video/omap/rfbi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);