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

Commit 13b3ebfd 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: Rename sdm845-usb.dtsi to sdm845-670-usb-common.dtsi"

parents 0e9f61c4 507936cf

arch/arm64/boot/dts/qcom/sdm670-pmic-overlay.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -380,5 +380,8 @@ 
};



&usb0 {

	extcon = <&pm660_pdphy>, <&pm660_pdphy>, <&eud>;

	extcon = <&pm660_pdphy>, <&pm660_pdphy>, <&eud>,

					<&pm660_charger>, <&pm660_charger>;

	vbus_dwc3-supply = <&smb2_vbus>;

	qcom,no-vbus-vote-with-type-C;

};

arch/arm64/boot/dts/qcom/sdm670-usb.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 * GNU General Public License for more details.

 */



#include "sdm845-usb.dtsi"

#include "sdm845-670-usb-common.dtsi"



&soc {

	/delete-node/ ssusb@a800000;
@@ -29,7 +29,7 @@ 
&usb0 {

	/delete-property/ iommus;

	/delete-property/ qcom,smmu-s1-bypass;

	extcon = <0>, <0>, <0> /* <&eud> */;

	extcon = <0>, <0>, <&eud>, <0>, <0>;

};



&qusb_phy0 {

arch/arm64/boot/dts/qcom/sdm845-usb.dtsi→arch/arm64/boot/dts/qcom/sdm845-670-usb-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;

		qcom,num-gsi-evt-buffs = <0x3>;

		qcom,use-pdc-interrupts;

		extcon = <0>, <0>, <&eud>;

		extcon = <0>, <0>, <&eud>, <0>, <0>;



		clocks = <&clock_gcc GCC_USB30_PRIM_MASTER_CLK>,

			 <&clock_gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,

arch/arm64/boot/dts/qcom/sdm845.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -4052,7 +4052,7 @@ 
#include "sdm845-pcie.dtsi"

#include "sdm845-audio.dtsi"

#include "sdm845-gpu.dtsi"

#include "sdm845-usb.dtsi"

#include "sdm845-670-usb-common.dtsi"



&pm8998_temp_alarm {

	cooling-maps {