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

clk: qcom: tcsrcc-glymur: Update register offsets for clock refs

Update the register offsets for all the clock ref branches to match the
new address mapping in the TCSR subsystem.

Fixes: 2c1d6ce4f3da ("clk: qcom: Add TCSR clock driver for Glymur SoC")
Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
Tested-by: Jagadeesh Kona <jagadeesh.kona@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251031-tcsrcc_glymur-v1-1-0efb031f0ac5@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

authored by

Taniya Das and committed by
Bjorn Andersson
a4aa1ceb 0820c937

+27 -27
+27 -27
drivers/clk/qcom/tcsrcc-glymur.c
··· 28 28 }; 29 29 30 30 static struct clk_branch tcsr_edp_clkref_en = { 31 - .halt_reg = 0x1c, 31 + .halt_reg = 0x60, 32 32 .halt_check = BRANCH_HALT_DELAY, 33 33 .clkr = { 34 - .enable_reg = 0x1c, 34 + .enable_reg = 0x60, 35 35 .enable_mask = BIT(0), 36 36 .hw.init = &(const struct clk_init_data) { 37 37 .name = "tcsr_edp_clkref_en", ··· 45 45 }; 46 46 47 47 static struct clk_branch tcsr_pcie_1_clkref_en = { 48 - .halt_reg = 0x4, 48 + .halt_reg = 0x48, 49 49 .halt_check = BRANCH_HALT_DELAY, 50 50 .clkr = { 51 - .enable_reg = 0x4, 51 + .enable_reg = 0x48, 52 52 .enable_mask = BIT(0), 53 53 .hw.init = &(const struct clk_init_data) { 54 54 .name = "tcsr_pcie_1_clkref_en", ··· 62 62 }; 63 63 64 64 static struct clk_branch tcsr_pcie_2_clkref_en = { 65 - .halt_reg = 0x8, 65 + .halt_reg = 0x4c, 66 66 .halt_check = BRANCH_HALT_DELAY, 67 67 .clkr = { 68 - .enable_reg = 0x8, 68 + .enable_reg = 0x4c, 69 69 .enable_mask = BIT(0), 70 70 .hw.init = &(const struct clk_init_data) { 71 71 .name = "tcsr_pcie_2_clkref_en", ··· 79 79 }; 80 80 81 81 static struct clk_branch tcsr_pcie_3_clkref_en = { 82 - .halt_reg = 0x10, 82 + .halt_reg = 0x54, 83 83 .halt_check = BRANCH_HALT_DELAY, 84 84 .clkr = { 85 - .enable_reg = 0x10, 85 + .enable_reg = 0x54, 86 86 .enable_mask = BIT(0), 87 87 .hw.init = &(const struct clk_init_data) { 88 88 .name = "tcsr_pcie_3_clkref_en", ··· 96 96 }; 97 97 98 98 static struct clk_branch tcsr_pcie_4_clkref_en = { 99 - .halt_reg = 0x14, 99 + .halt_reg = 0x58, 100 100 .halt_check = BRANCH_HALT_DELAY, 101 101 .clkr = { 102 - .enable_reg = 0x14, 102 + .enable_reg = 0x58, 103 103 .enable_mask = BIT(0), 104 104 .hw.init = &(const struct clk_init_data) { 105 105 .name = "tcsr_pcie_4_clkref_en", ··· 113 113 }; 114 114 115 115 static struct clk_branch tcsr_usb2_1_clkref_en = { 116 - .halt_reg = 0x28, 116 + .halt_reg = 0x6c, 117 117 .halt_check = BRANCH_HALT_DELAY, 118 118 .clkr = { 119 - .enable_reg = 0x28, 119 + .enable_reg = 0x6c, 120 120 .enable_mask = BIT(0), 121 121 .hw.init = &(const struct clk_init_data) { 122 122 .name = "tcsr_usb2_1_clkref_en", ··· 130 130 }; 131 131 132 132 static struct clk_branch tcsr_usb2_2_clkref_en = { 133 - .halt_reg = 0x2c, 133 + .halt_reg = 0x70, 134 134 .halt_check = BRANCH_HALT_DELAY, 135 135 .clkr = { 136 - .enable_reg = 0x2c, 136 + .enable_reg = 0x70, 137 137 .enable_mask = BIT(0), 138 138 .hw.init = &(const struct clk_init_data) { 139 139 .name = "tcsr_usb2_2_clkref_en", ··· 147 147 }; 148 148 149 149 static struct clk_branch tcsr_usb2_3_clkref_en = { 150 - .halt_reg = 0x30, 150 + .halt_reg = 0x74, 151 151 .halt_check = BRANCH_HALT_DELAY, 152 152 .clkr = { 153 - .enable_reg = 0x30, 153 + .enable_reg = 0x74, 154 154 .enable_mask = BIT(0), 155 155 .hw.init = &(const struct clk_init_data) { 156 156 .name = "tcsr_usb2_3_clkref_en", ··· 164 164 }; 165 165 166 166 static struct clk_branch tcsr_usb2_4_clkref_en = { 167 - .halt_reg = 0x44, 167 + .halt_reg = 0x88, 168 168 .halt_check = BRANCH_HALT_DELAY, 169 169 .clkr = { 170 - .enable_reg = 0x44, 170 + .enable_reg = 0x88, 171 171 .enable_mask = BIT(0), 172 172 .hw.init = &(const struct clk_init_data) { 173 173 .name = "tcsr_usb2_4_clkref_en", ··· 181 181 }; 182 182 183 183 static struct clk_branch tcsr_usb3_0_clkref_en = { 184 - .halt_reg = 0x20, 184 + .halt_reg = 0x64, 185 185 .halt_check = BRANCH_HALT_DELAY, 186 186 .clkr = { 187 - .enable_reg = 0x20, 187 + .enable_reg = 0x64, 188 188 .enable_mask = BIT(0), 189 189 .hw.init = &(const struct clk_init_data) { 190 190 .name = "tcsr_usb3_0_clkref_en", ··· 198 198 }; 199 199 200 200 static struct clk_branch tcsr_usb3_1_clkref_en = { 201 - .halt_reg = 0x24, 201 + .halt_reg = 0x68, 202 202 .halt_check = BRANCH_HALT_DELAY, 203 203 .clkr = { 204 - .enable_reg = 0x24, 204 + .enable_reg = 0x68, 205 205 .enable_mask = BIT(0), 206 206 .hw.init = &(const struct clk_init_data) { 207 207 .name = "tcsr_usb3_1_clkref_en", ··· 215 215 }; 216 216 217 217 static struct clk_branch tcsr_usb4_1_clkref_en = { 218 - .halt_reg = 0x0, 218 + .halt_reg = 0x44, 219 219 .halt_check = BRANCH_HALT_DELAY, 220 220 .clkr = { 221 - .enable_reg = 0x0, 221 + .enable_reg = 0x44, 222 222 .enable_mask = BIT(0), 223 223 .hw.init = &(const struct clk_init_data) { 224 224 .name = "tcsr_usb4_1_clkref_en", ··· 232 232 }; 233 233 234 234 static struct clk_branch tcsr_usb4_2_clkref_en = { 235 - .halt_reg = 0x18, 235 + .halt_reg = 0x5c, 236 236 .halt_check = BRANCH_HALT_DELAY, 237 237 .clkr = { 238 - .enable_reg = 0x18, 238 + .enable_reg = 0x5c, 239 239 .enable_mask = BIT(0), 240 240 .hw.init = &(const struct clk_init_data) { 241 241 .name = "tcsr_usb4_2_clkref_en", ··· 268 268 .reg_bits = 32, 269 269 .reg_stride = 4, 270 270 .val_bits = 32, 271 - .max_register = 0x44, 271 + .max_register = 0x94, 272 272 .fast_io = true, 273 273 }; 274 274