> Both devices share the pinctrl configuration. LGTM. Reviewed-by: Petr Vorel <[email protected]>
Kind regards, Petr > > Signed-off-by: David Heidelberg <[email protected]> > --- > arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts | 18 ------------------ > arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 16 ++++++++++++++++ > 2 files changed, 16 insertions(+), 18 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts > b/arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts > index fa89be500fb85..a000c75494f1c 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts > @@ -61,29 +61,11 @@ &mdss_dsi0_out { > }; > > &mdss_dsi0_phy { > vdds-supply = <&vdda_mipi_dsi0_pll>; > > status = "okay"; > }; > > -&tlmm { > - panel_default: panel-default-state { > - reset-pins { > - pins = "gpio6"; > - function = "gpio"; > - drive-strength = <8>; > - bias-disable; > - }; > - > - te-pins { > - pins = "gpio12"; > - function = "mdp_vsync"; > - drive-strength = <2>; > - bias-pull-down; > - }; > - }; > -}; > - > &wifi { > qcom,calibration-variant = "Google_blueline"; > }; > diff --git a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi > b/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi > index f1379857e2742..d54cb47cdf95b 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi > @@ -473,16 +473,32 @@ &qup_uart9_tx { > drive-strength = <2>; > bias-disable; > }; > > &tlmm { > gpio-reserved-ranges = < 0 4>, /* SPI (Intel MNH Pixel Visual Core) */ > <81 4>; /* SPI (most likely Fingerprint Cards > FPC1075) */ > > + panel_default: panel-default-state { > + reset-pins { > + pins = "gpio6"; > + function = "gpio"; > + drive-strength = <8>; > + bias-disable; > + }; > + > + te-pins { > + pins = "gpio12"; > + function = "mdp_vsync"; > + drive-strength = <2>; > + bias-pull-down; > + }; > + }; > + > nfc_default: nfc-default-state { > enable-pins { > pins = "gpio25"; > function = "gpio"; > drive-strength = <2>; > bias-pull-down; > }; > >
