mediatek: cleanly backport and add fix for I2C driver
[openwrt/openwrt.git] / target / linux / mediatek / patches-5.15 / 855-pending-i2c-mt65xx-add-additional-clocks.patch
1 From 94bf61df9201195d6d8ce82e299fb231b31fbaae Mon Sep 17 00:00:00 2001
2 From: Daniel Golle <daniel@makrotopia.org>
3 Date: Fri, 26 May 2023 10:29:45 +0100
4 Subject: [PATCH] i2c: mt65xx: add additional clocks
5
6 On MT7981 additional clocks are required when accessing I2C registers.
7 Add MCK and PCK optional clocks to i2c-mt65xx driver so we don't have
8 to always have them enabled, but really only if I2C is used.
9
10 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
11 ---
12 drivers/i2c/busses/i2c-mt65xx.c | 14 +++++++++++++-
13 1 file changed, 13 insertions(+), 1 deletion(-)
14
15 --- a/drivers/i2c/busses/i2c-mt65xx.c
16 +++ b/drivers/i2c/busses/i2c-mt65xx.c
17 @@ -93,6 +93,8 @@
18 * @I2C_MT65XX_CLK_DMA: DMA clock for i2c via DMA
19 * @I2C_MT65XX_CLK_PMIC: PMIC clock for i2c from PMIC
20 * @I2C_MT65XX_CLK_ARB: Arbitrator clock for i2c
21 + * @I2C_MT65XX_CLK_MCK: MCK clock for i2c
22 + * @I2C_MT65XX_CLK_PCK: PCK clock for i2c
23 * @I2C_MT65XX_CLK_MAX: Number of supported clocks
24 */
25 enum i2c_mt65xx_clks {
26 @@ -100,11 +102,13 @@ enum i2c_mt65xx_clks {
27 I2C_MT65XX_CLK_DMA,
28 I2C_MT65XX_CLK_PMIC,
29 I2C_MT65XX_CLK_ARB,
30 + I2C_MT65XX_CLK_MCK,
31 + I2C_MT65XX_CLK_PCK,
32 I2C_MT65XX_CLK_MAX
33 };
34
35 static const char * const i2c_mt65xx_clk_ids[I2C_MT65XX_CLK_MAX] = {
36 - "main", "dma", "pmic", "arb"
37 + "main", "dma", "pmic", "arb", "mck", "pck"
38 };
39
40 enum DMA_REGS_OFFSET {
41 @@ -1444,6 +1448,14 @@ static int mtk_i2c_probe(struct platform
42 if (IS_ERR(i2c->clocks[I2C_MT65XX_CLK_ARB].clk))
43 return PTR_ERR(i2c->clocks[I2C_MT65XX_CLK_ARB].clk);
44
45 + i2c->clocks[I2C_MT65XX_CLK_MCK].clk = devm_clk_get_optional(&pdev->dev, "mck");
46 + if (IS_ERR(i2c->clocks[I2C_MT65XX_CLK_MCK].clk))
47 + return PTR_ERR(i2c->clocks[I2C_MT65XX_CLK_MCK].clk);
48 +
49 + i2c->clocks[I2C_MT65XX_CLK_PCK].clk = devm_clk_get_optional(&pdev->dev, "pck");
50 + if (IS_ERR(i2c->clocks[I2C_MT65XX_CLK_PCK].clk))
51 + return PTR_ERR(i2c->clocks[I2C_MT65XX_CLK_PCK].clk);
52 +
53 if (i2c->have_pmic) {
54 i2c->clocks[I2C_MT65XX_CLK_PMIC].clk = devm_clk_get(&pdev->dev, "pmic");
55 if (IS_ERR(i2c->clocks[I2C_MT65XX_CLK_PMIC].clk)) {