Commit 8b4fe58d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i3c fixes from Boris Brezillon:

 - Fix the error check on master->sysclk val in the Cadence driver

 - Fix reattach implementation in the Designware driver

* tag 'i3c/fixes-for-5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  i3c: master: dw-i3c-master: fix i3c_attach/reattach
  i3c: master: Fix an error checking typo in 'cdns_i3c_master_probe()'
parents 3cdf680e f29fd331
...@@ -901,9 +901,6 @@ static int dw_i3c_master_reattach_i3c_dev(struct i3c_dev_desc *dev, ...@@ -901,9 +901,6 @@ static int dw_i3c_master_reattach_i3c_dev(struct i3c_dev_desc *dev,
master->regs + master->regs +
DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index)); DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));
if (!old_dyn_addr)
return 0;
master->addrs[data->index] = dev->info.dyn_addr; master->addrs[data->index] = dev->info.dyn_addr;
return 0; return 0;
...@@ -925,11 +922,11 @@ static int dw_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev) ...@@ -925,11 +922,11 @@ static int dw_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev)
return -ENOMEM; return -ENOMEM;
data->index = pos; data->index = pos;
master->addrs[pos] = dev->info.dyn_addr; master->addrs[pos] = dev->info.dyn_addr ? : dev->info.static_addr;
master->free_pos &= ~BIT(pos); master->free_pos &= ~BIT(pos);
i3c_dev_set_master_data(dev, data); i3c_dev_set_master_data(dev, data);
writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(dev->info.dyn_addr), writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(master->addrs[pos]),
master->regs + master->regs +
DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index)); DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));
......
...@@ -1556,8 +1556,8 @@ static int cdns_i3c_master_probe(struct platform_device *pdev) ...@@ -1556,8 +1556,8 @@ static int cdns_i3c_master_probe(struct platform_device *pdev)
return PTR_ERR(master->pclk); return PTR_ERR(master->pclk);
master->sysclk = devm_clk_get(&pdev->dev, "sysclk"); master->sysclk = devm_clk_get(&pdev->dev, "sysclk");
if (IS_ERR(master->pclk)) if (IS_ERR(master->sysclk))
return PTR_ERR(master->pclk); return PTR_ERR(master->sysclk);
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) if (irq < 0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment