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.

phy: phy-rockchip-samsung-hdptx: Add the '_MASK' suffix to all registers

Adding the '_MASK' suffix to all registers in order to ensures consistency
in the naming convention for register macros throughout the file.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20250205105157.580060-4-damon.ding@rock-chips.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Damon Ding and committed by
Vinod Koul
2dc8224e f7060241

+44 -44
+44 -44
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
··· 50 50 #define LCPLL_PI_EN_MASK BIT(5) 51 51 #define LCPLL_100M_CLK_EN_MASK BIT(0) 52 52 /* CMN_REG(0025) */ 53 - #define LCPLL_PMS_IQDIV_RSTN BIT(4) 53 + #define LCPLL_PMS_IQDIV_RSTN_MASK BIT(4) 54 54 /* CMN_REG(0028) */ 55 - #define LCPLL_SDC_FRAC_EN BIT(2) 56 - #define LCPLL_SDC_FRAC_RSTN BIT(0) 55 + #define LCPLL_SDC_FRAC_EN_MASK BIT(2) 56 + #define LCPLL_SDC_FRAC_RSTN_MASK BIT(0) 57 57 /* CMN_REG(002d) */ 58 58 #define LCPLL_SDC_N_MASK GENMASK(3, 1) 59 59 /* CMN_REG(002e) */ 60 60 #define LCPLL_SDC_NUMBERATOR_MASK GENMASK(5, 0) 61 61 /* CMN_REG(002f) */ 62 62 #define LCPLL_SDC_DENOMINATOR_MASK GENMASK(7, 2) 63 - #define LCPLL_SDC_NDIV_RSTN BIT(0) 63 + #define LCPLL_SDC_NDIV_RSTN_MASK BIT(0) 64 64 /* CMN_REG(003d) */ 65 - #define ROPLL_LCVCO_EN BIT(4) 65 + #define ROPLL_LCVCO_EN_MASK BIT(4) 66 66 /* CMN_REG(004e) */ 67 - #define ROPLL_PI_EN BIT(5) 67 + #define ROPLL_PI_EN_MASK BIT(5) 68 68 /* CMN_REG(005c) */ 69 - #define ROPLL_PMS_IQDIV_RSTN BIT(5) 69 + #define ROPLL_PMS_IQDIV_RSTN_MASK BIT(5) 70 70 /* CMN_REG(005e) */ 71 71 #define ROPLL_SDM_EN_MASK BIT(6) 72 - #define ROPLL_SDM_FRAC_EN_RBR BIT(3) 73 - #define ROPLL_SDM_FRAC_EN_HBR BIT(2) 74 - #define ROPLL_SDM_FRAC_EN_HBR2 BIT(1) 75 - #define ROPLL_SDM_FRAC_EN_HBR3 BIT(0) 72 + #define ROPLL_SDC_FRAC_EN_RBR_MASK BIT(3) 73 + #define ROPLL_SDC_FRAC_EN_HBR_MASK BIT(2) 74 + #define ROPLL_SDC_FRAC_EN_HBR2_MASK BIT(1) 75 + #define ROPLL_SDM_FRAC_EN_HBR3_MASK BIT(0) 76 76 /* CMN_REG(0064) */ 77 77 #define ROPLL_SDM_NUM_SIGN_RBR_MASK BIT(3) 78 78 /* CMN_REG(0069) */ 79 79 #define ROPLL_SDC_N_RBR_MASK GENMASK(2, 0) 80 80 /* CMN_REG(0074) */ 81 - #define ROPLL_SDC_NDIV_RSTN BIT(2) 82 - #define ROPLL_SSC_EN BIT(0) 81 + #define ROPLL_SDC_NDIV_RSTN_MASK BIT(2) 82 + #define ROPLL_SSC_EN_MASK BIT(0) 83 83 /* CMN_REG(0081) */ 84 - #define OVRD_PLL_CD_CLK_EN BIT(8) 85 - #define ANA_PLL_CD_HSCLK_EAST_EN BIT(0) 84 + #define OVRD_PLL_CD_CLK_EN_MASK BIT(8) 85 + #define ANA_PLL_CD_HSCLK_EAST_EN_MASK BIT(0) 86 86 /* CMN_REG(0086) */ 87 87 #define PLL_PCG_POSTDIV_SEL_MASK GENMASK(7, 4) 88 88 #define PLL_PCG_CLK_SEL_MASK GENMASK(3, 1) 89 - #define PLL_PCG_CLK_EN BIT(0) 89 + #define PLL_PCG_CLK_EN_MASK BIT(0) 90 90 /* CMN_REG(0087) */ 91 - #define ANA_PLL_FRL_MODE_EN BIT(3) 92 - #define ANA_PLL_TX_HS_CLK_EN BIT(2) 91 + #define ANA_PLL_FRL_MODE_EN_MASK BIT(3) 92 + #define ANA_PLL_TX_HS_CLK_EN_MASK BIT(2) 93 93 /* CMN_REG(0089) */ 94 - #define LCPLL_ALONE_MODE BIT(1) 94 + #define LCPLL_ALONE_MODE_MASK BIT(1) 95 95 /* CMN_REG(0097) */ 96 - #define DIG_CLK_SEL BIT(1) 96 + #define DIG_CLK_SEL_MASK BIT(1) 97 97 #define LCPLL_REF BIT(1) 98 98 #define ROPLL_REF 0 99 99 /* CMN_REG(0099) */ 100 - #define CMN_ROPLL_ALONE_MODE BIT(2) 100 + #define CMN_ROPLL_ALONE_MODE_MASK BIT(2) 101 101 #define ROPLL_ALONE_MODE BIT(2) 102 102 /* CMN_REG(009a) */ 103 - #define HS_SPEED_SEL BIT(0) 103 + #define HS_SPEED_SEL_MASK BIT(0) 104 104 #define DIV_10_CLOCK BIT(0) 105 105 /* CMN_REG(009b) */ 106 - #define IS_SPEED_SEL BIT(4) 106 + #define LS_SPEED_SEL_MASK BIT(4) 107 107 #define LINK_SYMBOL_CLOCK BIT(4) 108 108 #define LINK_SYMBOL_CLOCK1_2 0 109 109 ··· 161 161 #define SB_READY_MASK BIT(4) 162 162 163 163 /* LNTOP_REG(0200) */ 164 - #define PROTOCOL_SEL BIT(2) 164 + #define PROTOCOL_SEL_MASK BIT(2) 165 165 #define HDMI_MODE BIT(2) 166 166 #define HDMI_TMDS_FRL_SEL BIT(1) 167 167 /* LNTOP_REG(0206) */ 168 - #define DATA_BUS_SEL BIT(0) 168 + #define DATA_BUS_WIDTH_SEL_MASK BIT(0) 169 169 #define DATA_BUS_36_40 BIT(0) 170 170 /* LNTOP_REG(0207) */ 171 - #define LANE_EN 0xf 171 + #define LANE_EN_MASK 0xf 172 172 #define ALL_LANE_EN 0xf 173 173 174 174 /* LANE_REG(0312) */ 175 - #define LN0_TX_SER_RATE_SEL_RBR BIT(5) 176 - #define LN0_TX_SER_RATE_SEL_HBR BIT(4) 177 - #define LN0_TX_SER_RATE_SEL_HBR2 BIT(3) 178 - #define LN0_TX_SER_RATE_SEL_HBR3 BIT(2) 175 + #define LN0_TX_SER_RATE_SEL_RBR_MASK BIT(5) 176 + #define LN0_TX_SER_RATE_SEL_HBR_MASK BIT(4) 177 + #define LN0_TX_SER_RATE_SEL_HBR2_MASK BIT(3) 178 + #define LN0_TX_SER_RATE_SEL_HBR3_MASK BIT(2) 179 179 /* LANE_REG(0412) */ 180 - #define LN1_TX_SER_RATE_SEL_RBR BIT(5) 181 - #define LN1_TX_SER_RATE_SEL_HBR BIT(4) 182 - #define LN1_TX_SER_RATE_SEL_HBR2 BIT(3) 183 - #define LN1_TX_SER_RATE_SEL_HBR3 BIT(2) 180 + #define LN1_TX_SER_RATE_SEL_RBR_MASK BIT(5) 181 + #define LN1_TX_SER_RATE_SEL_HBR_MASK BIT(4) 182 + #define LN1_TX_SER_RATE_SEL_HBR2_MASK BIT(3) 183 + #define LN1_TX_SER_RATE_SEL_HBR3_MASK BIT(2) 184 184 /* LANE_REG(0512) */ 185 - #define LN2_TX_SER_RATE_SEL_RBR BIT(5) 186 - #define LN2_TX_SER_RATE_SEL_HBR BIT(4) 187 - #define LN2_TX_SER_RATE_SEL_HBR2 BIT(3) 188 - #define LN2_TX_SER_RATE_SEL_HBR3 BIT(2) 185 + #define LN2_TX_SER_RATE_SEL_RBR_MASK BIT(5) 186 + #define LN2_TX_SER_RATE_SEL_HBR_MASK BIT(4) 187 + #define LN2_TX_SER_RATE_SEL_HBR2_MASK BIT(3) 188 + #define LN2_TX_SER_RATE_SEL_HBR3_MASK BIT(2) 189 189 /* LANE_REG(0612) */ 190 - #define LN3_TX_SER_RATE_SEL_RBR BIT(5) 191 - #define LN3_TX_SER_RATE_SEL_HBR BIT(4) 192 - #define LN3_TX_SER_RATE_SEL_HBR2 BIT(3) 193 - #define LN3_TX_SER_RATE_SEL_HBR3 BIT(2) 190 + #define LN3_TX_SER_RATE_SEL_RBR_MASK BIT(5) 191 + #define LN3_TX_SER_RATE_SEL_HBR_MASK BIT(4) 192 + #define LN3_TX_SER_RATE_SEL_HBR2_MASK BIT(3) 193 + #define LN3_TX_SER_RATE_SEL_HBR3_MASK BIT(2) 194 194 195 195 #define HDMI20_MAX_RATE 600000000 196 196 ··· 824 824 regmap_update_bits(hdptx->regmap, CMN_REG(0086), PLL_PCG_POSTDIV_SEL_MASK, 825 825 FIELD_PREP(PLL_PCG_POSTDIV_SEL_MASK, cfg->pms_sdiv)); 826 826 827 - regmap_update_bits(hdptx->regmap, CMN_REG(0086), PLL_PCG_CLK_EN, 828 - PLL_PCG_CLK_EN); 827 + regmap_update_bits(hdptx->regmap, CMN_REG(0086), PLL_PCG_CLK_EN_MASK, 828 + FIELD_PREP(PLL_PCG_CLK_EN_MASK, 0x1)); 829 829 830 830 return rk_hdptx_post_enable_pll(hdptx); 831 831 }