From patchwork Thu Sep 21 16:49:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 9964341 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 C7E76602D8 for ; Thu, 21 Sep 2017 16:52:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB5D3293F1 for ; Thu, 21 Sep 2017 16:52:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B05872956F; Thu, 21 Sep 2017 16:52:29 +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 67B3D293F1 for ; Thu, 21 Sep 2017 16:52:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751786AbdIUQwO (ORCPT ); Thu, 21 Sep 2017 12:52:14 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:49766 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbdIUQto (ORCPT ); Thu, 21 Sep 2017 12:49:44 -0400 Received: by mail-wm0-f49.google.com with SMTP id r74so3553202wme.4 for ; Thu, 21 Sep 2017 09:49:44 -0700 (PDT) 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=cQ6nctdD3xxvI++h3kyzuAgAJ5SWN5qaOMScnTFfGOQ=; b=LrZ8NMy0MAU7MMlVlDnnkJjM/n33CxY93PA/M3Up54hiMr9pj/i89w7Yg0J/1scQ/i SduY73Erni+ypc6aLbLyh7S+aqA43mmjxledHegW/SByLAtm2tyqgdifFjHx6K5h+f6N 5zUk/EQKqh31ufeHmcMZ3CccB/4PMULkQYhkg= 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=cQ6nctdD3xxvI++h3kyzuAgAJ5SWN5qaOMScnTFfGOQ=; b=YBWSUidOIGRONbdIjhjdiOBnR7aLGUtyXMw5Msg3kghdnTgIjrph6bDieLWcVwiv0i KUw63VqlQ2/fGBvSu0NTAaQbIfVFLTCfUPl2P7WqJlluQVOMouhWc2QvhGQ7czLU6WEg 7WE2puXW+W8eZveqQIBcz6hYvHvS91pMIMPpFLDqzBcdtWYrNTFrE2C6P92rF6TMnVqm Q3jqu+WlpFz2NMcHzncISQSbsaMl92LYtEDvP6rRYYvtIpHmspVgrjx79bqPfyDwDNUJ GIYKVRzV1bIZTHxH5gq50n3hIY6UuPXsQPluNARO840TvRp1bPuUmPJ8a8S14Cc2lMhM 9tpw== X-Gm-Message-State: AHPjjUiCLUsDdaN3U3clR71lDmeymuGi6KKhAT9gREPH8XLIX1eXhN4y Z4ES3cola43iTR88ycy+kKHPBQ== X-Google-Smtp-Source: AOwi7QBHW5sX2jrgiRnwl55Mt7pbHNSSZaNrqqf4pwgZPBTfj854Kv4ll7v0IqssNslMYmbxV6Mf3w== X-Received: by 10.80.241.92 with SMTP id z28mr1864936edl.294.1506012583652; Thu, 21 Sep 2017 09:49:43 -0700 (PDT) Received: from mms-0441.qualcomm.mm-sol.com ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id i16sm993311edj.29.2017.09.21.09.49.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 09:49:42 -0700 (PDT) From: Georgi Djakov To: sboyd@codeaurora.org, jassisinghbrar@gmail.com, bjorn.andersson@linaro.org, robh+dt@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 v9 1/7] mailbox: qcom: Convert APCS IPC driver to use regmap Date: Thu, 21 Sep 2017 19:49:34 +0300 Message-Id: <20170921164940.20343-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170921164940.20343-1-georgi.djakov@linaro.org> References: <20170921164940.20343-1-georgi.djakov@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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-arm-msm" 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++)