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

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

Pull i2c fixes from Wolfram Sang:
 "A bunch of driver fixes with a tiny bit of new IDs"

* tag 'i2c-for-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: rk3x: fix a bunch of kernel-doc warnings
  i2c: axxia: use 'struct' for kernel-doc notation
  dt-bindings: i2c: renesas,rzv2m: Fix SoC specific string
  i2c: mxs: suppress probe-deferral error message
  i2c: designware-pci: Add new PCI IDs for AMD NAVI GPU
  i2c: designware: Fix unbalanced suspended flag
  i2c: designware: use casting of u64 in clock multiplication to avoid overflow
parents 37d0be6a 0582d984

Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ properties: 
  compatible:

    items:

      - enum:

          - renesas,i2c-r9a09g011  # RZ/V2M

          - renesas,r9a09g011-i2c  # RZ/V2M

      - const: renesas,rzv2m-i2c



  reg:
@@ -66,7 +66,7 @@ examples: 
    #include <dt-bindings/interrupt-controller/arm-gic.h>



    i2c0: i2c@a4030000 {

        compatible = "renesas,i2c-r9a09g011", "renesas,rzv2m-i2c";

        compatible = "renesas,r9a09g011-i2c", "renesas,rzv2m-i2c";

        reg = <0xa4030000 0x80>;

        interrupts = <GIC_SPI 232 IRQ_TYPE_EDGE_RISING>,

                     <GIC_SPI 236 IRQ_TYPE_EDGE_RISING>;

drivers/i2c/busses/i2c-axxia.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 
#define SDA_HOLD_TIME		0x90



/**

 * axxia_i2c_dev - I2C device context

 * struct axxia_i2c_dev - I2C device context

 * @base: pointer to register struct

 * @msg: pointer to current message

 * @msg_r: pointer to current read message (sequence transfer)

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

+6 −3
Original line number Diff line number Diff line
@@ -351,7 +351,8 @@ u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset) 
		 *

		 * If your hardware is free from tHD;STA issue, try this one.

		 */

		return DIV_ROUND_CLOSEST(ic_clk * tSYMBOL, MICRO) - 8 + offset;

		return DIV_ROUND_CLOSEST_ULL((u64)ic_clk * tSYMBOL, MICRO) -

		       8 + offset;

	else

		/*

		 * Conditional expression:
@@ -367,7 +368,8 @@ u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset) 
		 * The reason why we need to take into account "tf" here,

		 * is the same as described in i2c_dw_scl_lcnt().

		 */

		return DIV_ROUND_CLOSEST(ic_clk * (tSYMBOL + tf), MICRO) - 3 + offset;

		return DIV_ROUND_CLOSEST_ULL((u64)ic_clk * (tSYMBOL + tf), MICRO) -

		       3 + offset;

}



u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset)
@@ -383,7 +385,8 @@ u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset) 
	 * account the fall time of SCL signal (tf).  Default tf value

	 * should be 0.3 us, for safety.

	 */

	return DIV_ROUND_CLOSEST(ic_clk * (tLOW + tf), MICRO) - 1 + offset;

	return DIV_ROUND_CLOSEST_ULL((u64)ic_clk * (tLOW + tf), MICRO) -

	       1 + offset;

}



int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev)

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

+2 −0
Original line number Diff line number Diff line
@@ -396,6 +396,8 @@ static const struct pci_device_id i2_designware_pci_ids[] = { 
	{ PCI_VDEVICE(ATI,  0x73a4), navi_amd },

	{ PCI_VDEVICE(ATI,  0x73e4), navi_amd },

	{ PCI_VDEVICE(ATI,  0x73c4), navi_amd },

	{ PCI_VDEVICE(ATI,  0x7444), navi_amd },

	{ PCI_VDEVICE(ATI,  0x7464), navi_amd },

	{ 0,}

};

MODULE_DEVICE_TABLE(pci, i2_designware_pci_ids);

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

+2 −18
Original line number Diff line number Diff line
@@ -351,13 +351,11 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 


	if (dev->flags & ACCESS_NO_IRQ_SUSPEND) {

		dev_pm_set_driver_flags(&pdev->dev,

					DPM_FLAG_SMART_PREPARE |

					DPM_FLAG_MAY_SKIP_RESUME);

					DPM_FLAG_SMART_PREPARE);

	} else {

		dev_pm_set_driver_flags(&pdev->dev,

					DPM_FLAG_SMART_PREPARE |

					DPM_FLAG_SMART_SUSPEND |

					DPM_FLAG_MAY_SKIP_RESUME);

					DPM_FLAG_SMART_SUSPEND);

	}



	device_enable_async_suspend(&pdev->dev);
@@ -419,21 +417,8 @@ static int dw_i2c_plat_prepare(struct device *dev) 
	 */

	return !has_acpi_companion(dev);

}



static void dw_i2c_plat_complete(struct device *dev)

{

	/*

	 * The device can only be in runtime suspend at this point if it has not

	 * been resumed throughout the ending system suspend/resume cycle, so if

	 * the platform firmware might mess up with it, request the runtime PM

	 * framework to resume it.

	 */

	if (pm_runtime_suspended(dev) && pm_resume_via_firmware())

		pm_request_resume(dev);

}

#else

#define dw_i2c_plat_prepare	NULL

#define dw_i2c_plat_complete	NULL

#endif



#ifdef CONFIG_PM
@@ -483,7 +468,6 @@ static int __maybe_unused dw_i2c_plat_resume(struct device *dev) 


static const struct dev_pm_ops dw_i2c_dev_pm_ops = {

	.prepare = dw_i2c_plat_prepare,

	.complete = dw_i2c_plat_complete,

	SET_LATE_SYSTEM_SLEEP_PM_OPS(dw_i2c_plat_suspend, dw_i2c_plat_resume)

	SET_RUNTIME_PM_OPS(dw_i2c_plat_runtime_suspend, dw_i2c_plat_runtime_resume, NULL)

};