omap24xx: add support for 3.3
[openwrt/svn-archive/archive.git] / target / linux / omap24xx / patches-3.3 / 311-omapfb-clock-fixes.patch
1 --- a/drivers/video/omap/dispc.c
2 +++ b/drivers/video/omap/dispc.c
3 @@ -923,14 +923,14 @@ static int get_dss_clocks(void)
4 return PTR_ERR(dispc.dss_ick);
5 }
6
7 - dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "fck");
8 + dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
9 if (IS_ERR(dispc.dss1_fck)) {
10 dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
11 clk_put(dispc.dss_ick);
12 return PTR_ERR(dispc.dss1_fck);
13 }
14
15 - dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_clk");
16 + dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss_54m_fck");
17 if (IS_ERR(dispc.dss_54m_fck)) {
18 dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
19 clk_put(dispc.dss_ick);
20 --- a/drivers/video/omap/rfbi.c
21 +++ b/drivers/video/omap/rfbi.c
22 @@ -90,7 +90,7 @@ static int rfbi_get_clocks(void)
23 return PTR_ERR(rfbi.dss_ick);
24 }
25
26 - rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "fck");
27 + rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck");
28 if (IS_ERR(rfbi.dss1_fck)) {
29 dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
30 clk_put(rfbi.dss_ick);