mxc_mipi_csi2: Needs hdmi_isfr_clk to function

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
boundarydevices · Apr 23, 2014 · 3338700 · 3338700
1 parent 6aef4ff
commit 3338700
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 0 deletions.
diff --git a/arch/arm/mach-mx6/board-mx6_h.c b/arch/arm/mach-mx6/board-mx6_h.c
@@ -1016,6 +1016,7 @@ static struct mipi_csi2_platform_data plat_mipi_csi2 = {
 	.lanes = 2,
 	.dphy_clk = "mipi_pllref_clk",
 	.pixel_clk = "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 static int __init caam_setup(char *__unused)

diff --git a/arch/arm/mach-mx6/board-mx6_nitrogen6_max.c b/arch/arm/mach-mx6/board-mx6_nitrogen6_max.c
@@ -1312,6 +1312,7 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = {
 	.lanes = 2,
 	.dphy_clk = "mipi_pllref_clk",
 	.pixel_clk = "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 static int __init caam_setup(char *__unused)

diff --git a/arch/arm/mach-mx6/board-mx6_nitrogen6x.c b/arch/arm/mach-mx6/board-mx6_nitrogen6x.c
@@ -1382,6 +1382,7 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = {
 	.lanes = 2,
 	.dphy_clk = "mipi_pllref_clk",
 	.pixel_clk = "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 static int __init caam_setup(char *__unused)

diff --git a/arch/arm/mach-mx6/board-mx6_r.c b/arch/arm/mach-mx6/board-mx6_r.c
@@ -758,6 +758,7 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = {
 	.lanes = 2,
 	.dphy_clk = "mipi_pllref_clk",
 	.pixel_clk = "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 #define GPIOF_HIGH GPIOF_OUT_INIT_HIGH

diff --git a/arch/arm/mach-mx6/board-mx6_s.c b/arch/arm/mach-mx6/board-mx6_s.c
@@ -978,6 +978,7 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = {
 	.lanes = 2,
 	.dphy_clk = "mipi_pllref_clk",
 	.pixel_clk = "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 static int __init caam_setup(char *__unused)

diff --git a/arch/arm/mach-mx6/board-mx6_utc.c b/arch/arm/mach-mx6/board-mx6_utc.c
@@ -929,6 +929,7 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = {
 	.lanes = 2,
 	.dphy_clk = "mipi_pllref_clk",
 	.pixel_clk = "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 static int __init caam_setup(char *__unused)

diff --git a/arch/arm/mach-mx6/board-mx6q_arm2.c b/arch/arm/mach-mx6/board-mx6q_arm2.c
@@ -1542,6 +1542,7 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = {
 	.lanes		= 2,
 	.dphy_clk	= "mipi_pllref_clk",
 	.pixel_clk	= "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 static struct fsl_mxc_capture_platform_data capture_data[] = {

diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c
@@ -1165,6 +1165,7 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = {
 	.lanes		= 1,
 	.dphy_clk	= "mipi_pllref_clk",
 	.pixel_clk	= "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 static void sabreauto_suspend_enter(void)

diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c
@@ -1128,6 +1128,7 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = {
 	.lanes = 2,
 	.dphy_clk = "mipi_pllref_clk",
 	.pixel_clk = "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 static int __init caam_setup(char *__unused)

diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
@@ -1673,6 +1673,7 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = {
 	.lanes = 2,
 	.dphy_clk = "mipi_pllref_clk",
 	.pixel_clk = "emi_clk",
+	.cfg_clk = "hdmi_isfr_clk",
 };
 
 static int __init caam_setup(char *__unused)

diff --git a/arch/arm/plat-mxc/include/mach/mipi_csi2.h b/arch/arm/plat-mxc/include/mach/mipi_csi2.h
@@ -114,6 +114,7 @@ struct mipi_csi2_platform_data {
 	unsigned int	lanes;
 	char	*dphy_clk;
 	char	*pixel_clk;
+	char	*cfg_clk;
 	int	(*init)(struct platform_device *);
 	void	(*exit)(struct platform_device *);
 };

diff --git a/drivers/mxc/mipi/mxc_mipi_csi2.c b/drivers/mxc/mipi/mxc_mipi_csi2.c
@@ -75,6 +75,7 @@ bool mipi_csi2_enable(struct mipi_csi2_info *info)
 
 	if (!info->mipi_en) {
 		info->mipi_en = true;
+		clk_enable(info->cfg_clk);
 		clk_enable(info->dphy_clk);
 	} else
 		mipi_dbg("mipi csi2 already enabled!\n");
@@ -102,6 +103,7 @@ bool mipi_csi2_disable(struct mipi_csi2_info *info)
 	if (info->mipi_en) {
 		info->mipi_en = false;
 		clk_disable(info->dphy_clk);
+		clk_disable(info->cfg_clk);
 	} else
 		mipi_dbg("mipi csi2 already disabled!\n");
 
@@ -402,6 +404,14 @@ static int mipi_csi2_probe(struct platform_device *pdev)
 	gmipi_csi2->v_channel = plat_data->v_channel;
 	gmipi_csi2->lanes = plat_data->lanes;
 
+	/* get mipi cfg clk */
+	gmipi_csi2->cfg_clk = clk_get(&pdev->dev, plat_data->cfg_clk);
+	if (IS_ERR(gmipi_csi2->cfg_clk)) {
+		dev_err(&pdev->dev, "failed to get cfg clk\n");
+		ret = PTR_ERR(gmipi_csi2->cfg_clk);
+		goto err_clk0;
+	}
+
 	/* get mipi dphy clk */
 	gmipi_csi2->dphy_clk = clk_get(&pdev->dev, plat_data->dphy_clk);
 	if (IS_ERR(gmipi_csi2->dphy_clk)) {
@@ -432,11 +442,13 @@ static int mipi_csi2_probe(struct platform_device *pdev)
 	}
 
 	/* mipi dphy clk enable for register access */
+	clk_enable(gmipi_csi2->cfg_clk);
 	clk_enable(gmipi_csi2->dphy_clk);
 	/* get mipi csi2 dphy version */
 	mipi_csi2_dphy_ver = mipi_csi2_read(gmipi_csi2, CSI2_VERSION);
 
 	clk_disable(gmipi_csi2->dphy_clk);
+	clk_disable(gmipi_csi2->cfg_clk);
 
 	platform_set_drvdata(pdev, gmipi_csi2);
 
@@ -452,6 +464,8 @@ static int mipi_csi2_probe(struct platform_device *pdev)
 err_clk2:
 	clk_put(gmipi_csi2->dphy_clk);
 err_clk1:
+	clk_put(gmipi_csi2->cfg_clk);
+err_clk0:
 	kfree(gmipi_csi2);
 alloc_failed:
 	return ret;

diff --git a/drivers/mxc/mipi/mxc_mipi_csi2.h b/drivers/mxc/mipi/mxc_mipi_csi2.h
@@ -36,6 +36,7 @@ struct mipi_csi2_info {
 	unsigned int	datatype;
 	struct clk	*dphy_clk;
 	struct clk	*pixel_clk;
+	struct clk	*cfg_clk;
 	unsigned int	*mipi_csi2_base;
 	struct platform_device	*pdev;