Loading drivers/video/sh_mipi_dsi.c +17 −3 Original line number Diff line number Diff line Loading @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/string.h> #include <linux/types.h> Loading Loading @@ -50,6 +51,8 @@ struct sh_mipi { void __iomem *linkbase; struct clk *dsit_clk; struct clk *dsip_clk; struct device *dev; void *next_board_data; void (*next_display_on)(void *board_data, struct fb_info *info); void (*next_display_off)(void *board_data); Loading Loading @@ -124,6 +127,7 @@ static void mipi_display_on(void *arg, struct fb_info *info) { struct sh_mipi *mipi = arg; pm_runtime_get_sync(mipi->dev); sh_mipi_dsi_enable(mipi, true); if (mipi->next_display_on) Loading @@ -138,6 +142,7 @@ static void mipi_display_off(void *arg) mipi->next_display_off(mipi->next_board_data); sh_mipi_dsi_enable(mipi, false); pm_runtime_put(mipi->dev); } static int __init sh_mipi_setup(struct sh_mipi *mipi, Loading Loading @@ -396,6 +401,8 @@ static int __init sh_mipi_probe(struct platform_device *pdev) goto emap2; } mipi->dev = &pdev->dev; mipi->dsit_clk = clk_get(&pdev->dev, "dsit_clk"); if (IS_ERR(mipi->dsit_clk)) { ret = PTR_ERR(mipi->dsit_clk); Loading Loading @@ -445,6 +452,9 @@ static int __init sh_mipi_probe(struct platform_device *pdev) mipi_dsi[idx] = mipi; pm_runtime_enable(&pdev->dev); pm_runtime_resume(&pdev->dev); ret = sh_mipi_setup(mipi, pdata); if (ret < 0) goto emipisetup; Loading @@ -461,11 +471,13 @@ static int __init sh_mipi_probe(struct platform_device *pdev) pdata->lcd_chan->board_cfg.board_data = mipi; pdata->lcd_chan->board_cfg.display_on = mipi_display_on; pdata->lcd_chan->board_cfg.display_off = mipi_display_off; pdata->lcd_chan->board_cfg.owner = THIS_MODULE; return 0; emipisetup: mipi_dsi[idx] = NULL; pm_runtime_disable(&pdev->dev); clk_disable(mipi->dsip_clk); eclkpon: clk_disable(mipi->dsit_clk); Loading Loading @@ -517,10 +529,12 @@ static int __exit sh_mipi_remove(struct platform_device *pdev) if (ret < 0) return ret; pdata->lcd_chan->board_cfg.owner = NULL; pdata->lcd_chan->board_cfg.display_on = NULL; pdata->lcd_chan->board_cfg.display_off = NULL; pdata->lcd_chan->board_cfg.board_data = NULL; pm_runtime_disable(&pdev->dev); clk_disable(mipi->dsip_clk); clk_disable(mipi->dsit_clk); clk_put(mipi->dsit_clk); Loading Loading
drivers/video/sh_mipi_dsi.c +17 −3 Original line number Diff line number Diff line Loading @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/string.h> #include <linux/types.h> Loading Loading @@ -50,6 +51,8 @@ struct sh_mipi { void __iomem *linkbase; struct clk *dsit_clk; struct clk *dsip_clk; struct device *dev; void *next_board_data; void (*next_display_on)(void *board_data, struct fb_info *info); void (*next_display_off)(void *board_data); Loading Loading @@ -124,6 +127,7 @@ static void mipi_display_on(void *arg, struct fb_info *info) { struct sh_mipi *mipi = arg; pm_runtime_get_sync(mipi->dev); sh_mipi_dsi_enable(mipi, true); if (mipi->next_display_on) Loading @@ -138,6 +142,7 @@ static void mipi_display_off(void *arg) mipi->next_display_off(mipi->next_board_data); sh_mipi_dsi_enable(mipi, false); pm_runtime_put(mipi->dev); } static int __init sh_mipi_setup(struct sh_mipi *mipi, Loading Loading @@ -396,6 +401,8 @@ static int __init sh_mipi_probe(struct platform_device *pdev) goto emap2; } mipi->dev = &pdev->dev; mipi->dsit_clk = clk_get(&pdev->dev, "dsit_clk"); if (IS_ERR(mipi->dsit_clk)) { ret = PTR_ERR(mipi->dsit_clk); Loading Loading @@ -445,6 +452,9 @@ static int __init sh_mipi_probe(struct platform_device *pdev) mipi_dsi[idx] = mipi; pm_runtime_enable(&pdev->dev); pm_runtime_resume(&pdev->dev); ret = sh_mipi_setup(mipi, pdata); if (ret < 0) goto emipisetup; Loading @@ -461,11 +471,13 @@ static int __init sh_mipi_probe(struct platform_device *pdev) pdata->lcd_chan->board_cfg.board_data = mipi; pdata->lcd_chan->board_cfg.display_on = mipi_display_on; pdata->lcd_chan->board_cfg.display_off = mipi_display_off; pdata->lcd_chan->board_cfg.owner = THIS_MODULE; return 0; emipisetup: mipi_dsi[idx] = NULL; pm_runtime_disable(&pdev->dev); clk_disable(mipi->dsip_clk); eclkpon: clk_disable(mipi->dsit_clk); Loading Loading @@ -517,10 +529,12 @@ static int __exit sh_mipi_remove(struct platform_device *pdev) if (ret < 0) return ret; pdata->lcd_chan->board_cfg.owner = NULL; pdata->lcd_chan->board_cfg.display_on = NULL; pdata->lcd_chan->board_cfg.display_off = NULL; pdata->lcd_chan->board_cfg.board_data = NULL; pm_runtime_disable(&pdev->dev); clk_disable(mipi->dsip_clk); clk_disable(mipi->dsit_clk); clk_put(mipi->dsit_clk); Loading