diff mbox series

[5/8] arm64: dts: qcom: msm8998-oneplus-cheeseburger: revert "fix backlight pin function"

Message ID 20230312183622.460488-5-krzysztof.kozlowski@linaro.org
State New
Headers
Series [1/8] arm64: dts: qcom: sda660-inforce: correct key node name |

Commit Message

Krzysztof Kozlowski March 12, 2023, 6:36 p.m. UTC 
  This reverts commit 46546f28825cf3a5ef6873b9cf947cd85c8a7258 because it
mistakenly took PMIC pinctrl/GPIO as TLMM.  The TLMM pinctrl uses "gpio"
function, but PMIC uses "normal", so original code was correct:

  msm8998-oneplus-cheeseburger.dtb: pmic@2: gpio@c000:button-backlight-state: 'oneOf' conditional failed, one must be fixed:
    'gpio' is not one of ['normal', 'paired', 'func1', 'func2', 'dtest1', 'dtest2', 'dtest3', 'dtest4', 'func3', 'func4']

Fixes: 46546f28825c ("arm64: dts: qcom: msm8998-oneplus-cheeseburger: fix backlight pin function")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

Eh, embarrassing. I would say to myself - use dtbs_check on patches, but
I think that time there were too many errors coming from Qualcomm
pinctrl bindings.
---
 arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Konrad Dybcio March 13, 2023, 8:50 a.m. UTC | #1 
On 12.03.2023 19:36, Krzysztof Kozlowski wrote:
> This reverts commit 46546f28825cf3a5ef6873b9cf947cd85c8a7258 because it
> mistakenly took PMIC pinctrl/GPIO as TLMM.  The TLMM pinctrl uses "gpio"
> function, but PMIC uses "normal", so original code was correct:
> 
>   msm8998-oneplus-cheeseburger.dtb: pmic@2: gpio@c000:button-backlight-state: 'oneOf' conditional failed, one must be fixed:
>     'gpio' is not one of ['normal', 'paired', 'func1', 'func2', 'dtest1', 'dtest2', 'dtest3', 'dtest4', 'func3', 'func4']
> 
> Fixes: 46546f28825c ("arm64: dts: qcom: msm8998-oneplus-cheeseburger: fix backlight pin function")
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---
> 
> Eh, embarrassing. I would say to myself - use dtbs_check on patches, but
> I think that time there were too many errors coming from Qualcomm
> pinctrl bindings.
It's good that we have schema at all though.. It helps a lot!

> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts b/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
> index d36b36af49d0..fac8b3510cd3 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
> @@ -34,7 +34,7 @@ led-keypad-backlight {
>  &pmi8998_gpios {
>  	button_backlight_default: button-backlight-state {
>  		pins = "gpio5";
> -		function = "gpio";
> +		function = "normal";
>  		bias-pull-down;
>  		qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
>  	};
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts b/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
index d36b36af49d0..fac8b3510cd3 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
@@ -34,7 +34,7 @@  led-keypad-backlight {
 &pmi8998_gpios {
 	button_backlight_default: button-backlight-state {
 		pins = "gpio5";
-		function = "gpio";
+		function = "normal";
 		bias-pull-down;
 		qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
 	};