Commit b8db3714 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Mostly driver bugfixes, but also a few cleanups which are nice to have
  out of the way"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: rk3x: Restore clock settings at resume time
  i2c: Spelling s/acknowedge/acknowledge/
  i2c: designware: save the preset value of DW_IC_SDA_HOLD
  Documentation: i2c: slave-interface: add note for driver development
  i2c: mux: demux-pinctrl: run properly with multiple instances
  i2c: bcm-kona: fix inconsistent indenting
  i2c: rcar: use proper device with dma_mapping_error
  i2c: sh_mobile: use proper device with dma_mapping_error
  i2c: mux: demux-pinctrl: invalidate properly when switching fails
parents 6905732c cbfff439
...@@ -145,6 +145,11 @@ If you want to add slave support to the bus driver: ...@@ -145,6 +145,11 @@ If you want to add slave support to the bus driver:
* Catch the slave interrupts and send appropriate i2c_slave_events to the backend. * Catch the slave interrupts and send appropriate i2c_slave_events to the backend.
Note that most hardware supports being master _and_ slave on the same bus. So,
if you extend a bus driver, please make sure that the driver supports that as
well. In almost all cases, slave support does not need to disable the master
functionality.
Check the i2c-rcar driver as an example. Check the i2c-rcar driver as an example.
......
...@@ -643,7 +643,7 @@ static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter, ...@@ -643,7 +643,7 @@ static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter,
if (rc < 0) { if (rc < 0) {
dev_err(dev->device, dev_err(dev->device,
"restart cmd failed rc = %d\n", rc); "restart cmd failed rc = %d\n", rc);
goto xfer_send_stop; goto xfer_send_stop;
} }
} }
......
...@@ -767,7 +767,7 @@ static int cdns_i2c_setclk(unsigned long clk_in, struct cdns_i2c *id) ...@@ -767,7 +767,7 @@ static int cdns_i2c_setclk(unsigned long clk_in, struct cdns_i2c *id)
* depending on the scaling direction. * depending on the scaling direction.
* *
* Return: NOTIFY_STOP if the rate change should be aborted, NOTIFY_OK * Return: NOTIFY_STOP if the rate change should be aborted, NOTIFY_OK
* to acknowedge the change, NOTIFY_DONE if the notification is * to acknowledge the change, NOTIFY_DONE if the notification is
* considered irrelevant. * considered irrelevant.
*/ */
static int cdns_i2c_clk_notifier_cb(struct notifier_block *nb, unsigned long static int cdns_i2c_clk_notifier_cb(struct notifier_block *nb, unsigned long
......
...@@ -367,13 +367,17 @@ int i2c_dw_init(struct dw_i2c_dev *dev) ...@@ -367,13 +367,17 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
dev_dbg(dev->dev, "Fast-mode HCNT:LCNT = %d:%d\n", hcnt, lcnt); dev_dbg(dev->dev, "Fast-mode HCNT:LCNT = %d:%d\n", hcnt, lcnt);
/* Configure SDA Hold Time if required */ /* Configure SDA Hold Time if required */
if (dev->sda_hold_time) { reg = dw_readl(dev, DW_IC_COMP_VERSION);
reg = dw_readl(dev, DW_IC_COMP_VERSION); if (reg >= DW_IC_SDA_HOLD_MIN_VERS) {
if (reg >= DW_IC_SDA_HOLD_MIN_VERS) if (dev->sda_hold_time) {
dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD); dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD);
else } else {
dev_warn(dev->dev, /* Keep previous hold time setting if no one set it */
"Hardware too old to adjust SDA hold time."); dev->sda_hold_time = dw_readl(dev, DW_IC_SDA_HOLD);
}
} else {
dev_warn(dev->dev,
"Hardware too old to adjust SDA hold time.\n");
} }
/* Configure Tx/Rx FIFO threshold levels */ /* Configure Tx/Rx FIFO threshold levels */
......
...@@ -378,7 +378,7 @@ static void rcar_i2c_dma(struct rcar_i2c_priv *priv) ...@@ -378,7 +378,7 @@ static void rcar_i2c_dma(struct rcar_i2c_priv *priv)
} }
dma_addr = dma_map_single(chan->device->dev, buf, len, dir); dma_addr = dma_map_single(chan->device->dev, buf, len, dir);
if (dma_mapping_error(dev, dma_addr)) { if (dma_mapping_error(chan->device->dev, dma_addr)) {
dev_dbg(dev, "dma map failed, using PIO\n"); dev_dbg(dev, "dma map failed, using PIO\n");
return; return;
} }
......
...@@ -918,7 +918,7 @@ static void rk3x_i2c_adapt_div(struct rk3x_i2c *i2c, unsigned long clk_rate) ...@@ -918,7 +918,7 @@ static void rk3x_i2c_adapt_div(struct rk3x_i2c *i2c, unsigned long clk_rate)
* Code adapted from i2c-cadence.c. * Code adapted from i2c-cadence.c.
* *
* Return: NOTIFY_STOP if the rate change should be aborted, NOTIFY_OK * Return: NOTIFY_STOP if the rate change should be aborted, NOTIFY_OK
* to acknowedge the change, NOTIFY_DONE if the notification is * to acknowledge the change, NOTIFY_DONE if the notification is
* considered irrelevant. * considered irrelevant.
*/ */
static int rk3x_i2c_clk_notifier_cb(struct notifier_block *nb, unsigned long static int rk3x_i2c_clk_notifier_cb(struct notifier_block *nb, unsigned long
...@@ -1111,6 +1111,15 @@ static int rk3x_i2c_xfer(struct i2c_adapter *adap, ...@@ -1111,6 +1111,15 @@ static int rk3x_i2c_xfer(struct i2c_adapter *adap,
return ret < 0 ? ret : num; return ret < 0 ? ret : num;
} }
static __maybe_unused int rk3x_i2c_resume(struct device *dev)
{
struct rk3x_i2c *i2c = dev_get_drvdata(dev);
rk3x_i2c_adapt_div(i2c, clk_get_rate(i2c->clk));
return 0;
}
static u32 rk3x_i2c_func(struct i2c_adapter *adap) static u32 rk3x_i2c_func(struct i2c_adapter *adap)
{ {
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING; return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING;
...@@ -1334,12 +1343,15 @@ static int rk3x_i2c_remove(struct platform_device *pdev) ...@@ -1334,12 +1343,15 @@ static int rk3x_i2c_remove(struct platform_device *pdev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(rk3x_i2c_pm_ops, NULL, rk3x_i2c_resume);
static struct platform_driver rk3x_i2c_driver = { static struct platform_driver rk3x_i2c_driver = {
.probe = rk3x_i2c_probe, .probe = rk3x_i2c_probe,
.remove = rk3x_i2c_remove, .remove = rk3x_i2c_remove,
.driver = { .driver = {
.name = "rk3x-i2c", .name = "rk3x-i2c",
.of_match_table = rk3x_i2c_match, .of_match_table = rk3x_i2c_match,
.pm = &rk3x_i2c_pm_ops,
}, },
}; };
......
...@@ -610,7 +610,7 @@ static void sh_mobile_i2c_xfer_dma(struct sh_mobile_i2c_data *pd) ...@@ -610,7 +610,7 @@ static void sh_mobile_i2c_xfer_dma(struct sh_mobile_i2c_data *pd)
return; return;
dma_addr = dma_map_single(chan->device->dev, pd->msg->buf, pd->msg->len, dir); dma_addr = dma_map_single(chan->device->dev, pd->msg->buf, pd->msg->len, dir);
if (dma_mapping_error(pd->dev, dma_addr)) { if (dma_mapping_error(chan->device->dev, dma_addr)) {
dev_dbg(pd->dev, "dma map failed, using PIO\n"); dev_dbg(pd->dev, "dma map failed, using PIO\n");
return; return;
} }
......
...@@ -37,8 +37,6 @@ struct i2c_demux_pinctrl_priv { ...@@ -37,8 +37,6 @@ struct i2c_demux_pinctrl_priv {
struct i2c_demux_pinctrl_chan chan[]; struct i2c_demux_pinctrl_chan chan[];
}; };
static struct property status_okay = { .name = "status", .length = 3, .value = "ok" };
static int i2c_demux_master_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) static int i2c_demux_master_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
{ {
struct i2c_demux_pinctrl_priv *priv = adap->algo_data; struct i2c_demux_pinctrl_priv *priv = adap->algo_data;
...@@ -107,6 +105,7 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne ...@@ -107,6 +105,7 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne
of_changeset_revert(&priv->chan[new_chan].chgset); of_changeset_revert(&priv->chan[new_chan].chgset);
err: err:
dev_err(priv->dev, "failed to setup demux-adapter %d (%d)\n", new_chan, ret); dev_err(priv->dev, "failed to setup demux-adapter %d (%d)\n", new_chan, ret);
priv->cur_chan = -EINVAL;
return ret; return ret;
} }
...@@ -192,6 +191,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) ...@@ -192,6 +191,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct i2c_demux_pinctrl_priv *priv; struct i2c_demux_pinctrl_priv *priv;
struct property *props;
int num_chan, i, j, err; int num_chan, i, j, err;
num_chan = of_count_phandle_with_args(np, "i2c-parent", NULL); num_chan = of_count_phandle_with_args(np, "i2c-parent", NULL);
...@@ -202,7 +202,10 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) ...@@ -202,7 +202,10 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
priv = devm_kzalloc(&pdev->dev, sizeof(*priv) priv = devm_kzalloc(&pdev->dev, sizeof(*priv)
+ num_chan * sizeof(struct i2c_demux_pinctrl_chan), GFP_KERNEL); + num_chan * sizeof(struct i2c_demux_pinctrl_chan), GFP_KERNEL);
if (!priv)
props = devm_kcalloc(&pdev->dev, num_chan, sizeof(*props), GFP_KERNEL);
if (!priv || !props)
return -ENOMEM; return -ENOMEM;
err = of_property_read_string(np, "i2c-bus-name", &priv->bus_name); err = of_property_read_string(np, "i2c-bus-name", &priv->bus_name);
...@@ -220,8 +223,12 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) ...@@ -220,8 +223,12 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
} }
priv->chan[i].parent_np = adap_np; priv->chan[i].parent_np = adap_np;
props[i].name = devm_kstrdup(&pdev->dev, "status", GFP_KERNEL);
props[i].value = devm_kstrdup(&pdev->dev, "ok", GFP_KERNEL);
props[i].length = 3;
of_changeset_init(&priv->chan[i].chgset); of_changeset_init(&priv->chan[i].chgset);
of_changeset_update_property(&priv->chan[i].chgset, adap_np, &status_okay); of_changeset_update_property(&priv->chan[i].chgset, adap_np, &props[i]);
} }
priv->num_chan = num_chan; priv->num_chan = num_chan;
......
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