Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'i2c-for-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"This should have been my second pull request during the merge window
but one dependency in the drm subsystem fell through the cracks and
was only applied for rc2.
Now we can finally remove I2C_CLASS_SPD"
* tag 'i2c-for-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: Remove I2C_CLASS_SPD
i2c: synquacer: Remove a clk reference from struct synquacer_i2c
+5
-7
+5
-6
drivers/i2c/busses/i2c-synquacer.c
+5
-6
drivers/i2c/busses/i2c-synquacer.c
···
138
138
int irq;
139
139
struct device *dev;
140
140
void __iomem *base;
141
-
struct clk *pclk;
142
141
u32 pclkrate;
143
142
u32 speed_khz;
144
143
u32 timeout_ms;
···
534
535
static int synquacer_i2c_probe(struct platform_device *pdev)
535
536
{
536
537
struct synquacer_i2c *i2c;
538
+
struct clk *pclk;
537
539
u32 bus_speed;
538
540
int ret;
539
541
···
550
550
device_property_read_u32(&pdev->dev, "socionext,pclk-rate",
551
551
&i2c->pclkrate);
552
552
553
-
i2c->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
554
-
if (IS_ERR(i2c->pclk))
555
-
return dev_err_probe(&pdev->dev, PTR_ERR(i2c->pclk),
553
+
pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
554
+
if (IS_ERR(pclk))
555
+
return dev_err_probe(&pdev->dev, PTR_ERR(pclk),
556
556
"failed to get and enable clock\n");
557
557
558
-
dev_dbg(&pdev->dev, "clock source %p\n", i2c->pclk);
559
-
i2c->pclkrate = clk_get_rate(i2c->pclk);
558
+
i2c->pclkrate = clk_get_rate(pclk);
560
559
561
560
if (i2c->pclkrate < SYNQUACER_I2C_MIN_CLK_RATE ||
562
561
i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE)
-1
include/linux/i2c.h
-1
include/linux/i2c.h