Commit 9250741e authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Florian Tobias Schandinat
Browse files

fbdev: sh_mipi_dsi: tidyup dsip_clk 



dsipck clock is controled by CLKDEV_ICK_ID() in clock-shxxx.
dsi0p_clk/dsi1p_clk naming is not needed.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 41e583c2

arch/arm/mach-shmobile/clock-sh7372.c

+2 −2
Original line number Diff line number Diff line
@@ -612,8 +612,8 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("hdmi_clk", &div6_reparent_clks[DIV6_HDMI]),

	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),

	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),

	CLKDEV_ICK_ID("dsi0p_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),

	CLKDEV_ICK_ID("dsi1p_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),

	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),

	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),



	/* MSTP32 clocks */

	CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* IIC2 */

arch/arm/mach-shmobile/clock-sh73a0.c

+2 −2
Original line number Diff line number Diff line
@@ -319,8 +319,8 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("sdhi2_clk", &div6_clks[DIV6_SDHI2]),

	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),

	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),

	CLKDEV_ICK_ID("dsi0p_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),

	CLKDEV_ICK_ID("dsi1p_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),

	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),

	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),



	/* MSTP32 clocks */

	CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* I2C2 */

drivers/video/sh_mipi_dsi.c

+1 −3
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ static int __init sh_mipi_probe(struct platform_device *pdev) 
	struct resource *res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	unsigned long rate, f_current;

	int idx = pdev->id, ret;

	char dsip_clk[] = "dsi.p_clk";



	if (!res || !res2 || idx >= ARRAY_SIZE(mipi_dsi) || !pdata)

		return -ENODEV;
@@ -428,8 +427,7 @@ static int __init sh_mipi_probe(struct platform_device *pdev) 


	dev_dbg(&pdev->dev, "DSI-T clk %lu -> %lu\n", f_current, rate);



	sprintf(dsip_clk, "dsi%1.1dp_clk", idx);

	mipi->dsip_clk = clk_get(&pdev->dev, dsip_clk);

	mipi->dsip_clk = clk_get(&pdev->dev, "dsip_clk");

	if (IS_ERR(mipi->dsip_clk)) {

		ret = PTR_ERR(mipi->dsip_clk);

		goto eclkpget;

CRA Git | Maintained and supported by SUSTech CRA and CCSE