Commit 12a0cf72 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "A mixture of driver and documentation bugfixes for I2C"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: imx: mention Oleksij as maintainer of the binding docs
  i2c: exynos5: correct top kerneldoc
  i2c: designware: Adjust bus_freq_hz when refuse high speed mode set
  i2c: hix5hd2: use the correct HiSilicon copyright
  i2c: gpio: update email address in binding docs
  i2c: imx: drop me as maintainer of binding docs
  i2c: stm32f4: Mundane typo fix
  I2C: JZ4780: Fix bug for Ingenic X1000.
  i2c: turn recovery error on init to debug
parents d4961772 df8a39f2

Documentation/devicetree/bindings/i2c/i2c-gpio.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Bindings for GPIO bitbanged I2C



maintainers:

  - Wolfram Sang <wolfram@the-dreams.de>

  - Wolfram Sang <wsa@kernel.org>



allOf:

  - $ref: /schemas/i2c/i2c-controller.yaml#

Documentation/devicetree/bindings/i2c/i2c-imx.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Freescale Inter IC (I2C) and High Speed Inter IC (HS-I2C) for i.MX



maintainers:

  - Wolfram Sang <wolfram@the-dreams.de>

  - Oleksij Rempel <o.rempel@pengutronix.de>



allOf:

  - $ref: /schemas/i2c/i2c-controller.yaml#

drivers/i2c/busses/i2c-designware-master.c

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) 
		if ((comp_param1 & DW_IC_COMP_PARAM_1_SPEED_MODE_MASK)

			!= DW_IC_COMP_PARAM_1_SPEED_MODE_HIGH) {

			dev_err(dev->dev, "High Speed not supported!\n");

			t->bus_freq_hz = I2C_MAX_FAST_MODE_FREQ;

			dev->master_cfg &= ~DW_IC_CON_SPEED_MASK;

			dev->master_cfg |= DW_IC_CON_SPEED_FAST;

			dev->hs_hcnt = 0;

drivers/i2c/busses/i2c-exynos5.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/**

/*

 * i2c-exynos5.c - Samsung Exynos5 I2C Controller Driver

 *

 * Copyright (C) 2013 Samsung Electronics Co., Ltd.

drivers/i2c/busses/i2c-hix5hd2.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Copyright (c) 2014 Linaro Ltd.

 * Copyright (c) 2014 Hisilicon Limited.

 * Copyright (c) 2014 HiSilicon Limited.

 *

 * Now only support 7 bit address.

 */