From patchwork Mon Mar 1 01:43:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 12108637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 426CDC4332B for ; Mon, 1 Mar 2021 01:44:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2527E64EB7 for ; Mon, 1 Mar 2021 01:44:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231381AbhCABo0 (ORCPT ); Sun, 28 Feb 2021 20:44:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231329AbhCABoY (ORCPT ); Sun, 28 Feb 2021 20:44:24 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C13CC06178A for ; Sun, 28 Feb 2021 17:43:44 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id s23so10653736pji.1 for ; Sun, 28 Feb 2021 17:43:44 -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=re5cneH5LwtASkkb/0TTV6Xt6BX2mOBhYFKz8Fn5mZk=; b=m3rwZ2wcH4mVG8aT8rSFmFWQcRo8Ry1I7h3d9X+MFtd+MPew3Tiuflom0cGALa5StK SDIX4kwPNrj/0YYKxJxXQBbOiukdUUgEd7AlBGnoqAVtUJFmN8ThUdQdbCEXeKXARgDP jnU+w6Xvc5H2AkA3pc985TwnffmiTtbq+GWpTr4ZucndpoFoEYL+GeACvTcab9xs4Oju N0x6pzg3IF7JONuXVI1ocuWtWIjr83cIYnaDcrPpDDJZ8JklokGqfYMqH5h11sn+OYA2 Ne17XjB8ScLWyxLoF+eO9Ca/ge7cAqYbFkvWddKTAza2kkxTGB6qBUNQng5OzUu4qu5A FJKA== 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=re5cneH5LwtASkkb/0TTV6Xt6BX2mOBhYFKz8Fn5mZk=; b=dhRESn+L5MDqruhsOD4Yw7vT30OO7IjNWUUWkxn4htfdYznRJXe3Uba0y+kvu/VtXR ph5FXWCqXHD4L+ubbpm0ISr8qjKIOCn3Z/ozTnN7uWWVjH5l8gIO0N8R5NSWLY9/Hs+I pjPHREkMea4tqIl+5xj8uE7HOeWh++6ubNvfhOXlefnX90W6ma3eNOd/VC87ATlc175G GNcq9vRAMkAmdHFNbmstTv9eWYAYf71lvn9LVdkX6juFJOajlW1mpJBDVnMXurItkEHI FxLpERfE4bXwc3V9q/Am28mzJAIdg+VGD9YINg5XWLeqwzGjCWPkE4oECrqdL1foKqfS 6ImA== X-Gm-Message-State: AOAM533NupRKv571KRbBokjBN8q8xGsrrx2VhvIhRF80c5MYeVmgIw5u zzVdN+kOH4K1autSsRZv/m8RHQ== X-Google-Smtp-Source: ABdhPJwKX7pq2bMMM9G6Xb5UrNgu+ahjrdsdzk0sMimihfsX5DD0u824rMpkSfGWFK72TaWN8gBCVQ== X-Received: by 2002:a17:902:6b06:b029:e3:5edf:c2a1 with SMTP id o6-20020a1709026b06b02900e35edfc2a1mr13493323plk.51.1614563023773; Sun, 28 Feb 2021 17:43:43 -0800 (PST) Received: from localhost.localdomain (80.251.214.228.16clouds.com. [80.251.214.228]) by smtp.gmail.com with ESMTPSA id q95sm5641080pjq.20.2021.02.28.17.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 17:43:43 -0800 (PST) From: Shawn Guo To: Linus Walleij Cc: Bjorn Andersson , linux-gpio@vger.kernel.org, linux-arm-msm@vger.kernel.org, Shawn Guo Subject: [PATCH 1/2] pinctrl: qcom: handle tiles for ACPI boot Date: Mon, 1 Mar 2021 09:43:28 +0800 Message-Id: <20210301014329.30104-2-shawn.guo@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210301014329.30104-1-shawn.guo@linaro.org> References: <20210301014329.30104-1-shawn.guo@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org It's not always the case that DT and ACPI describe hardware resource in the same schema, even for a single platform. For example, on SC8180X, DT uses the tiles schema while ACPI describe memory resource as a single region. It patches msm_pinctrl_probe() function to map tiles regions only for DT. While for ACPI, it maps the single memory resource and calculate tile bases with offsets passed from SoC data. Signed-off-by: Shawn Guo --- drivers/pinctrl/qcom/pinctrl-msm.c | 18 ++++++++++++++---- drivers/pinctrl/qcom/pinctrl-msm.h | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 40256663264f..2526f299bdce 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -4,6 +4,7 @@ * Copyright (c) 2013, The Linux Foundation. All rights reserved. */ +#include #include #include #include @@ -1399,6 +1400,7 @@ int msm_pinctrl_probe(struct platform_device *pdev, { struct msm_pinctrl *pctrl; struct resource *res; + void __iomem *base; int ret; int i; @@ -1415,7 +1417,7 @@ int msm_pinctrl_probe(struct platform_device *pdev, raw_spin_lock_init(&pctrl->lock); - if (soc_data->tiles) { + if (soc_data->tiles && !has_acpi_companion(&pdev->dev)) { for (i = 0; i < soc_data->ntiles; i++) { res = platform_get_resource_byname(pdev, IORESOURCE_MEM, soc_data->tiles[i]); @@ -1425,9 +1427,17 @@ int msm_pinctrl_probe(struct platform_device *pdev, } } else { res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - pctrl->regs[0] = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(pctrl->regs[0])) - return PTR_ERR(pctrl->regs[0]); + base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(base)) + return PTR_ERR(base); + + if (soc_data->tiles) { + for (i = 0; i < soc_data->ntiles; i++) + pctrl->regs[i] = base + + soc_data->tile_offsets[i]; + } else { + pctrl->regs[0] = base; + } pctrl->phys_base[0] = res->start; } diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h index e31a5167c91e..91333942d53c 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.h +++ b/drivers/pinctrl/qcom/pinctrl-msm.h @@ -131,6 +131,7 @@ struct msm_pinctrl_soc_data { bool pull_no_keeper; const char *const *tiles; unsigned int ntiles; + const u32 *tile_offsets; const int *reserved_gpios; const struct msm_gpio_wakeirq_map *wakeirq_map; unsigned int nwakeirq_map; From patchwork Mon Mar 1 01:43:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 12108639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E37EEC433E6 for ; Mon, 1 Mar 2021 01:45:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BDC0C64E31 for ; Mon, 1 Mar 2021 01:45:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230084AbhCABop (ORCPT ); Sun, 28 Feb 2021 20:44:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231329AbhCABoo (ORCPT ); Sun, 28 Feb 2021 20:44:44 -0500 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 388C1C06178C for ; Sun, 28 Feb 2021 17:43:46 -0800 (PST) Received: by mail-pg1-x532.google.com with SMTP id a4so10470886pgc.11 for ; Sun, 28 Feb 2021 17:43:46 -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=z0mBMHxaT4uoBSQcFVbT2L0+EZv1w1tZ9nt7sG1lKAE=; b=iTqMK3mxYaalRnrW436u79qOOY0+3tfhvfkJlOeiDEVZT8Dm0bkiObfGY7PwGqaxL1 pRAwN6jl3Zje67R6tzz+AIs0jSCtXi6WfdcK18XfL/xbuFp7rKwdAW1DRfquidKITsay SLQfr/oJoLkMKiaJKrPO1g7h7dMpNuH5h9m4pfkKlKLKV3FFQqejzehbb5Up6PHInsVj i83SKFOTx1z1RBXzrS0Wa3ZsUIIo9YXRUrOnC8Wbv9ovuhgAO2t3dvV0SsyyRp5LMbdR TvaR77CpInVN8R07ACq131vOKscnDRFORn+1YX+5qs565g5Bq9SSUU1Yrkq3+2423lM4 7oyw== 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=z0mBMHxaT4uoBSQcFVbT2L0+EZv1w1tZ9nt7sG1lKAE=; b=cwv9+dv4TSPcxu/3QOGYstDw2yEeum8yO18Dj0h7VxX+PSY3xDNd1vEoaIkq9cVrjC pK2jANO1TYH4LS2G8snCCHVD0ZmZr2qFslbHABdpHCCHaQUNdNwQnZNkgEvLyUNP/lT6 BqX3xkDRv5M8EfNoNZuIexeglqDENrWGYJ7zC2NjB7DRYPzl0SnmdXmdv4q4Pyrqild9 N7/KAsVrGEe5tmf3+IaFr9OfLWa4hSU2mcMGsXWiQGX/XlMsL0Q5ZtVH0KfRzApS0XcL bhFtY2yw3pVFrNRPUYy5GuNUxhHKkDRtxA3LV+ROXheQ4MGYs8lGTQZeH3RtqHjhlGtj pMrQ== X-Gm-Message-State: AOAM533L8O5i3NOTwHX3UOzy+DfRDzWY3EUx2nFvNN+wrkwGwVeHd/AM 0w9g+kvNHugQSoKj3HNI6K2H9A== X-Google-Smtp-Source: ABdhPJz+JIopAVE1SCT8Pgx4eS/YoSS7qIkoEiQUv/aFVw7tAIVL/Td5pgMEB/6u677fhh5oR2fSTg== X-Received: by 2002:a63:1c19:: with SMTP id c25mr11586114pgc.374.1614563025828; Sun, 28 Feb 2021 17:43:45 -0800 (PST) Received: from localhost.localdomain (80.251.214.228.16clouds.com. [80.251.214.228]) by smtp.gmail.com with ESMTPSA id q95sm5641080pjq.20.2021.02.28.17.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 17:43:45 -0800 (PST) From: Shawn Guo To: Linus Walleij Cc: Bjorn Andersson , linux-gpio@vger.kernel.org, linux-arm-msm@vger.kernel.org, Shawn Guo Subject: [PATCH 2/2] pinctrl: qcom: sc8180x: add ACPI probe support Date: Mon, 1 Mar 2021 09:43:29 +0800 Message-Id: <20210301014329.30104-3-shawn.guo@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210301014329.30104-1-shawn.guo@linaro.org> References: <20210301014329.30104-1-shawn.guo@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org It adds ACPI probe support with tile offsets passed over to msm core driver via sc8180x_tile_offsets, as TLMM is described a single memory region in ACPI DSDT. Signed-off-by: Shawn Guo --- drivers/pinctrl/qcom/Kconfig | 2 +- drivers/pinctrl/qcom/pinctrl-sc8180x.c | 48 +++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig index 6853a896c476..9f0218c4f9b3 100644 --- a/drivers/pinctrl/qcom/Kconfig +++ b/drivers/pinctrl/qcom/Kconfig @@ -222,7 +222,7 @@ config PINCTRL_SC7280 config PINCTRL_SC8180X tristate "Qualcomm Technologies Inc SC8180x pin controller driver" - depends on GPIOLIB && OF + depends on GPIOLIB && (OF || ACPI) select PINCTRL_MSM help This is the pinctrl, pinmux, pinconf and gpiolib driver for the diff --git a/drivers/pinctrl/qcom/pinctrl-sc8180x.c b/drivers/pinctrl/qcom/pinctrl-sc8180x.c index b765bf667574..38117ceb4d8f 100644 --- a/drivers/pinctrl/qcom/pinctrl-sc8180x.c +++ b/drivers/pinctrl/qcom/pinctrl-sc8180x.c @@ -4,6 +4,7 @@ * Copyright (c) 2020-2021, Linaro Ltd. */ +#include #include #include #include @@ -17,6 +18,12 @@ static const char * const sc8180x_tiles[] = { "west" }; +static const u32 sc8180x_tile_offsets[] = { + 0x00d00000, + 0x00500000, + 0x00100000 +}; + enum { SOUTH, EAST, @@ -1557,6 +1564,13 @@ static const struct msm_pingroup sc8180x_groups[] = { [193] = SDC_QDSD_PINGROUP(sdc2_data, 0x4b2000, 9, 0), }; +static const int sc8180x_acpi_reserved_gpios[] = { + 0, 1, 2, 3, + 47, 48, 49, 50, + 126, 127, 128, 129, + -1 +}; + static const struct msm_gpio_wakeirq_map sc8180x_pdc_map[] = { { 3, 31 }, { 5, 32 }, { 8, 33 }, { 9, 34 }, { 10, 100 }, { 12, 104 }, { 24, 37 }, { 26, 38 }, { 27, 41 }, { 28, 42 }, { 30, 39 }, { 36, 43 }, @@ -1588,11 +1602,42 @@ static struct msm_pinctrl_soc_data sc8180x_pinctrl = { .nwakeirq_map = ARRAY_SIZE(sc8180x_pdc_map), }; +static const struct msm_pinctrl_soc_data sc8180x_acpi_pinctrl = { + .tiles = sc8180x_tiles, + .ntiles = ARRAY_SIZE(sc8180x_tiles), + .tile_offsets = sc8180x_tile_offsets, + .pins = sc8180x_pins, + .npins = ARRAY_SIZE(sc8180x_pins), + .groups = sc8180x_groups, + .ngroups = ARRAY_SIZE(sc8180x_groups), + .reserved_gpios = sc8180x_acpi_reserved_gpios, + .ngpios = 191, +}; + static int sc8180x_pinctrl_probe(struct platform_device *pdev) { - return msm_pinctrl_probe(pdev, &sc8180x_pinctrl); + int ret; + + if (pdev->dev.of_node) { + ret = msm_pinctrl_probe(pdev, &sc8180x_pinctrl); + } else if (has_acpi_companion(&pdev->dev)) { + ret = msm_pinctrl_probe(pdev, &sc8180x_acpi_pinctrl); + } else { + dev_err(&pdev->dev, "DT and ACPI disabled\n"); + ret = -EINVAL; + } + + return ret; } +#ifdef CONFIG_ACPI +static const struct acpi_device_id sc8180x_pinctrl_acpi_match[] = { + { "QCOM040D"}, + { }, +}; +MODULE_DEVICE_TABLE(acpi, sc8180x_pinctrl_acpi_match); +#endif + static const struct of_device_id sc8180x_pinctrl_of_match[] = { { .compatible = "qcom,sc8180x-tlmm", }, { }, @@ -1603,6 +1648,7 @@ static struct platform_driver sc8180x_pinctrl_driver = { .driver = { .name = "sc8180x-pinctrl", .of_match_table = sc8180x_pinctrl_of_match, + .acpi_match_table = ACPI_PTR(sc8180x_pinctrl_acpi_match), }, .probe = sc8180x_pinctrl_probe, .remove = msm_pinctrl_remove,