Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f228616 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: update TypeC SSMUX gpio flag on MSMTITANIUM"

parents 7182ac75 2c0d0c8b

arch/arm/boot/dts/qcom/msmtitanium-cdp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ 


&pmtitanium_typec {

	ss-mux-supply = <&pmtitanium_l13>;

	qcom,ssmux-gpio = <&tlmm 139 0>;

	qcom,ssmux-gpio = <&tlmm 139 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&typec_ssmux_config>;

};

arch/arm/boot/dts/qcom/msmtitanium-mtp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ 


&pmtitanium_typec {

	ss-mux-supply = <&pmtitanium_l13>;

	qcom,ssmux-gpio = <&tlmm 139 0>;

	qcom,ssmux-gpio = <&tlmm 139 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&typec_ssmux_config>;

};

arch/arm/boot/dts/qcom/msmtitanium-qrd.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 


&pmtitanium_typec {

	ss-mux-supply = <&pmtitanium_l13>;

	qcom,ssmux-gpio = <&tlmm 139 0>;

	qcom,ssmux-gpio = <&tlmm 139 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&typec_ssmux_config>;

};

arch/arm/boot/dts/qcom/msmtitanium.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "skeleton64.dtsi"

#include <dt-bindings/clock/msm-clocks-titanium.h>

#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "Qualcomm Technologies, Inc. MSM Titanium";