From patchwork Fri Dec 1 17:02:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 10087515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1074A6037E for ; Fri, 1 Dec 2017 17:04:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F31DF2A5BF for ; Fri, 1 Dec 2017 17:04:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E77C52A5A9; Fri, 1 Dec 2017 17:04:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F26D2A585 for ; Fri, 1 Dec 2017 17:04:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751443AbdLARCa (ORCPT ); Fri, 1 Dec 2017 12:02:30 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:36491 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988AbdLARC2 (ORCPT ); Fri, 1 Dec 2017 12:02:28 -0500 Received: by mail-wr0-f196.google.com with SMTP id v105so10785981wrc.3 for ; Fri, 01 Dec 2017 09:02:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zE82+lMa7W1gP3c+4riT4gc5BAemK6rhdR0Rq7j3jPA=; b=FFUDSAI4MVyOLzceA3px0sWPgzeRsp0yyi/9wekx3+QvPLiPOKl6XyJQOS2Lz0TYfi pQV5J7YJLkofBQCX/n0efT6BOhYXiN635w69SyU+dY4wNXXS3v0YKncIls1bgWG6PD64 cVn+p7qjBnzLIFT7HLv6y4uxbkFTZ4FJVzyfg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zE82+lMa7W1gP3c+4riT4gc5BAemK6rhdR0Rq7j3jPA=; b=l7jn+cZLKTl3c3nmV7sLkE0iKU8zN2/6mkQEY5ghrag2Ttd1gOxrrR8VPczmud/XuF aBV9sDRXC87s1lWlXXHI805avPh09DH20zkQO6Pgn44LCpTkZ9+HG4jFKTI/6QkfojKk HG3GGXs4EmVQhjIZ5TK/iA1kioUrf0b3ev8tHCieFz8ksfDmSS7XTEZKPtm7lmrgTUPt mqZP2rFDs3HHksaWXgVDBYY4l5wopcPHbVqvJVVStLEC9A7KTj23Q09uI4vqw5fniP0o 1UDprias1ZUKmv/OsDFbaWU392h0OqA7YJ20ySqX9txVGDcP9V4HTkCs6wN/jvZq0uxS q6mg== X-Gm-Message-State: AJaThX7NSWKN3tkwnvvL39f5jtNRhgUNvDyWDUm6yRReWQuxVa7ozSe6 IWfgVVey3C9Cf7AA85W5via0Cg== X-Google-Smtp-Source: AGs4zMaca+myWJJmI3d0wky4rizK7CG8FAxJjmJa0CSlwl6uMXOEmF4gkNLAPKE+U10rRaLIV8TPZQ== X-Received: by 10.223.195.198 with SMTP id d6mr5819639wrg.100.1512147747459; Fri, 01 Dec 2017 09:02:27 -0800 (PST) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id 2sm1535253wmk.28.2017.12.01.09.02.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Dec 2017 09:02:26 -0800 (PST) From: Georgi Djakov To: sboyd@codeaurora.org, jassisinghbrar@gmail.com, bjorn.andersson@linaro.org, robh@kernel.org Cc: mturquette@baylibre.com, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH v10 1/6] mailbox: qcom: Convert APCS IPC driver to use regmap Date: Fri, 1 Dec 2017 19:02:19 +0200 Message-Id: <20171201170224.25053-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171201170224.25053-1-georgi.djakov@linaro.org> References: <20171201170224.25053-1-georgi.djakov@linaro.org> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This hardware block provides more functionalities that just IPC. Convert it to regmap to allow other child platform devices to use the same regmap. Signed-off-by: Georgi Djakov Acked-by: Bjorn Andersson --- drivers/mailbox/qcom-apcs-ipc-mailbox.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index 9924c6d7f05d..ab344bc6fa63 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #define QCOM_APCS_IPC_BITS 32 @@ -26,19 +27,25 @@ struct qcom_apcs_ipc { struct mbox_controller mbox; struct mbox_chan mbox_chans[QCOM_APCS_IPC_BITS]; - void __iomem *reg; + struct regmap *regmap; unsigned long offset; }; +static const struct regmap_config apcs_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = 0x1000, + .fast_io = true, +}; + static int qcom_apcs_ipc_send_data(struct mbox_chan *chan, void *data) { struct qcom_apcs_ipc *apcs = container_of(chan->mbox, struct qcom_apcs_ipc, mbox); unsigned long idx = (unsigned long)chan->con_priv; - writel(BIT(idx), apcs->reg); - - return 0; + return regmap_write(apcs->regmap, apcs->offset, BIT(idx)); } static const struct mbox_chan_ops qcom_apcs_ipc_ops = { @@ -47,7 +54,9 @@ static const struct mbox_chan_ops qcom_apcs_ipc_ops = { static int qcom_apcs_ipc_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; struct qcom_apcs_ipc *apcs; + struct regmap *regmap; struct resource *res; unsigned long offset; void __iomem *base; @@ -63,9 +72,14 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev) if (IS_ERR(base)) return PTR_ERR(base); + regmap = devm_regmap_init_mmio(&pdev->dev, base, &apcs_regmap_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + offset = (unsigned long)of_device_get_match_data(&pdev->dev); - apcs->reg = base + offset; + apcs->regmap = regmap; + apcs->offset = offset; /* Initialize channel identifiers */ for (i = 0; i < ARRAY_SIZE(apcs->mbox_chans); i++)