Commit 765b233a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c fixes from Wolfram Sang:

 - bcm, pxa, rcar: fix void-pointer-to-enum-cast warning

 - new hardware IDs / DT bindings for
    - Intel Nova Lake-S
    - Mobileye
    - Qualcomm SM8750

* tag 'i2c-for-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  dt-bindings: i2c: qcom-cci: Document SM8750 compatible
  i2c: i801: Add support for Intel Nova Lake-S
  dt-bindings: i2c: dw: Add Mobileye I2C controllers
  i2c: rcar: Fix Wvoid-pointer-to-enum-cast warning
  i2c: pxa: Fix Wvoid-pointer-to-enum-cast warning
  i2c: bcm-iproc: Fix Wvoid-pointer-to-enum-cast warning
parents 44087d3d 880977fd

Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ properties: 
              - qcom,sm8450-cci

              - qcom,sm8550-cci

              - qcom,sm8650-cci

              - qcom,sm8750-cci

              - qcom,x1e80100-cci

          - const: qcom,msm8996-cci # CCI v2
@@ -132,6 +133,7 @@ allOf: 
            enum:

              - qcom,kaanapali-cci

              - qcom,qcm2290-cci

              - qcom,sm8750-cci

    then:

      properties:

        clocks:

Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml

+7 −0
Original line number Diff line number Diff line
@@ -34,8 +34,15 @@ properties: 
          - const: snps,designware-i2c

      - description: Baikal-T1 SoC System I2C controller

        const: baikal,bt1-sys-i2c

      - description: Mobileye EyeQ DesignWare I2C controller

        items:

          - enum:

              - mobileye,eyeq7h-i2c

          - const: mobileye,eyeq6lplus-i2c

          - const: snps,designware-i2c

      - items:

          - enum:

              - mobileye,eyeq6lplus-i2c

              - mscc,ocelot-i2c

              - sophgo,sg2044-i2c

              - thead,th1520-i2c

Documentation/i2c/busses/i2c-i801.rst

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ Supported adapters: 
  * Intel Panther Lake (SOC)

  * Intel Wildcat Lake (SOC)

  * Intel Diamond Rapids (SOC)

  * Intel Nova Lake (PCH)



   Datasheets: Publicly available at the Intel website

drivers/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ config I2C_I801 
	    Panther Lake (SOC)

	    Wildcat Lake (SOC)

	    Diamond Rapids (SOC)

	    Nova Lake (PCH)



	  This driver can also be built as a module.  If so, the module

	  will be called i2c-i801.

drivers/i2c/busses/i2c-bcm-iproc.c

+1 −2
Original line number Diff line number Diff line
@@ -1098,8 +1098,7 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, iproc_i2c);

	iproc_i2c->device = &pdev->dev;

	iproc_i2c->type =

		(enum bcm_iproc_i2c_type)of_device_get_match_data(&pdev->dev);

	iproc_i2c->type = (kernel_ulong_t)of_device_get_match_data(&pdev->dev);

	init_completion(&iproc_i2c->done);



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