diff options
author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2009-12-16 06:18:07 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-01-11 06:33:09 -0500 |
commit | f778a12dd33200513596a0d4d3ba4d5f09e79c09 (patch) | |
tree | 91fbb2cb9e9031fc41e4e649a1a72cec154cb432 /drivers/video/omap/dispc.c | |
parent | fc248a497d83f5aba9d46d7ff114c070fb2a2fa2 (diff) |
OMAP: OMAPFB: fix clk_get for RFBI
omapfb platform device was still used to get clocks inside rfbi.c
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Tested-by: Sergey Lapin <slapin@ossfans.org>
Diffstat (limited to 'drivers/video/omap/dispc.c')
-rw-r--r-- | drivers/video/omap/dispc.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index c7c6455f1fa8..e192b058a688 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c | |||
@@ -189,11 +189,6 @@ static struct { | |||
189 | struct omapfb_color_key color_key; | 189 | struct omapfb_color_key color_key; |
190 | } dispc; | 190 | } dispc; |
191 | 191 | ||
192 | static struct platform_device omapdss_device = { | ||
193 | .name = "omapdss", | ||
194 | .id = -1, | ||
195 | }; | ||
196 | |||
197 | static void enable_lcd_clocks(int enable); | 192 | static void enable_lcd_clocks(int enable); |
198 | 193 | ||
199 | static void inline dispc_write_reg(int idx, u32 val) | 194 | static void inline dispc_write_reg(int idx, u32 val) |
@@ -920,20 +915,20 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) | |||
920 | 915 | ||
921 | static int get_dss_clocks(void) | 916 | static int get_dss_clocks(void) |
922 | { | 917 | { |
923 | dispc.dss_ick = clk_get(&omapdss_device.dev, "ick"); | 918 | dispc.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick"); |
924 | if (IS_ERR(dispc.dss_ick)) { | 919 | if (IS_ERR(dispc.dss_ick)) { |
925 | dev_err(dispc.fbdev->dev, "can't get ick\n"); | 920 | dev_err(dispc.fbdev->dev, "can't get ick\n"); |
926 | return PTR_ERR(dispc.dss_ick); | 921 | return PTR_ERR(dispc.dss_ick); |
927 | } | 922 | } |
928 | 923 | ||
929 | dispc.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck"); | 924 | dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck"); |
930 | if (IS_ERR(dispc.dss1_fck)) { | 925 | if (IS_ERR(dispc.dss1_fck)) { |
931 | dev_err(dispc.fbdev->dev, "can't get dss1_fck\n"); | 926 | dev_err(dispc.fbdev->dev, "can't get dss1_fck\n"); |
932 | clk_put(dispc.dss_ick); | 927 | clk_put(dispc.dss_ick); |
933 | return PTR_ERR(dispc.dss1_fck); | 928 | return PTR_ERR(dispc.dss1_fck); |
934 | } | 929 | } |
935 | 930 | ||
936 | dispc.dss_54m_fck = clk_get(&omapdss_device.dev, "tv_fck"); | 931 | dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck"); |
937 | if (IS_ERR(dispc.dss_54m_fck)) { | 932 | if (IS_ERR(dispc.dss_54m_fck)) { |
938 | dev_err(dispc.fbdev->dev, "can't get tv_fck\n"); | 933 | dev_err(dispc.fbdev->dev, "can't get tv_fck\n"); |
939 | clk_put(dispc.dss_ick); | 934 | clk_put(dispc.dss_ick); |
@@ -1385,12 +1380,6 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, | |||
1385 | int skip_init = 0; | 1380 | int skip_init = 0; |
1386 | int i; | 1381 | int i; |
1387 | 1382 | ||
1388 | r = platform_device_register(&omapdss_device); | ||
1389 | if (r) { | ||
1390 | dev_err(fbdev->dev, "can't register omapdss device\n"); | ||
1391 | return r; | ||
1392 | } | ||
1393 | |||
1394 | memset(&dispc, 0, sizeof(dispc)); | 1383 | memset(&dispc, 0, sizeof(dispc)); |
1395 | 1384 | ||
1396 | dispc.base = ioremap(DISPC_BASE, SZ_1K); | 1385 | dispc.base = ioremap(DISPC_BASE, SZ_1K); |
@@ -1534,7 +1523,6 @@ static void omap_dispc_cleanup(void) | |||
1534 | free_irq(INT_24XX_DSS_IRQ, dispc.fbdev); | 1523 | free_irq(INT_24XX_DSS_IRQ, dispc.fbdev); |
1535 | put_dss_clocks(); | 1524 | put_dss_clocks(); |
1536 | iounmap(dispc.base); | 1525 | iounmap(dispc.base); |
1537 | platform_device_unregister(&omapdss_device); | ||
1538 | } | 1526 | } |
1539 | 1527 | ||
1540 | const struct lcd_ctrl omap2_int_ctrl = { | 1528 | const struct lcd_ctrl omap2_int_ctrl = { |