From: David Heidelberg <[email protected]> As these pins won't be used outside the group, let's group them.
Reviewed-by: Dmitry Baryshkov <[email protected]> Signed-off-by: David Heidelberg <[email protected]> --- .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 46 +++++++++++----------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index d619b710c63fe..d59a5e8cdeb2c 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -450,7 +450,7 @@ display_panel: panel@0 { reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; - pinctrl-0 = <&panel_reset_pins &panel_te_pin &panel_esd_pin>; + pinctrl-0 = <&panel_default>; port { panel_in: endpoint { @@ -841,32 +841,34 @@ alert_slider_default: alert-slider-default-state { bias-disable; }; - ts_default_pins: ts-int-state { - pins = "gpio99", "gpio125"; - function = "gpio"; - drive-strength = <16>; - bias-pull-up; - }; + panel_default: panel-default-state { + esd-pins { + pins = "gpio30"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; - panel_reset_pins: panel-reset-state { - pins = "gpio6"; - function = "gpio"; - drive-strength = <8>; - bias-disable; - }; + reset-pins { + pins = "gpio6"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; - panel_te_pin: panel-te-state { - pins = "gpio10"; - function = "mdp_vsync"; - drive-strength = <2>; - bias-disable; + te-pins { + pins = "gpio10"; + function = "mdp_vsync"; + drive-strength = <2>; + bias-disable; + }; }; - panel_esd_pin: panel-esd-state { - pins = "gpio30"; + ts_default_pins: ts-int-state { + pins = "gpio99", "gpio125"; function = "gpio"; - drive-strength = <2>; - bias-pull-down; + drive-strength = <16>; + bias-pull-up; }; speaker_default: speaker-default-state { -- 2.51.0
