Commit 558dc49a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 208d9b65 c4aff1d1

drivers/i2c/busses/i2c-synquacer.c

+5 −6
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ struct synquacer_i2c { 
	int			irq;

	struct device		*dev;

	void __iomem		*base;

	struct clk		*pclk;

	u32			pclkrate;

	u32			speed_khz;

	u32			timeout_ms;
@@ -535,6 +534,7 @@ static const struct i2c_adapter synquacer_i2c_ops = { 
static int synquacer_i2c_probe(struct platform_device *pdev)

{

	struct synquacer_i2c *i2c;

	struct clk *pclk;

	u32 bus_speed;

	int ret;
@@ -550,13 +550,12 @@ static int synquacer_i2c_probe(struct platform_device *pdev) 
	device_property_read_u32(&pdev->dev, "socionext,pclk-rate",

				 &i2c->pclkrate);



	i2c->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");

	if (IS_ERR(i2c->pclk))

		return dev_err_probe(&pdev->dev, PTR_ERR(i2c->pclk),

	pclk = devm_clk_get_enabled(&pdev->dev, "pclk");

	if (IS_ERR(pclk))

		return dev_err_probe(&pdev->dev, PTR_ERR(pclk),

				     "failed to get and enable clock\n");



	dev_dbg(&pdev->dev, "clock source %p\n", i2c->pclk);

	i2c->pclkrate = clk_get_rate(i2c->pclk);

	i2c->pclkrate = clk_get_rate(pclk);



	if (i2c->pclkrate < SYNQUACER_I2C_MIN_CLK_RATE ||

	    i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE)

include/linux/i2c.h

+0 −1
Original line number Diff line number Diff line
@@ -852,7 +852,6 @@ static inline void i2c_mark_adapter_resumed(struct i2c_adapter *adap) 


/* i2c adapter classes (bitmask) */

#define I2C_CLASS_HWMON		(1<<0)	/* lm_sensors, ... */

#define I2C_CLASS_SPD		(1<<7)	/* Memory modules */

/* Warn users that the adapter doesn't support classes anymore */

#define I2C_CLASS_DEPRECATED	(1<<8)