From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Neil Armstrong <neil.armstrong@linaro.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v5 04/12] soc: qcom: pmic_glink: register ucsi aux device
Date: Tue, 21 Mar 2023 17:38:05 +0200 [thread overview]
Message-ID: <7ef646e0-388e-b2ef-a28c-f1fcce486203@linaro.org> (raw)
In-Reply-To: <20230130-topic-sm8450-upstream-pmic-glink-v5-4-552f3b721f9e@linaro.org>
On 21/03/2023 15:21, Neil Armstrong wrote:
> Only register UCSI on know working devices, like on the SM8450
> or SM8550 which requires UCSI to get USB mode switch events.
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Two nits below:
> ---
> drivers/soc/qcom/pmic_glink.c | 65 +++++++++++++++++++++++++++++++++++--------
> 1 file changed, 54 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/soc/qcom/pmic_glink.c b/drivers/soc/qcom/pmic_glink.c
> index bb3fb57abcc6..8bf95df0a56a 100644
> --- a/drivers/soc/qcom/pmic_glink.c
> +++ b/drivers/soc/qcom/pmic_glink.c
> @@ -4,6 +4,7 @@
> * Copyright (c) 2022, Linaro Ltd
> */
> #include <linux/auxiliary_bus.h>
> +#include <linux/of_device.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/rpmsg.h>
> @@ -11,12 +12,23 @@
> #include <linux/soc/qcom/pdr.h>
> #include <linux/soc/qcom/pmic_glink.h>
>
> +enum {
> + PMIC_GLINK_CLIENT_BATT = 0,
> + PMIC_GLINK_CLIENT_ALTMODE,
> + PMIC_GLINK_CLIENT_UCSI,
> +};
> +
> +#define PMIC_GLINK_CLIENT_DEFAULT (BIT(PMIC_GLINK_CLIENT_BATT) | \
> + BIT(PMIC_GLINK_CLIENT_ALTMODE))
> +
> struct pmic_glink {
> struct device *dev;
> struct pdr_handle *pdr;
>
> struct rpmsg_endpoint *ept;
>
> + unsigned long client_mask;
> +
> struct auxiliary_device altmode_aux;
> struct auxiliary_device ps_aux;
> struct auxiliary_device ucsi_aux;
> @@ -233,6 +245,7 @@ static struct rpmsg_driver pmic_glink_rpmsg_driver = {
>
> static int pmic_glink_probe(struct platform_device *pdev)
> {
> + const unsigned long *match_data;
> struct pdr_service *service;
> struct pmic_glink *pg;
> int ret;
> @@ -249,12 +262,27 @@ static int pmic_glink_probe(struct platform_device *pdev)
> mutex_init(&pg->client_lock);
> mutex_init(&pg->state_lock);
>
> - ret = pmic_glink_add_aux_device(pg, &pg->altmode_aux, "altmode");
> - if (ret)
> - return ret;
> - ret = pmic_glink_add_aux_device(pg, &pg->ps_aux, "power-supply");
> - if (ret)
> - goto out_release_altmode_aux;
> + match_data = (unsigned long *)of_device_get_match_data(&pdev->dev);
Nit: type cast should not be necessary here.
> + if (match_data)
> + pg->client_mask = *match_data;
> + else
> + pg->client_mask = PMIC_GLINK_CLIENT_DEFAULT;
> +
> + if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_UCSI)) {
> + ret = pmic_glink_add_aux_device(pg, &pg->ucsi_aux, "ucsi");
> + if (ret)
> + return ret;
> + }
> + if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_ALTMODE)) {
> + ret = pmic_glink_add_aux_device(pg, &pg->altmode_aux, "altmode");
> + if (ret)
> + goto out_release_ucsi_aux;
> + }
> + if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_BATT)) {
> + ret = pmic_glink_add_aux_device(pg, &pg->ps_aux, "power-supply");
> + if (ret)
> + goto out_release_altmode_aux;
> + }
>
> pg->pdr = pdr_handle_alloc(pmic_glink_pdr_callback, pg);
> if (IS_ERR(pg->pdr)) {
> @@ -278,9 +306,14 @@ static int pmic_glink_probe(struct platform_device *pdev)
> out_release_pdr_handle:
> pdr_handle_release(pg->pdr);
> out_release_aux_devices:
> - pmic_glink_del_aux_device(pg, &pg->ps_aux);
> + if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_BATT))
> + pmic_glink_del_aux_device(pg, &pg->ps_aux);
> out_release_altmode_aux:
> - pmic_glink_del_aux_device(pg, &pg->altmode_aux);
> + if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_ALTMODE))
> + pmic_glink_del_aux_device(pg, &pg->altmode_aux);
> +out_release_ucsi_aux:
> + if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_UCSI))
> + pmic_glink_del_aux_device(pg, &pg->ucsi_aux);
>
> return ret;
> }
> @@ -291,8 +324,12 @@ static int pmic_glink_remove(struct platform_device *pdev)
>
> pdr_handle_release(pg->pdr);
>
> - pmic_glink_del_aux_device(pg, &pg->ps_aux);
> - pmic_glink_del_aux_device(pg, &pg->altmode_aux);
> + if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_BATT))
> + pmic_glink_del_aux_device(pg, &pg->ps_aux);
> + if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_ALTMODE))
> + pmic_glink_del_aux_device(pg, &pg->altmode_aux);
> + if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_UCSI))
> + pmic_glink_del_aux_device(pg, &pg->ucsi_aux);
>
> mutex_lock(&__pmic_glink_lock);
> __pmic_glink = NULL;
> @@ -301,8 +338,14 @@ static int pmic_glink_remove(struct platform_device *pdev)
> return 0;
> }
>
> +/* Do not handle altmode for now on those platforms */
> +static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) |
> + BIT(PMIC_GLINK_CLIENT_UCSI);
> +
> static const struct of_device_id pmic_glink_of_match[] = {
> - { .compatible = "qcom,pmic-glink", },
Nit: one can leave comma in place to remove noise.
> + { .compatible = "qcom,sm8450-pmic-glink", .data = &pmic_glink_sm8450_client_mask },
> + { .compatible = "qcom,sm8550-pmic-glink", .data = &pmic_glink_sm8450_client_mask },
> + { .compatible = "qcom,pmic-glink" },
> {}
> };
> MODULE_DEVICE_TABLE(of, pmic_glink_of_match);
>
--
With best wishes
Dmitry
next prev parent reply other threads:[~2023-03-21 15:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-21 13:21 [PATCH v5 00/12] soc: qcom: add UCSI function to PMIC GLINK Neil Armstrong
2023-03-21 13:21 ` [PATCH v5 01/12] usb: typec: ucsi: add PMIC Glink UCSI driver Neil Armstrong
2023-03-22 2:31 ` Bjorn Andersson
2023-03-23 16:33 ` Greg Kroah-Hartman
2023-03-21 13:21 ` [PATCH v5 02/12] dt-bindings: soc: qcom: qcom,pmic-glink: document SM8450 compatible Neil Armstrong
2023-03-21 13:21 ` [PATCH v5 03/12] dt-bindings: soc: qcom: qcom,pmic-glink: document SM8550 compatible Neil Armstrong
2023-03-21 13:21 ` [PATCH v5 04/12] soc: qcom: pmic_glink: register ucsi aux device Neil Armstrong
2023-03-21 15:38 ` Dmitry Baryshkov [this message]
2023-03-21 13:21 ` [PATCH v5 05/12] dt-bindings: usb: snps,dwc3: document HS & SS OF graph ports Neil Armstrong
2023-03-21 13:21 ` [PATCH v5 06/12] arm64: dts: qcom: sm8350: add port subnodes in dwc3 node Neil Armstrong
2023-03-21 13:21 ` [PATCH v5 07/12] arm64: dts: qcom: sm8450: " Neil Armstrong
2023-03-21 13:21 ` [PATCH v5 08/12] arm64: dts: qcom: sm8550: " Neil Armstrong
2023-03-21 13:21 ` [PATCH v5 09/12] arm64: dts: qcom: sm8350-hdk: add pmic glink node Neil Armstrong
2023-03-21 14:26 ` Konrad Dybcio
2023-03-21 15:38 ` Dmitry Baryshkov
2023-03-21 13:21 ` [PATCH v5 10/12] arm64: dts: qcom: sm8450-hdk: " Neil Armstrong
2023-03-21 13:21 ` [PATCH v5 11/12] arm64: dts: qcom: sm8550-mtp: " Neil Armstrong
2023-03-21 13:21 ` [PATCH v5 12/12] arm64: defconfig: add PMIC GLINK modules Neil Armstrong
2023-03-22 14:45 ` (subset) [PATCH v5 00/12] soc: qcom: add UCSI function to PMIC GLINK Bjorn Andersson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7ef646e0-388e-b2ef-a28c-f1fcce486203@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=robh+dt@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).