Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/omap: rename omap_dss_clk_source

'enum omap_dss_clk_source' is internal to dss. Let's rename it to
'dss_clk_source' match our naming convention.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

+23 -23
+2 -2
drivers/gpu/drm/omapdrm/dss/dispc.c
··· 3426 3426 static void dispc_dump_clocks_channel(struct seq_file *s, enum omap_channel channel) 3427 3427 { 3428 3428 int lcd, pcd; 3429 - enum omap_dss_clk_source lcd_clk_src; 3429 + enum dss_clk_source lcd_clk_src; 3430 3430 3431 3431 seq_printf(s, "- %s -\n", mgr_desc[channel].name); 3432 3432 ··· 3448 3448 { 3449 3449 int lcd; 3450 3450 u32 l; 3451 - enum omap_dss_clk_source dispc_clk_src = dss_get_dispc_clk_source(); 3451 + enum dss_clk_source dispc_clk_src = dss_get_dispc_clk_source(); 3452 3452 3453 3453 if (dispc_runtime_get()) 3454 3454 return;
+1 -1
drivers/gpu/drm/omapdrm/dss/dpi.c
··· 123 123 } 124 124 } 125 125 126 - static enum omap_dss_clk_source dpi_get_alt_clk_src(enum omap_channel channel) 126 + static enum dss_clk_source dpi_get_alt_clk_src(enum omap_channel channel) 127 127 { 128 128 switch (channel) { 129 129 case OMAP_DSS_CHANNEL_LCD:
+1 -1
drivers/gpu/drm/omapdrm/dss/dsi.c
··· 1484 1484 { 1485 1485 struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev); 1486 1486 struct dss_pll_clock_info *cinfo = &dsi->pll.cinfo; 1487 - enum omap_dss_clk_source dispc_clk_src, dsi_clk_src; 1487 + enum dss_clk_source dispc_clk_src, dsi_clk_src; 1488 1488 int dsi_module = dsi->module_id; 1489 1489 struct dss_pll *pll = &dsi->pll; 1490 1490
+10 -10
drivers/gpu/drm/omapdrm/dss/dss.c
··· 91 91 unsigned long cache_prate; 92 92 struct dispc_clock_info cache_dispc_cinfo; 93 93 94 - enum omap_dss_clk_source dsi_clk_source[MAX_NUM_DSI]; 95 - enum omap_dss_clk_source dispc_clk_source; 96 - enum omap_dss_clk_source lcd_clk_source[MAX_DSS_LCD_MANAGERS]; 94 + enum dss_clk_source dsi_clk_source[MAX_NUM_DSI]; 95 + enum dss_clk_source dispc_clk_source; 96 + enum dss_clk_source lcd_clk_source[MAX_DSS_LCD_MANAGERS]; 97 97 98 98 bool ctx_valid; 99 99 u32 ctx[DSS_SZ_REGS / sizeof(u32)]; ··· 353 353 REG_FLD_MOD(DSS_PLL_CONTROL, 0, 18, 18); /* SDI_PLL_SYSRESET */ 354 354 } 355 355 356 - const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src) 356 + const char *dss_get_generic_clk_source_name(enum dss_clk_source clk_src) 357 357 { 358 358 return dss_generic_clk_source_names[clk_src]; 359 359 } ··· 402 402 #undef DUMPREG 403 403 } 404 404 405 - static void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src) 405 + static void dss_select_dispc_clk_source(enum dss_clk_source clk_src) 406 406 { 407 407 int b; 408 408 u8 start, end; ··· 430 430 } 431 431 432 432 void dss_select_dsi_clk_source(int dsi_module, 433 - enum omap_dss_clk_source clk_src) 433 + enum dss_clk_source clk_src) 434 434 { 435 435 int b, pos; 436 436 ··· 458 458 } 459 459 460 460 void dss_select_lcd_clk_source(enum omap_channel channel, 461 - enum omap_dss_clk_source clk_src) 461 + enum dss_clk_source clk_src) 462 462 { 463 463 int b, ix, pos; 464 464 ··· 494 494 dss.lcd_clk_source[ix] = clk_src; 495 495 } 496 496 497 - enum omap_dss_clk_source dss_get_dispc_clk_source(void) 497 + enum dss_clk_source dss_get_dispc_clk_source(void) 498 498 { 499 499 return dss.dispc_clk_source; 500 500 } 501 501 502 - enum omap_dss_clk_source dss_get_dsi_clk_source(int dsi_module) 502 + enum dss_clk_source dss_get_dsi_clk_source(int dsi_module) 503 503 { 504 504 return dss.dsi_clk_source[dsi_module]; 505 505 } 506 506 507 - enum omap_dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel) 507 + enum dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel) 508 508 { 509 509 if (dss_has_feature(FEAT_LCD_CLK_SRC)) { 510 510 int ix = channel == OMAP_DSS_CHANNEL_LCD ? 0 :
+7 -7
drivers/gpu/drm/omapdrm/dss/dss.h
··· 102 102 DSS_WB_LCD3_MGR = 7, 103 103 }; 104 104 105 - enum omap_dss_clk_source { 105 + enum dss_clk_source { 106 106 OMAP_DSS_CLK_SRC_FCK = 0, /* OMAP2/3: DSS1_ALWON_FCLK 107 107 * OMAP4: DSS_FCLK */ 108 108 OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC, /* OMAP3: DSI1_PLL_FCLK ··· 238 238 int dss_dpi_select_source(int port, enum omap_channel channel); 239 239 void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select); 240 240 enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void); 241 - const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src); 241 + const char *dss_get_generic_clk_source_name(enum dss_clk_source clk_src); 242 242 void dss_dump_clocks(struct seq_file *s); 243 243 244 244 /* DSS VIDEO PLL */ ··· 263 263 void dss_sdi_disable(void); 264 264 265 265 void dss_select_dsi_clk_source(int dsi_module, 266 - enum omap_dss_clk_source clk_src); 266 + enum dss_clk_source clk_src); 267 267 void dss_select_lcd_clk_source(enum omap_channel channel, 268 - enum omap_dss_clk_source clk_src); 269 - enum omap_dss_clk_source dss_get_dispc_clk_source(void); 270 - enum omap_dss_clk_source dss_get_dsi_clk_source(int dsi_module); 271 - enum omap_dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel); 268 + enum dss_clk_source clk_src); 269 + enum dss_clk_source dss_get_dispc_clk_source(void); 270 + enum dss_clk_source dss_get_dsi_clk_source(int dsi_module); 271 + enum dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel); 272 272 273 273 void dss_set_venc_output(enum omap_dss_venc_type type); 274 274 void dss_set_dac_pwrdn_bgz(bool enable);
+1 -1
drivers/gpu/drm/omapdrm/dss/dss_features.c
··· 859 859 color_mode; 860 860 } 861 861 862 - const char *dss_feat_get_clk_source_name(enum omap_dss_clk_source id) 862 + const char *dss_feat_get_clk_source_name(enum dss_clk_source id) 863 863 { 864 864 return omap_current_dss_features->clksrc_names[id]; 865 865 }
+1 -1
drivers/gpu/drm/omapdrm/dss/dss_features.h
··· 91 91 enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane); 92 92 bool dss_feat_color_mode_supported(enum omap_plane plane, 93 93 enum omap_color_mode color_mode); 94 - const char *dss_feat_get_clk_source_name(enum omap_dss_clk_source id); 94 + const char *dss_feat_get_clk_source_name(enum dss_clk_source id); 95 95 96 96 u32 dss_feat_get_buffer_size_unit(void); /* in bytes */ 97 97 u32 dss_feat_get_burst_size_unit(void); /* in bytes */