leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: exynos_mipi_dsim: Use the generic PHY driver

Browse Source 
Use the generic PHY API instead of the platform callback
for the MIPI DSIM DPHY enable/reset control.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Donghwa Lee <dh09.lee@samsung.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sylwester Nawrocki 2013-10-16 21:58:12 +05:30 committed by Greg Kroah-Hartman
parent f1468a2077
commit 7e0be9f9f7
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/video/exynos/Kconfig
View File

@ -16,6 +16,7 @@ if EXYNOS_VIDEO
config EXYNOS_MIPI_DSI config EXYNOS_MIPI_DSI
bool "EXYNOS MIPI DSI driver support." bool "EXYNOS MIPI DSI driver support."
depends on ARCH_S5PV210 || ARCH_EXYNOS depends on ARCH_S5PV210 || ARCH_EXYNOS
select GENERIC_PHY
help help
This enables support for MIPI-DSI device. This enables support for MIPI-DSI device.

19
drivers/video/exynos/exynos_mipi_dsi.c
View File

@ -30,6 +30,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/phy/phy.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/err.h> #include <linux/err.h>
@ -156,8 +157,7 @@ static int exynos_mipi_dsi_blank_mode(struct mipi_dsim_device *dsim, int power)
exynos_mipi_regulator_enable(dsim); exynos_mipi_regulator_enable(dsim);
/* enable MIPI-DSI PHY. */ /* enable MIPI-DSI PHY. */
if (dsim->pd->phy_enable) phy_power_on(dsim->phy);
dsim->pd->phy_enable(pdev, true);
clk_enable(dsim->clock); clk_enable(dsim->clock);
@ -373,6 +373,10 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
return ret; return ret;
} }
dsim->phy = devm_phy_get(&pdev->dev, "dsim");
if (IS_ERR(dsim->phy))
return PTR_ERR(dsim->phy);
dsim->clock = devm_clk_get(&pdev->dev, "dsim0"); dsim->clock = devm_clk_get(&pdev->dev, "dsim0");
if (IS_ERR(dsim->clock)) { if (IS_ERR(dsim->clock)) {
dev_err(&pdev->dev, "failed to get dsim clock source\n"); dev_err(&pdev->dev, "failed to get dsim clock source\n");
@ -439,8 +443,7 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
exynos_mipi_regulator_enable(dsim); exynos_mipi_regulator_enable(dsim);
/* enable MIPI-DSI PHY. */ /* enable MIPI-DSI PHY. */
if (dsim->pd->phy_enable) phy_power_on(dsim->phy);
dsim->pd->phy_enable(pdev, true);
exynos_mipi_update_cfg(dsim); exynos_mipi_update_cfg(dsim);
@ -504,9 +507,8 @@ static int exynos_mipi_dsi_suspend(struct device *dev)
if (client_drv && client_drv->suspend) if (client_drv && client_drv->suspend)
client_drv->suspend(client_dev); client_drv->suspend(client_dev);
/* enable MIPI-DSI PHY. */ /* disable MIPI-DSI PHY. */
if (dsim->pd->phy_enable) phy_power_off(dsim->phy);
dsim->pd->phy_enable(pdev, false);
clk_disable(dsim->clock); clk_disable(dsim->clock);
@ -536,8 +538,7 @@ static int exynos_mipi_dsi_resume(struct device *dev)
exynos_mipi_regulator_enable(dsim); exynos_mipi_regulator_enable(dsim);
/* enable MIPI-DSI PHY. */ /* enable MIPI-DSI PHY. */
if (dsim->pd->phy_enable) phy_power_on(dsim->phy);
dsim->pd->phy_enable(pdev, true);
clk_enable(dsim->clock); clk_enable(dsim->clock);

5
include/video/exynos_mipi_dsim.h
View File

@ -216,6 +216,7 @@ struct mipi_dsim_config {
* automatically. * automatically.
* @e_clk_src: select byte clock source. * @e_clk_src: select byte clock source.
* @pd: pointer to MIPI-DSI driver platform data. * @pd: pointer to MIPI-DSI driver platform data.
* @phy: pointer to the MIPI-DSI PHY
*/ */
struct mipi_dsim_device { struct mipi_dsim_device {
struct device *dev; struct device *dev;
@ -236,6 +237,7 @@ struct mipi_dsim_device {
bool suspended; bool suspended;
struct mipi_dsim_platform_data *pd; struct mipi_dsim_platform_data *pd;
struct phy *phy;
}; };
/* /*
@ -248,7 +250,6 @@ struct mipi_dsim_device {
* @enabled: indicate whether mipi controller got enabled or not. * @enabled: indicate whether mipi controller got enabled or not.
* @lcd_panel_info: pointer for lcd panel specific structure. * @lcd_panel_info: pointer for lcd panel specific structure.
* this structure specifies width, height, timing and polarity and so on. * this structure specifies width, height, timing and polarity and so on.
* @phy_enable: pointer to a callback controlling D-PHY enable/reset
*/ */
struct mipi_dsim_platform_data { struct mipi_dsim_platform_data {
char lcd_panel_name[PANEL_NAME_SIZE]; char lcd_panel_name[PANEL_NAME_SIZE];
@ -256,8 +257,6 @@ struct mipi_dsim_platform_data {
struct mipi_dsim_config *dsim_config; struct mipi_dsim_config *dsim_config;
unsigned int enabled; unsigned int enabled;
void *lcd_panel_info; void *lcd_panel_info;
int (*phy_enable)(struct platform_device *pdev, bool on);
}; };
/* /*