Commit 1899946a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i3c updates from Alexandre Belloni:
 "Subsystem:
   - transfer pid from boardinfo to device info

  Drivers:
   - dw-i3c-master: stop hardcoding initial speed"

* tag 'i3c/for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  i3c: master: dw: stop hardcoding initial speed
  i3c: transfer pid from boardinfo to device info
parents b1f1382a 510d2358

drivers/i3c/master.c

+1 −0
Original line number Diff line number Diff line
@@ -1438,6 +1438,7 @@ static int i3c_master_early_i3c_dev_add(struct i3c_master_controller *master, 
{

	struct i3c_device_info info = {

		.static_addr = boardinfo->static_addr,

		.pid = boardinfo->pid,

	};

	struct i3c_dev_desc *i3cdev;

	int ret;

drivers/i3c/master/dw-i3c-master.c

+3 −2
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ static int dw_i3c_clk_cfg(struct dw_i3c_master *master) 
	if (hcnt < SCL_I3C_TIMING_CNT_MIN)

		hcnt = SCL_I3C_TIMING_CNT_MIN;



	lcnt = DIV_ROUND_UP(core_rate, I3C_BUS_TYP_I3C_SCL_RATE) - hcnt;

	lcnt = DIV_ROUND_UP(core_rate, master->base.bus.scl_rate.i3c) - hcnt;

	if (lcnt < SCL_I3C_TIMING_CNT_MIN)

		lcnt = SCL_I3C_TIMING_CNT_MIN;
@@ -541,7 +541,8 @@ static int dw_i3c_clk_cfg(struct dw_i3c_master *master) 
	if (!(readl(master->regs + DEVICE_CTRL) & DEV_CTRL_I2C_SLAVE_PRESENT))

		writel(BUS_I3C_MST_FREE(lcnt), master->regs + BUS_FREE_TIMING);



	lcnt = DIV_ROUND_UP(I3C_BUS_TLOW_OD_MIN_NS, core_period);

	lcnt = max_t(u8,

		     DIV_ROUND_UP(I3C_BUS_TLOW_OD_MIN_NS, core_period), lcnt);

	scl_timing = SCL_I3C_TIMING_HCNT(hcnt) | SCL_I3C_TIMING_LCNT(lcnt);

	writel(scl_timing, master->regs + SCL_I3C_OD_TIMING);