Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 407bd564 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: rename dss_get_generic_clk_source_name() 



Now that there is no "non-generic" version of the function to get the
clock source name, lets rename dss_get_generic_clk_source_name() to
dss_get_clk_source_name().

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 557a1544

drivers/gpu/drm/omapdrm/dss/dispc.c

+2 −2
Original line number Diff line number Diff line
@@ -3433,7 +3433,7 @@ static void dispc_dump_clocks_channel(struct seq_file *s, enum omap_channel chan 
	lcd_clk_src = dss_get_lcd_clk_source(channel);



	seq_printf(s, "%s clk source = %s\n", mgr_desc[channel].name,

		dss_get_generic_clk_source_name(lcd_clk_src));

		dss_get_clk_source_name(lcd_clk_src));



	dispc_mgr_get_lcd_divisor(channel, &lcd, &pcd);
@@ -3455,7 +3455,7 @@ void dispc_dump_clocks(struct seq_file *s) 
	seq_printf(s, "- DISPC -\n");



	seq_printf(s, "dispc fclk source = %s\n",

			dss_get_generic_clk_source_name(dispc_clk_src));

			dss_get_clk_source_name(dispc_clk_src));



	seq_printf(s, "fck\t\t%-16lu\n", dispc_fclk_rate());

drivers/gpu/drm/omapdrm/dss/dsi.c

+3 −3
Original line number Diff line number Diff line
@@ -1504,7 +1504,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev, 
			cinfo->clkdco, cinfo->m);



	seq_printf(s,	"DSI_PLL_HSDIV_DISPC (%s)\t%-16lum_dispc %u\t(%s)\n",

			dss_get_generic_clk_source_name(dsi_module == 0 ?

			dss_get_clk_source_name(dsi_module == 0 ?

				OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :

				OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC),

			cinfo->clkout[HSDIV_DISPC],
@@ -1513,7 +1513,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev, 
			"off" : "on");



	seq_printf(s,	"DSI_PLL_HSDIV_DSI (%s)\t%-16lum_dsi %u\t(%s)\n",

			dss_get_generic_clk_source_name(dsi_module == 0 ?

			dss_get_clk_source_name(dsi_module == 0 ?

				OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :

				OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI),

			cinfo->clkout[HSDIV_DSI],
@@ -1524,7 +1524,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev, 
	seq_printf(s,	"- DSI%d -\n", dsi_module + 1);



	seq_printf(s,	"dsi fclk source = %s\n",

			dss_get_generic_clk_source_name(dsi_clk_src));

			dss_get_clk_source_name(dsi_clk_src));



	seq_printf(s,	"DSI_FCLK\t%lu\n", dsi_fclk_rate(dsidev));

drivers/gpu/drm/omapdrm/dss/dss.c

+2 −2
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ void dss_sdi_disable(void) 
	REG_FLD_MOD(DSS_PLL_CONTROL, 0, 18, 18); /* SDI_PLL_SYSRESET */

}



const char *dss_get_generic_clk_source_name(enum dss_clk_source clk_src)

const char *dss_get_clk_source_name(enum dss_clk_source clk_src)

{

	return dss_generic_clk_source_names[clk_src];

}
@@ -368,7 +368,7 @@ void dss_dump_clocks(struct seq_file *s) 


	seq_printf(s, "- DSS -\n");



	fclk_name = dss_get_generic_clk_source_name(OMAP_DSS_CLK_SRC_FCK);

	fclk_name = dss_get_clk_source_name(OMAP_DSS_CLK_SRC_FCK);

	fclk_rate = clk_get_rate(dss.dss_clk);



	seq_printf(s, "%s = %lu\n",

drivers/gpu/drm/omapdrm/dss/dss.h

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ unsigned long dss_get_dispc_clk_rate(void); 
int dss_dpi_select_source(int port, enum omap_channel channel);

void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select);

enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void);

const char *dss_get_generic_clk_source_name(enum dss_clk_source clk_src);

const char *dss_get_clk_source_name(enum dss_clk_source clk_src);

void dss_dump_clocks(struct seq_file *s);



/* DSS VIDEO PLL */