From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Dec 2025 02:25:14 +0000 (+0900)
Subject: Merge tag 'i3c/for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=refs%2Fremotes%2Forigin%2FHEAD;p=linux%2F.git

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

Pull i3c updates from Alexandre Belloni:
 "HDR support has finally been added. mipi-i3c-hci has been reworked and
  Intel Nova Lake-S support has been added.

  Subsystem:
   - Add HDR transfer support

  Drivers:
   - dw: fix bus hang on Agilex5
   - mipi-i3c-hci: Intel Nova Lake-S support, IOMMU support
   - svc: HDR support"

* tag 'i3c/for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux: (28 commits)
  regmap: i3c: switch to use i3c_xfer from i3c_priv_xfer
  net: mctp i3c: switch to use i3c_xfer from i3c_priv_xfer
  hwmon: (lm75): switch to use i3c_xfer from i3c_priv_xfer
  i3c: document i3c_xfers
  i3c: fix I3C_SDR bit number
  i3c: master: svc: Add basic HDR mode support
  i3c: master: svc: Replace bool rnw with union for HDR support
  i3c: Switch to use new i3c_xfer from i3c_priv_xfer
  i3c: Add HDR API support
  i3c: master: add WQ_PERCPU to alloc_workqueue users
  i3c: master: Remove i3c_device_free_ibi from i3c_device_remove
  i3c: mipi-i3c-hci-pci: Set d3cold_delay to 0 for Intel controllers
  i3c: mipi-i3c-hci-pci: Add LTR support for Intel controllers
  i3c: mipi-i3c-hci-pci: Add exit callback
  i3c: mipi-i3c-hci-pci: Change callback parameter
  i3c: mipi-i3c-hci-pci: Allocate a structure for mipi_i3c_hci_pci device information
  i3c: mipi-i3c-hci-pci: Factor out intel_reset()
  i3c: mipi-i3c-hci-pci: Factor out private registers ioremapping
  i3c: mipi-i3c-hci-pci: Constify driver data
  i3c: mipi-i3c-hci-pci: Use readl_poll_timeout()
  ...
---

c2f2b01b74be8b40a2173372bcd770723f87e7b2
diff --cc drivers/base/regmap/regmap-i3c.c
index 6a0f6c826980,4482e64f26eb..863b348704dc
--- a/drivers/base/regmap/regmap-i3c.c
+++ b/drivers/base/regmap/regmap-i3c.c
@@@ -19,7 -18,7 +19,7 @@@ static int regmap_i3c_write(void *conte
  		},
  	};
  
- 	return i3c_device_do_priv_xfers(i3c, xfers, ARRAY_SIZE(xfers));
 -	return i3c_device_do_xfers(i3c, xfers, 1, I3C_SDR);
++	return i3c_device_do_xfers(i3c, xfers, ARRAY_SIZE(xfers), I3C_SDR);
  }
  
  static int regmap_i3c_read(void *context,
@@@ -38,7 -37,7 +38,7 @@@
  	xfers[1].len = val_size;
  	xfers[1].data.in = val;
  
- 	return i3c_device_do_priv_xfers(i3c, xfers, ARRAY_SIZE(xfers));
 -	return i3c_device_do_xfers(i3c, xfers, 2, I3C_SDR);
++	return i3c_device_do_xfers(i3c, xfers, ARRAY_SIZE(xfers), I3C_SDR);
  }
  
  static const struct regmap_bus regmap_i3c = {