Commit a5c6a1f0 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 small collection of remaining API conversion patches (all acked)
   which allow to finally remove the deprecated API

 - some documentation fixes and a MAINTAINERS addition

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  MAINTAINERS: Add robert and myself as qcom i2c cci maintainers
  i2c: smbus: Fix spelling mistake in the comments
  Documentation/i2c: SMBus start signal is S not A
  i2c: remove deprecated i2c_new_device API
  Documentation: media: convert to use i2c_new_client_device()
  video: backlight: tosa_lcd: convert to use i2c_new_client_device()
  x86/platform/intel-mid: convert to use i2c_new_client_device()
  drm: encoder_slave: use new I2C API
  drm: encoder_slave: fix refcouting error for modules
parents 8b6ddd10 28f9f8fb

Documentation/driver-api/media/v4l2-subdev.rst

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ The bridge driver also has some helper functions it can use: 
					"module_foo", "chipid", 0x36, NULL);



This loads the given module (can be ``NULL`` if no module needs to be loaded)

and calls :c:func:`i2c_new_device` with the given ``i2c_adapter`` and

and calls :c:func:`i2c_new_client_device` with the given ``i2c_adapter`` and

chip/address arguments. If all goes well, then it registers the subdev with

the v4l2_device.

Documentation/i2c/smbus-protocol.rst

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ SMBus Quick Command 


This sends a single bit to the device, at the place of the Rd/Wr bit::



  A Addr Rd/Wr [A] P

  S Addr Rd/Wr [A] P



Functionality flag: I2C_FUNC_SMBUS_QUICK

Documentation/userspace-api/media/conf_nitpick.py

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ nitpick_ignore = [ 
    ("c:func", "copy_to_user"),

    ("c:func", "determine_valid_ioctls"),

    ("c:func", "ERR_PTR"),

    ("c:func", "i2c_new_device"),

    ("c:func", "i2c_new_client_device"),

    ("c:func", "ioctl"),

    ("c:func", "IS_ERR"),

    ("c:func", "KERNEL_VERSION"),

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -14196,6 +14196,15 @@ L: dmaengine@vger.kernel.org 
S:	Supported

F:	drivers/dma/qcom/hidma*









QUALCOMM I2C CCI DRIVER









M:	Loic Poulain <loic.poulain@linaro.org>









M:	Robert Foss <robert.foss@linaro.org>









L:	linux-i2c@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt









F:	drivers/i2c/busses/i2c-qcom-cci.c

















QUALCOMM IOMMU









M:	Rob Clark <robdclark@gmail.com>









L:	iommu@lists.linux-foundation.org
































arch/x86/platform/intel-mid/sfi.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -287,8 +287,8 @@ void intel_scu_devices_create(void)

















		adapter = i2c_get_adapter(i2c_bus[i]);









		if (adapter) {









			client = i2c_new_device(adapter, i2c_devs[i]);









			if (!client)









			client = i2c_new_client_device(adapter, i2c_devs[i]);









			if (IS_ERR(client))









				pr_err("can't create i2c device %s\n",









					i2c_devs[i]->type);









		} else