diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-11-08 23:35:36 -0500 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-11-21 18:43:22 -0500 |
commit | 7d9f88b4f427df6dab7ff92ea81f1ddb7e9c95e4 (patch) | |
tree | 4dab467ac2d6c14fd6b6ef859a54abb322142050 /drivers/video/sh_mipi_dsi.c | |
parent | a2e6297153f8fc7185d119c59d8eed1ee7d4c74f (diff) |
fbdev: sh_mipi_dsi: sh_mipi has pdata instead of dev
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/sh_mipi_dsi.c')
-rw-r--r-- | drivers/video/sh_mipi_dsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c index b8aea8c60bc7..7e4650530c9a 100644 --- a/drivers/video/sh_mipi_dsi.c +++ b/drivers/video/sh_mipi_dsi.c | |||
@@ -53,7 +53,7 @@ struct sh_mipi { | |||
53 | void __iomem *base; | 53 | void __iomem *base; |
54 | void __iomem *linkbase; | 54 | void __iomem *linkbase; |
55 | struct clk *dsit_clk; | 55 | struct clk *dsit_clk; |
56 | struct device *dev; | 56 | struct platform_device *pdev; |
57 | 57 | ||
58 | void *next_board_data; | 58 | void *next_board_data; |
59 | void (*next_display_on)(void *board_data, struct fb_info *info); | 59 | void (*next_display_on)(void *board_data, struct fb_info *info); |
@@ -129,7 +129,7 @@ static void mipi_display_on(void *arg, struct fb_info *info) | |||
129 | { | 129 | { |
130 | struct sh_mipi *mipi = arg; | 130 | struct sh_mipi *mipi = arg; |
131 | 131 | ||
132 | pm_runtime_get_sync(mipi->dev); | 132 | pm_runtime_get_sync(&mipi->pdev->dev); |
133 | sh_mipi_dsi_enable(mipi, true); | 133 | sh_mipi_dsi_enable(mipi, true); |
134 | 134 | ||
135 | if (mipi->next_display_on) | 135 | if (mipi->next_display_on) |
@@ -144,7 +144,7 @@ static void mipi_display_off(void *arg) | |||
144 | mipi->next_display_off(mipi->next_board_data); | 144 | mipi->next_display_off(mipi->next_board_data); |
145 | 145 | ||
146 | sh_mipi_dsi_enable(mipi, false); | 146 | sh_mipi_dsi_enable(mipi, false); |
147 | pm_runtime_put(mipi->dev); | 147 | pm_runtime_put(&mipi->pdev->dev); |
148 | } | 148 | } |
149 | 149 | ||
150 | static int __init sh_mipi_setup(struct sh_mipi *mipi, | 150 | static int __init sh_mipi_setup(struct sh_mipi *mipi, |
@@ -469,7 +469,7 @@ static int __init sh_mipi_probe(struct platform_device *pdev) | |||
469 | goto emap2; | 469 | goto emap2; |
470 | } | 470 | } |
471 | 471 | ||
472 | mipi->dev = &pdev->dev; | 472 | mipi->pdev = pdev; |
473 | 473 | ||
474 | mipi->dsit_clk = clk_get(&pdev->dev, "dsit_clk"); | 474 | mipi->dsit_clk = clk_get(&pdev->dev, "dsit_clk"); |
475 | if (IS_ERR(mipi->dsit_clk)) { | 475 | if (IS_ERR(mipi->dsit_clk)) { |