On 08/06/2020 21:43, Jonathan Marek wrote:
Adds support for qcom soundwire devices with memory mapped IO registers.
Signed-off-by: Jonathan Marek <jonathan@xxxxxxxx>
---
In general patch itself looks pretty trivial, but I would like to see what 1.5.1 controller provides in terms of error reporting of SoundWire slave register reads/writes. On WCD based controller we did not have a mechanism to report things like if the read is ignored or not. I was hoping that this version of controller would be able to report that.
I will be nice to those patches if that is something which is supported in this version.
--srini
 drivers/soundwire/qcom.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index f38d1fd3679f..628747df1c75 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -90,6 +90,7 @@ struct qcom_swrm_ctrl {
ÂÂÂÂÂ struct sdw_bus bus;
ÂÂÂÂÂ struct device *dev;
ÂÂÂÂÂ struct regmap *regmap;
+ÂÂÂ void __iomem *mmio;
ÂÂÂÂÂ struct completion *comp;
ÂÂÂÂÂ struct work_struct slave_work;
ÂÂÂÂÂ /* read/write lock */
@@ -154,6 +155,20 @@ static int qcom_swrm_ahb_reg_write(struct qcom_swrm_ctrl *ctrl,
ÂÂÂÂÂ return SDW_CMD_OK;
 }
+static int qcom_swrm_cpu_reg_read(struct qcom_swrm_ctrl *ctrl, int reg,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ u32 *val)
+{
+ÂÂÂ *val = readl(ctrl->mmio + reg);
+ÂÂÂ return SDW_CMD_OK;
+}
+
+static int qcom_swrm_cpu_reg_write(struct qcom_swrm_ctrl *ctrl, int reg,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ int val)
+{
+ÂÂÂ writel(val, ctrl->mmio + reg);
+ÂÂÂ return SDW_CMD_OK;
+}
+
 static int qcom_swrm_cmd_fifo_wr_cmd(struct qcom_swrm_ctrl *ctrl, u8 cmd_data,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ u8 dev_addr, u16 reg_addr)
 {
@@ -746,6 +761,7 @@ static int qcom_swrm_probe(struct platform_device *pdev)
ÂÂÂÂÂ struct sdw_master_prop *prop;
ÂÂÂÂÂ struct sdw_bus_params *params;
ÂÂÂÂÂ struct qcom_swrm_ctrl *ctrl;
+ÂÂÂ struct resource *res;
ÂÂÂÂÂ int ret;
ÂÂÂÂÂ u32 val;
@@ -760,8 +776,13 @@ static int qcom_swrm_probe(struct platform_device *pdev)
ÂÂÂÂÂÂÂÂÂ if (!ctrl->regmap)
ÂÂÂÂÂÂÂÂÂÂÂÂÂ return -EINVAL;
ÂÂÂÂÂ } else {
-ÂÂÂÂÂÂÂ /* Only WCD based SoundWire controller is supported */
-ÂÂÂÂÂÂÂ return -ENOTSUPP;
+ÂÂÂÂÂÂÂ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+ÂÂÂÂÂÂÂ ctrl->reg_read = qcom_swrm_cpu_reg_read;
+ÂÂÂÂÂÂÂ ctrl->reg_write = qcom_swrm_cpu_reg_write;
+ÂÂÂÂÂÂÂ ctrl->mmio = devm_ioremap_resource(dev, res);
+ÂÂÂÂÂÂÂ if (IS_ERR(ctrl->mmio))
+ÂÂÂÂÂÂÂÂÂÂÂ return PTR_ERR(ctrl->mmio);
ÂÂÂÂÂ }
ÂÂÂÂÂ ctrl->irq = of_irq_get(dev->of_node, 0);