Commit e3b2e2c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "Nothing fancy. Two driver and one DT binding fix"

* tag 'i2c-for-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: imx-lpi2c: fix type char overflow issue when calculating the clock cycle
  i2c: qup: Add missing unwind goto in qup_i2c_probe()
  dt-bindings: i2c: opencores: Add missing type for "regstep"
parents 547cc9be e69b9bc1

Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ properties: 
    default: 0



  regstep:

    $ref: /schemas/types.yaml#/definitions/uint32

    description: |

      deprecated, use reg-shift above

    deprecated: true

drivers/i2c/busses/i2c-imx-lpi2c.c

+2 −2
Original line number Diff line number Diff line
@@ -201,8 +201,8 @@ static void lpi2c_imx_stop(struct lpi2c_imx_struct *lpi2c_imx) 
/* CLKLO = I2C_CLK_RATIO * CLKHI, SETHOLD = CLKHI, DATAVD = CLKHI/2 */

static int lpi2c_imx_config(struct lpi2c_imx_struct *lpi2c_imx)

{

	u8 prescale, filt, sethold, clkhi, clklo, datavd;

	unsigned int clk_rate, clk_cycle;

	u8 prescale, filt, sethold, datavd;

	unsigned int clk_rate, clk_cycle, clkhi, clklo;

	enum lpi2c_imx_pincfg pincfg;

	unsigned int temp;

drivers/i2c/busses/i2c-qup.c

+14 −7
Original line number Diff line number Diff line
@@ -1752,16 +1752,21 @@ static int qup_i2c_probe(struct platform_device *pdev) 
	if (!clk_freq || clk_freq > I2C_MAX_FAST_MODE_PLUS_FREQ) {

		dev_err(qup->dev, "clock frequency not supported %d\n",

			clk_freq);

		return -EINVAL;

		ret = -EINVAL;

		goto fail_dma;

	}



	qup->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(qup->base))

		return PTR_ERR(qup->base);

	if (IS_ERR(qup->base)) {

		ret = PTR_ERR(qup->base);

		goto fail_dma;

	}



	qup->irq = platform_get_irq(pdev, 0);

	if (qup->irq < 0)

		return qup->irq;

	if (qup->irq < 0) {

		ret = qup->irq;

		goto fail_dma;

	}



	if (has_acpi_companion(qup->dev)) {

		ret = device_property_read_u32(qup->dev,
@@ -1775,13 +1780,15 @@ static int qup_i2c_probe(struct platform_device *pdev) 
		qup->clk = devm_clk_get(qup->dev, "core");

		if (IS_ERR(qup->clk)) {

			dev_err(qup->dev, "Could not get core clock\n");

			return PTR_ERR(qup->clk);

			ret = PTR_ERR(qup->clk);

			goto fail_dma;

		}



		qup->pclk = devm_clk_get(qup->dev, "iface");

		if (IS_ERR(qup->pclk)) {

			dev_err(qup->dev, "Could not get iface clock\n");

			return PTR_ERR(qup->pclk);

			ret = PTR_ERR(qup->pclk);

			goto fail_dma;

		}

		qup_i2c_enable_clocks(qup);

		src_clk_freq = clk_get_rate(qup->clk);