From: Hui Liu <[email protected]>
Removed the call logic of disable and enable regulator
in reset function. Enable the regulator in qcom_pmic_typec_start
function and disable it in qcom_pmic_typec_stop function to
avoid unbalanced regulator disable warnings.
Reviewed-by: Guenter Roeck <[email protected]>
Fixes: a4422ff22142 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver")
Reviewed-by: Bryan O'Donoghue <[email protected]>
Acked-by: Bryan O'Donoghue <[email protected]>
Signed-off-by: Hui Liu <[email protected]>
---
Changes in v4:
- Removed regulator_enable and regulator_diable from
pmic_typec_pdphy_reset function. And enable regulator in
qcom_pmic_typec_pdphy_start function and disable it in
qcom_pmic_typec_pdphy_stop function.
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Take Bryan's proposal to remove enable/disable operation in pdphy
enable and pdphy disable function, then enable regulator in pdphy start
function and disable it in pdphy stop function.
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Add Fixes tag
- Link to v1: https://lore.kernel.org/r/[email protected]
---
drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
index bb0b8479d80f..52c81378e36e 100644
--- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
@@ -381,10 +381,6 @@ static int qcom_pmic_typec_pdphy_enable(struct pmic_typec_pdphy *pmic_typec_pdph
struct device *dev = pmic_typec_pdphy->dev;
int ret;
- ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy);
- if (ret)
- return ret;
-
/* PD 2.0, DR=TYPEC_DEVICE, PR=TYPEC_SINK */
ret = regmap_update_bits(pmic_typec_pdphy->regmap,
pmic_typec_pdphy->base + USB_PDPHY_MSG_CONFIG_REG,
@@ -422,8 +418,6 @@ static int qcom_pmic_typec_pdphy_disable(struct pmic_typec_pdphy *pmic_typec_pdp
ret = regmap_write(pmic_typec_pdphy->regmap,
pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0);
- regulator_disable(pmic_typec_pdphy->vdd_pdphy);
-
return ret;
}
@@ -447,6 +441,10 @@ int qcom_pmic_typec_pdphy_start(struct pmic_typec_pdphy *pmic_typec_pdphy,
int i;
int ret;
+ ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy);
+ if (ret)
+ return ret;
+
pmic_typec_pdphy->tcpm_port = tcpm_port;
ret = pmic_typec_pdphy_reset(pmic_typec_pdphy);
@@ -467,6 +465,8 @@ void qcom_pmic_typec_pdphy_stop(struct pmic_typec_pdphy *pmic_typec_pdphy)
disable_irq(pmic_typec_pdphy->irq_data[i].irq);
qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy);
+
+ regulator_disable(pmic_typec_pdphy->vdd_pdphy);
}
struct pmic_typec_pdphy *qcom_pmic_typec_pdphy_alloc(struct device *dev)
---
base-commit: bbb9e06d2c6435af9c62074ad7048910eeb2e7bc
change-id: 20230822-qcom-tcpc-d41954ac65fa
Best regards,
--
Hui Liu <[email protected]>
On 8/30/2023 2:25 PM, Guenter Roeck wrote:
> On 8/29/23 20:00, Hui Liu via B4 Relay wrote:
>> From: Hui Liu <[email protected]>
>>
>> Removed the call logic of disable and enable regulator
>> in reset function. Enable the regulator in qcom_pmic_typec_start
>> function and disable it in qcom_pmic_typec_stop function to
>> avoid unbalanced regulator disable warnings.
>>
>> Reviewed-by: Guenter Roeck <[email protected]>
>
> Please drop.
I didn't get your mean. would you please explain it?
>
>> Fixes: a4422ff22142 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver")
>> Reviewed-by: Bryan O'Donoghue <[email protected]>
>> Acked-by: Bryan O'Donoghue <[email protected]>
>> Signed-off-by: Hui Liu <[email protected]>
>> ---
>> Changes in v4:
>> - Removed regulator_enable and regulator_diable from
>> pmic_typec_pdphy_reset function. And enable regulator in
>
> ... because I do not see the above change, and way too much changed
> in the code since I sent a Reviewed-by: to make it appropriate
> to keep it.
>
> Actually, I don't see a difference between v3 and v4 of your patch.
>
> Guenter
Yes, The codes are same between V3 and V4, I just update the commit log
as Bryan said. How about I resend the V4 and update the cover letter
like "Fixed the commit log"
>
>> qcom_pmic_typec_pdphy_start function and disable it in
>> qcom_pmic_typec_pdphy_stop function.
>> - Link to v3:
>> https://lore.kernel.org/r/[email protected]
>>
>> Changes in v3:
>> - Take Bryan's proposal to remove enable/disable operation in pdphy
>> enable and pdphy disable function, then enable regulator in pdphy start
>> function and disable it in pdphy stop function.
>> - Link to v2:
>> https://lore.kernel.org/r/[email protected]
>>
>> Changes in v2:
>> - Add Fixes tag
>> - Link to v1:
>> https://lore.kernel.org/r/[email protected]
>> ---
>> drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
>> b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
>> index bb0b8479d80f..52c81378e36e 100644
>> --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
>> +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
>> @@ -381,10 +381,6 @@ static int qcom_pmic_typec_pdphy_enable(struct
>> pmic_typec_pdphy *pmic_typec_pdph
>> struct device *dev = pmic_typec_pdphy->dev;
>> int ret;
>> - ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy);
>> - if (ret)
>> - return ret;
>> -
>> /* PD 2.0, DR=TYPEC_DEVICE, PR=TYPEC_SINK */
>> ret = regmap_update_bits(pmic_typec_pdphy->regmap,
>> pmic_typec_pdphy->base + USB_PDPHY_MSG_CONFIG_REG,
>> @@ -422,8 +418,6 @@ static int qcom_pmic_typec_pdphy_disable(struct
>> pmic_typec_pdphy *pmic_typec_pdp
>> ret = regmap_write(pmic_typec_pdphy->regmap,
>> pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0);
>> - regulator_disable(pmic_typec_pdphy->vdd_pdphy);
>> -
>> return ret;
>> }
>> @@ -447,6 +441,10 @@ int qcom_pmic_typec_pdphy_start(struct
>> pmic_typec_pdphy *pmic_typec_pdphy,
>> int i;
>> int ret;
>> + ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy);
>> + if (ret)
>> + return ret;
>> +
>> pmic_typec_pdphy->tcpm_port = tcpm_port;
>> ret = pmic_typec_pdphy_reset(pmic_typec_pdphy);
>> @@ -467,6 +465,8 @@ void qcom_pmic_typec_pdphy_stop(struct
>> pmic_typec_pdphy *pmic_typec_pdphy)
>> disable_irq(pmic_typec_pdphy->irq_data[i].irq);
>> qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy);
>> +
>> + regulator_disable(pmic_typec_pdphy->vdd_pdphy);
>> }
>> struct pmic_typec_pdphy *qcom_pmic_typec_pdphy_alloc(struct device
>> *dev)
>>
>> ---
>> base-commit: bbb9e06d2c6435af9c62074ad7048910eeb2e7bc
>> change-id: 20230822-qcom-tcpc-d41954ac65fa
>>
>> Best regards,
>
On 8/29/23 20:00, Hui Liu via B4 Relay wrote:
> From: Hui Liu <[email protected]>
>
> Removed the call logic of disable and enable regulator
> in reset function. Enable the regulator in qcom_pmic_typec_start
> function and disable it in qcom_pmic_typec_stop function to
> avoid unbalanced regulator disable warnings.
>
> Reviewed-by: Guenter Roeck <[email protected]>
Please drop.
> Fixes: a4422ff22142 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver")
> Reviewed-by: Bryan O'Donoghue <[email protected]>
> Acked-by: Bryan O'Donoghue <[email protected]>
> Signed-off-by: Hui Liu <[email protected]>
> ---
> Changes in v4:
> - Removed regulator_enable and regulator_diable from
> pmic_typec_pdphy_reset function. And enable regulator in
... because I do not see the above change, and way too much changed
in the code since I sent a Reviewed-by: to make it appropriate
to keep it.
Actually, I don't see a difference between v3 and v4 of your patch.
Guenter
> qcom_pmic_typec_pdphy_start function and disable it in
> qcom_pmic_typec_pdphy_stop function.
> - Link to v3: https://lore.kernel.org/r/[email protected]
>
> Changes in v3:
> - Take Bryan's proposal to remove enable/disable operation in pdphy
> enable and pdphy disable function, then enable regulator in pdphy start
> function and disable it in pdphy stop function.
> - Link to v2: https://lore.kernel.org/r/[email protected]
>
> Changes in v2:
> - Add Fixes tag
> - Link to v1: https://lore.kernel.org/r/[email protected]
> ---
> drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
> index bb0b8479d80f..52c81378e36e 100644
> --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
> +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
> @@ -381,10 +381,6 @@ static int qcom_pmic_typec_pdphy_enable(struct pmic_typec_pdphy *pmic_typec_pdph
> struct device *dev = pmic_typec_pdphy->dev;
> int ret;
>
> - ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy);
> - if (ret)
> - return ret;
> -
> /* PD 2.0, DR=TYPEC_DEVICE, PR=TYPEC_SINK */
> ret = regmap_update_bits(pmic_typec_pdphy->regmap,
> pmic_typec_pdphy->base + USB_PDPHY_MSG_CONFIG_REG,
> @@ -422,8 +418,6 @@ static int qcom_pmic_typec_pdphy_disable(struct pmic_typec_pdphy *pmic_typec_pdp
> ret = regmap_write(pmic_typec_pdphy->regmap,
> pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0);
>
> - regulator_disable(pmic_typec_pdphy->vdd_pdphy);
> -
> return ret;
> }
>
> @@ -447,6 +441,10 @@ int qcom_pmic_typec_pdphy_start(struct pmic_typec_pdphy *pmic_typec_pdphy,
> int i;
> int ret;
>
> + ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy);
> + if (ret)
> + return ret;
> +
> pmic_typec_pdphy->tcpm_port = tcpm_port;
>
> ret = pmic_typec_pdphy_reset(pmic_typec_pdphy);
> @@ -467,6 +465,8 @@ void qcom_pmic_typec_pdphy_stop(struct pmic_typec_pdphy *pmic_typec_pdphy)
> disable_irq(pmic_typec_pdphy->irq_data[i].irq);
>
> qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy);
> +
> + regulator_disable(pmic_typec_pdphy->vdd_pdphy);
> }
>
> struct pmic_typec_pdphy *qcom_pmic_typec_pdphy_alloc(struct device *dev)
>
> ---
> base-commit: bbb9e06d2c6435af9c62074ad7048910eeb2e7bc
> change-id: 20230822-qcom-tcpc-d41954ac65fa
>
> Best regards,