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

phy: mediatek: hdmi: mt8173: use GENMASK to generate bits mask

Use GENMASK() macro to generate bits mask

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220920090038.15133-10-chunfeng.yun@mediatek.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Chunfeng Yun and committed by
Vinod Koul
a8a78274 cff81a61

+44 -44
+44 -44
drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
··· 8 8 9 9 #define HDMI_CON0 0x00 10 10 #define RG_HDMITX_PLL_EN BIT(31) 11 - #define RG_HDMITX_PLL_FBKDIV (0x7f << 24) 11 + #define RG_HDMITX_PLL_FBKDIV GENMASK(30, 24) 12 12 #define PLL_FBKDIV_SHIFT 24 13 - #define RG_HDMITX_PLL_FBKSEL (0x3 << 22) 13 + #define RG_HDMITX_PLL_FBKSEL GENMASK(23, 22) 14 14 #define PLL_FBKSEL_SHIFT 22 15 - #define RG_HDMITX_PLL_PREDIV (0x3 << 20) 15 + #define RG_HDMITX_PLL_PREDIV GENMASK(21, 20) 16 16 #define PREDIV_SHIFT 20 17 - #define RG_HDMITX_PLL_POSDIV (0x3 << 18) 17 + #define RG_HDMITX_PLL_POSDIV GENMASK(19, 18) 18 18 #define POSDIV_SHIFT 18 19 - #define RG_HDMITX_PLL_RST_DLY (0x3 << 16) 20 - #define RG_HDMITX_PLL_IR (0xf << 12) 19 + #define RG_HDMITX_PLL_RST_DLY GENMASK(17, 16) 20 + #define RG_HDMITX_PLL_IR GENMASK(15, 12) 21 21 #define PLL_IR_SHIFT 12 22 - #define RG_HDMITX_PLL_IC (0xf << 8) 22 + #define RG_HDMITX_PLL_IC GENMASK(11, 8) 23 23 #define PLL_IC_SHIFT 8 24 - #define RG_HDMITX_PLL_BP (0xf << 4) 24 + #define RG_HDMITX_PLL_BP GENMASK(7, 4) 25 25 #define PLL_BP_SHIFT 4 26 - #define RG_HDMITX_PLL_BR (0x3 << 2) 26 + #define RG_HDMITX_PLL_BR GENMASK(3, 2) 27 27 #define PLL_BR_SHIFT 2 28 - #define RG_HDMITX_PLL_BC (0x3 << 0) 28 + #define RG_HDMITX_PLL_BC GENMASK(1, 0) 29 29 #define PLL_BC_SHIFT 0 30 30 #define HDMI_CON1 0x04 31 - #define RG_HDMITX_PLL_DIVEN (0x7 << 29) 31 + #define RG_HDMITX_PLL_DIVEN GENMASK(31, 29) 32 32 #define PLL_DIVEN_SHIFT 29 33 33 #define RG_HDMITX_PLL_AUTOK_EN BIT(28) 34 - #define RG_HDMITX_PLL_AUTOK_KF (0x3 << 26) 35 - #define RG_HDMITX_PLL_AUTOK_KS (0x3 << 24) 34 + #define RG_HDMITX_PLL_AUTOK_KF GENMASK(27, 26) 35 + #define RG_HDMITX_PLL_AUTOK_KS GENMASK(25, 24) 36 36 #define RG_HDMITX_PLL_AUTOK_LOAD BIT(23) 37 - #define RG_HDMITX_PLL_BAND (0x3f << 16) 37 + #define RG_HDMITX_PLL_BAND GENMASK(21, 16) 38 38 #define RG_HDMITX_PLL_REF_SEL BIT(15) 39 39 #define RG_HDMITX_PLL_BIAS_EN BIT(14) 40 40 #define RG_HDMITX_PLL_BIAS_LPF_EN BIT(13) 41 41 #define RG_HDMITX_PLL_TXDIV_EN BIT(12) 42 - #define RG_HDMITX_PLL_TXDIV (0x3 << 10) 42 + #define RG_HDMITX_PLL_TXDIV GENMASK(11, 10) 43 43 #define PLL_TXDIV_SHIFT 10 44 44 #define RG_HDMITX_PLL_LVROD_EN BIT(9) 45 45 #define RG_HDMITX_PLL_MONVC_EN BIT(8) ··· 47 47 #define RG_HDMITX_PLL_MONREF_EN BIT(6) 48 48 #define RG_HDMITX_PLL_TST_EN BIT(5) 49 49 #define RG_HDMITX_PLL_TST_CK_EN BIT(4) 50 - #define RG_HDMITX_PLL_TST_SEL (0xf << 0) 50 + #define RG_HDMITX_PLL_TST_SEL GENMASK(3, 0) 51 51 #define HDMI_CON2 0x08 52 - #define RGS_HDMITX_PLL_AUTOK_BAND (0x7f << 8) 52 + #define RGS_HDMITX_PLL_AUTOK_BAND GENMASK(14, 8) 53 53 #define RGS_HDMITX_PLL_AUTOK_FAIL BIT(1) 54 54 #define RG_HDMITX_EN_TX_CKLDO BIT(0) 55 55 #define HDMI_CON3 0x0c 56 - #define RG_HDMITX_SER_EN (0xf << 28) 57 - #define RG_HDMITX_PRD_EN (0xf << 24) 58 - #define RG_HDMITX_PRD_IMP_EN (0xf << 20) 59 - #define RG_HDMITX_DRV_EN (0xf << 16) 60 - #define RG_HDMITX_DRV_IMP_EN (0xf << 12) 56 + #define RG_HDMITX_SER_EN GENMASK(31, 28) 57 + #define RG_HDMITX_PRD_EN GENMASK(27, 24) 58 + #define RG_HDMITX_PRD_IMP_EN GENMASK(23, 20) 59 + #define RG_HDMITX_DRV_EN GENMASK(19, 16) 60 + #define RG_HDMITX_DRV_IMP_EN GENMASK(15, 12) 61 61 #define DRV_IMP_EN_SHIFT 12 62 62 #define RG_HDMITX_MHLCK_FORCE BIT(10) 63 63 #define RG_HDMITX_MHLCK_PPIX_EN BIT(9) 64 64 #define RG_HDMITX_MHLCK_EN BIT(8) 65 - #define RG_HDMITX_SER_DIN_SEL (0xf << 4) 65 + #define RG_HDMITX_SER_DIN_SEL GENMASK(7, 4) 66 66 #define RG_HDMITX_SER_5T1_BIST_EN BIT(3) 67 67 #define RG_HDMITX_SER_BIST_TOG BIT(2) 68 68 #define RG_HDMITX_SER_DIN_TOG BIT(1) 69 69 #define RG_HDMITX_SER_CLKDIG_INV BIT(0) 70 70 #define HDMI_CON4 0x10 71 - #define RG_HDMITX_PRD_IBIAS_CLK (0xf << 24) 72 - #define RG_HDMITX_PRD_IBIAS_D2 (0xf << 16) 73 - #define RG_HDMITX_PRD_IBIAS_D1 (0xf << 8) 74 - #define RG_HDMITX_PRD_IBIAS_D0 (0xf << 0) 71 + #define RG_HDMITX_PRD_IBIAS_CLK GENMASK(27, 24) 72 + #define RG_HDMITX_PRD_IBIAS_D2 GENMASK(19, 16) 73 + #define RG_HDMITX_PRD_IBIAS_D1 GENMASK(11, 8) 74 + #define RG_HDMITX_PRD_IBIAS_D0 GENMASK(3, 0) 75 75 #define PRD_IBIAS_CLK_SHIFT 24 76 76 #define PRD_IBIAS_D2_SHIFT 16 77 77 #define PRD_IBIAS_D1_SHIFT 8 78 78 #define PRD_IBIAS_D0_SHIFT 0 79 79 #define HDMI_CON5 0x14 80 - #define RG_HDMITX_DRV_IBIAS_CLK (0x3f << 24) 81 - #define RG_HDMITX_DRV_IBIAS_D2 (0x3f << 16) 82 - #define RG_HDMITX_DRV_IBIAS_D1 (0x3f << 8) 83 - #define RG_HDMITX_DRV_IBIAS_D0 (0x3f << 0) 80 + #define RG_HDMITX_DRV_IBIAS_CLK GENMASK(29, 24) 81 + #define RG_HDMITX_DRV_IBIAS_D2 GENMASK(21, 16) 82 + #define RG_HDMITX_DRV_IBIAS_D1 GENMASK(13, 8) 83 + #define RG_HDMITX_DRV_IBIAS_D0 GENMASK(5, 0) 84 84 #define DRV_IBIAS_CLK_SHIFT 24 85 85 #define DRV_IBIAS_D2_SHIFT 16 86 86 #define DRV_IBIAS_D1_SHIFT 8 87 87 #define DRV_IBIAS_D0_SHIFT 0 88 88 #define HDMI_CON6 0x18 89 - #define RG_HDMITX_DRV_IMP_CLK (0x3f << 24) 90 - #define RG_HDMITX_DRV_IMP_D2 (0x3f << 16) 91 - #define RG_HDMITX_DRV_IMP_D1 (0x3f << 8) 92 - #define RG_HDMITX_DRV_IMP_D0 (0x3f << 0) 89 + #define RG_HDMITX_DRV_IMP_CLK GENMASK(29, 24) 90 + #define RG_HDMITX_DRV_IMP_D2 GENMASK(21, 16) 91 + #define RG_HDMITX_DRV_IMP_D1 GENMASK(13, 8) 92 + #define RG_HDMITX_DRV_IMP_D0 GENMASK(5, 0) 93 93 #define DRV_IMP_CLK_SHIFT 24 94 94 #define DRV_IMP_D2_SHIFT 16 95 95 #define DRV_IMP_D1_SHIFT 8 96 96 #define DRV_IMP_D0_SHIFT 0 97 97 #define HDMI_CON7 0x1c 98 - #define RG_HDMITX_MHLCK_DRV_IBIAS (0x1f << 27) 99 - #define RG_HDMITX_SER_DIN (0x3ff << 16) 100 - #define RG_HDMITX_CHLDC_TST (0xf << 12) 101 - #define RG_HDMITX_CHLCK_TST (0xf << 8) 102 - #define RG_HDMITX_RESERVE (0xff << 0) 98 + #define RG_HDMITX_MHLCK_DRV_IBIAS GENMASK(31, 27) 99 + #define RG_HDMITX_SER_DIN GENMASK(25, 16) 100 + #define RG_HDMITX_CHLDC_TST GENMASK(15, 12) 101 + #define RG_HDMITX_CHLCK_TST GENMASK(11, 8) 102 + #define RG_HDMITX_RESERVE GENMASK(7, 0) 103 103 #define HDMI_CON8 0x20 104 - #define RGS_HDMITX_2T1_LEV (0xf << 16) 105 - #define RGS_HDMITX_2T1_EDG (0xf << 12) 106 - #define RGS_HDMITX_5T1_LEV (0xf << 8) 107 - #define RGS_HDMITX_5T1_EDG (0xf << 4) 104 + #define RGS_HDMITX_2T1_LEV GENMASK(19, 16) 105 + #define RGS_HDMITX_2T1_EDG GENMASK(15, 12) 106 + #define RGS_HDMITX_5T1_LEV GENMASK(11, 8) 107 + #define RGS_HDMITX_5T1_EDG GENMASK(7, 4) 108 108 #define RGS_HDMITX_PLUG_TST BIT(0) 109 109 110 110 static int mtk_hdmi_pll_prepare(struct clk_hw *hw)