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

clk: clk-s2mps11: Refactor for including support for other MFD clocks

The clocks in S2MPS11 and S5M8767 are managed in the same way, baring
a difference in the register offset. It would be better to update
existing S2MPS11 driver to support the clocks in S5M8767, rather than
creating an almost duplicate driver altogether.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Reviewed-by: Yadwinder Singh Brar <yadi.brar@samsung.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

authored by

Tushar Behera and committed by
Mike Turquette
64d64c35 c7bb4fc1

+16 -4
+16 -4
drivers/clk/clk-s2mps11.c
··· 48 48 struct clk_lookup *lookup; 49 49 u32 mask; 50 50 bool enabled; 51 + unsigned int reg; 51 52 }; 52 53 53 54 static struct s2mps11_clk *to_s2mps11_clk(struct clk_hw *hw) ··· 62 61 int ret; 63 62 64 63 ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, 65 - S2MPS11_REG_RTC_CTRL, 64 + s2mps11->reg, 66 65 s2mps11->mask, s2mps11->mask); 67 66 if (!ret) 68 67 s2mps11->enabled = true; ··· 75 74 struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw); 76 75 int ret; 77 76 78 - ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, S2MPS11_REG_RTC_CTRL, 77 + ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, s2mps11->reg, 79 78 s2mps11->mask, ~s2mps11->mask); 80 79 81 80 if (!ret) ··· 156 155 struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent); 157 156 struct s2mps11_clk *s2mps11_clks, *s2mps11_clk; 158 157 struct device_node *clk_np = NULL; 158 + unsigned int s2mps11_reg; 159 159 int i, ret = 0; 160 160 u32 val; 161 161 ··· 171 169 if (IS_ERR(clk_np)) 172 170 return PTR_ERR(clk_np); 173 171 172 + switch(platform_get_device_id(pdev)->driver_data) { 173 + case S2MPS11X: 174 + s2mps11_reg = S2MPS11_REG_RTC_CTRL; 175 + break; 176 + default: 177 + dev_err(&pdev->dev, "Invalid device type\n"); 178 + return -EINVAL; 179 + }; 180 + 174 181 for (i = 0; i < S2MPS11_CLKS_NUM; i++, s2mps11_clk++) { 175 182 s2mps11_clk->iodev = iodev; 176 183 s2mps11_clk->hw.init = &s2mps11_clks_init[i]; 177 184 s2mps11_clk->mask = 1 << i; 185 + s2mps11_clk->reg = s2mps11_reg; 178 186 179 187 ret = regmap_read(s2mps11_clk->iodev->regmap_pmic, 180 - S2MPS11_REG_RTC_CTRL, &val); 188 + s2mps11_clk->reg, &val); 181 189 if (ret < 0) 182 190 goto err_reg; 183 191 ··· 253 241 } 254 242 255 243 static const struct platform_device_id s2mps11_clk_id[] = { 256 - { "s2mps11-clk", 0}, 244 + { "s2mps11-clk", S2MPS11X}, 257 245 { }, 258 246 }; 259 247 MODULE_DEVICE_TABLE(platform, s2mps11_clk_id);