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

Configure Feed

Select the types of activity you want to include in your feed.

drm/msm/mdp4: Consistently use the "mdp4_" namespace

Functions and other stuff all start with "mdp4_", except a few ones that
start with "mpd4_" (d and p switched)

Make things consistent and use "mdp4_" everywhere.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/661306/
Link: https://lore.kernel.org/r/6b9076268548c52ec371e9ed35fee0dd8fcb46ef.1751044672.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

authored by

Christophe JAILLET and committed by
Dmitry Baryshkov bffa3a03 3cf6147f

+21 -21
+1 -1
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h
··· 202 202 } 203 203 #endif 204 204 205 - struct clk *mpd4_get_lcdc_clock(struct drm_device *dev); 205 + struct clk *mdp4_get_lcdc_clock(struct drm_device *dev); 206 206 207 207 #endif /* __MDP4_KMS_H__ */
+1 -1
drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c
··· 375 375 376 376 drm_encoder_helper_add(encoder, &mdp4_lcdc_encoder_helper_funcs); 377 377 378 - mdp4_lcdc_encoder->lcdc_clk = mpd4_get_lcdc_clock(dev); 378 + mdp4_lcdc_encoder->lcdc_clk = mdp4_get_lcdc_clock(dev); 379 379 if (IS_ERR(mdp4_lcdc_encoder->lcdc_clk)) { 380 380 DRM_DEV_ERROR(dev->dev, "failed to get lvds_clk\n"); 381 381 return ERR_CAST(mdp4_lcdc_encoder->lcdc_clk);
+19 -19
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_pll.c
··· 54 54 return &freqtbl[i-1]; 55 55 } 56 56 57 - static int mpd4_lvds_pll_enable(struct clk_hw *hw) 57 + static int mdp4_lvds_pll_enable(struct clk_hw *hw) 58 58 { 59 59 struct mdp4_lvds_pll *lvds_pll = to_mdp4_lvds_pll(hw); 60 60 struct mdp4_kms *mdp4_kms = get_kms(lvds_pll); ··· 80 80 return 0; 81 81 } 82 82 83 - static void mpd4_lvds_pll_disable(struct clk_hw *hw) 83 + static void mdp4_lvds_pll_disable(struct clk_hw *hw) 84 84 { 85 85 struct mdp4_lvds_pll *lvds_pll = to_mdp4_lvds_pll(hw); 86 86 struct mdp4_kms *mdp4_kms = get_kms(lvds_pll); ··· 91 91 mdp4_write(mdp4_kms, REG_MDP4_LVDS_PHY_PLL_CTRL_0, 0x0); 92 92 } 93 93 94 - static unsigned long mpd4_lvds_pll_recalc_rate(struct clk_hw *hw, 94 + static unsigned long mdp4_lvds_pll_recalc_rate(struct clk_hw *hw, 95 95 unsigned long parent_rate) 96 96 { 97 97 struct mdp4_lvds_pll *lvds_pll = to_mdp4_lvds_pll(hw); 98 98 return lvds_pll->pixclk; 99 99 } 100 100 101 - static long mpd4_lvds_pll_round_rate(struct clk_hw *hw, unsigned long rate, 101 + static long mdp4_lvds_pll_round_rate(struct clk_hw *hw, unsigned long rate, 102 102 unsigned long *parent_rate) 103 103 { 104 104 const struct pll_rate *pll_rate = find_rate(rate); 105 105 return pll_rate->rate; 106 106 } 107 107 108 - static int mpd4_lvds_pll_set_rate(struct clk_hw *hw, unsigned long rate, 108 + static int mdp4_lvds_pll_set_rate(struct clk_hw *hw, unsigned long rate, 109 109 unsigned long parent_rate) 110 110 { 111 111 struct mdp4_lvds_pll *lvds_pll = to_mdp4_lvds_pll(hw); ··· 114 114 } 115 115 116 116 117 - static const struct clk_ops mpd4_lvds_pll_ops = { 118 - .enable = mpd4_lvds_pll_enable, 119 - .disable = mpd4_lvds_pll_disable, 120 - .recalc_rate = mpd4_lvds_pll_recalc_rate, 121 - .round_rate = mpd4_lvds_pll_round_rate, 122 - .set_rate = mpd4_lvds_pll_set_rate, 117 + static const struct clk_ops mdp4_lvds_pll_ops = { 118 + .enable = mdp4_lvds_pll_enable, 119 + .disable = mdp4_lvds_pll_disable, 120 + .recalc_rate = mdp4_lvds_pll_recalc_rate, 121 + .round_rate = mdp4_lvds_pll_round_rate, 122 + .set_rate = mdp4_lvds_pll_set_rate, 123 123 }; 124 124 125 - static const struct clk_parent_data mpd4_lvds_pll_parents[] = { 125 + static const struct clk_parent_data mdp4_lvds_pll_parents[] = { 126 126 { .fw_name = "pxo", .name = "pxo", }, 127 127 }; 128 128 129 129 static struct clk_init_data pll_init = { 130 - .name = "mpd4_lvds_pll", 131 - .ops = &mpd4_lvds_pll_ops, 132 - .parent_data = mpd4_lvds_pll_parents, 133 - .num_parents = ARRAY_SIZE(mpd4_lvds_pll_parents), 130 + .name = "mdp4_lvds_pll", 131 + .ops = &mdp4_lvds_pll_ops, 132 + .parent_data = mdp4_lvds_pll_parents, 133 + .num_parents = ARRAY_SIZE(mdp4_lvds_pll_parents), 134 134 }; 135 135 136 - static struct clk_hw *mpd4_lvds_pll_init(struct drm_device *dev) 136 + static struct clk_hw *mdp4_lvds_pll_init(struct drm_device *dev) 137 137 { 138 138 struct mdp4_lvds_pll *lvds_pll; 139 139 int ret; ··· 156 156 return &lvds_pll->pll_hw; 157 157 } 158 158 159 - struct clk *mpd4_get_lcdc_clock(struct drm_device *dev) 159 + struct clk *mdp4_get_lcdc_clock(struct drm_device *dev) 160 160 { 161 161 struct clk_hw *hw; 162 162 struct clk *clk; 163 163 164 164 165 165 /* TODO: do we need different pll in other cases? */ 166 - hw = mpd4_lvds_pll_init(dev); 166 + hw = mdp4_lvds_pll_init(dev); 167 167 if (IS_ERR(hw)) { 168 168 DRM_DEV_ERROR(dev->dev, "failed to register LVDS PLL\n"); 169 169 return ERR_CAST(hw);