[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190302134735.4393-5-wsa+renesas@sang-engineering.com>
Date: Sat, 2 Mar 2019 14:47:32 +0100
From: Wolfram Sang <wsa+renesas@...g-engineering.com>
To: linux-i2c@...r.kernel.org
Cc: linux-renesas-soc@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, Keerthy <j-keerthy@...com>,
Peter Rosin <peda@...ntia.se>,
Tony Lindgren <tony@...mide.com>,
Russell King <linux@...linux.org.uk>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Stefan Lengfeld <contact@...fanchrist.eu>,
Phil Reid <preid@...ctromag.com.au>,
Tero Kristo <t-kristo@...com>, linux-omap@...r.kernel.org,
linux-tegra@...r.kernel.org,
Wolfram Sang <wsa+renesas@...g-engineering.com>
Subject: [RFC PATCH v2 4/7] i2c: demux: WIP: handle the new atomic callbacks
If the parent has an atomic callback, we need to translate it the same
way as the non-atomic callback.
Signed-off-by: Wolfram Sang <wsa+renesas@...g-engineering.com>
---
drivers/i2c/muxes/i2c-demux-pinctrl.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 035032e20327..5d00adfbe578 100644
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -99,6 +99,9 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne
/* Now fill out current adapter structure. cur_chan must be up to date */
priv->algo.master_xfer = i2c_demux_master_xfer;
+ /* FIXME: regular muxes need proper handling, too! */
+ if (adap->algo->master_xfer_atomic)
+ priv->algo.master_xfer_atomic = i2c_demux_master_xfer;
priv->algo.functionality = i2c_demux_functionality;
snprintf(priv->cur_adap.name, sizeof(priv->cur_adap.name),
--
2.11.0
Powered by blists - more mailing lists