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

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

Pull i2c fixes from Wolfram Sang:

 - subsystem: convert drivers to use recent callbacks of struct
   i2c_algorithm A typical after-rc1 cleanup, which I couldn't send in
   time for rc2

 - tegra: fix YAML conversion of device tree bindings

 - k1: re-add a check which got lost during upstreaming

* tag 'i2c-for-6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: k1: check for transfer error
  i2c: use inclusive callbacks in struct i2c_algorithm
  dt-bindings: i2c: nvidia,tegra20-i2c: Specify the required properties
parents 5c00eca9 a6c23dac

Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml

+23 −1
Original line number Diff line number Diff line
@@ -97,7 +97,10 @@ properties: 


  resets:

    items:

      - description: module reset

      - description:

          Module reset. This property is optional for controllers in Tegra194,

          Tegra234 etc where an internal software reset is available as an

          alternative.



  reset-names:

    items:
@@ -116,6 +119,13 @@ properties: 
      - const: rx

      - const: tx



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



allOf:

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

  - if:
@@ -169,6 +179,18 @@ allOf: 
      properties:

        power-domains: false



  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - nvidia,tegra194-i2c

    then:

      required:

        - resets

        - reset-names



unevaluatedProperties: false



examples:

drivers/i2c/algos/i2c-algo-bit.c

+2 −2
Original line number Diff line number Diff line
@@ -619,8 +619,8 @@ static u32 bit_func(struct i2c_adapter *adap) 
/* -----exported algorithm data: -------------------------------------	*/



const struct i2c_algorithm i2c_bit_algo = {

	.master_xfer = bit_xfer,

	.master_xfer_atomic = bit_xfer_atomic,

	.xfer = bit_xfer,

	.xfer_atomic = bit_xfer_atomic,

	.functionality = bit_func,

};

EXPORT_SYMBOL(i2c_bit_algo);

drivers/i2c/algos/i2c-algo-pca.c

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static u32 pca_func(struct i2c_adapter *adap) 
}



static const struct i2c_algorithm pca_algo = {

	.master_xfer	= pca_xfer,

	.xfer = pca_xfer,

	.functionality = pca_func,

};

drivers/i2c/algos/i2c-algo-pcf.c

+2 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static u32 pcf_func(struct i2c_adapter *adap) 


/* exported algorithm data: */

static const struct i2c_algorithm pcf_algo = {

	.master_xfer	= pcf_xfer,

	.xfer = pcf_xfer,

	.functionality = pcf_func,

};

drivers/i2c/busses/i2c-amd-mp2-plat.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static u32 i2c_amd_func(struct i2c_adapter *a) 
}



static const struct i2c_algorithm i2c_amd_algorithm = {

	.master_xfer = i2c_amd_xfer,

	.xfer = i2c_amd_xfer,

	.functionality = i2c_amd_func,

};