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

Commit c5a1b133 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: Update QUPv3 core master bus id for SM6150"

parents 24e2440a ee4ee46b

arch/arm64/boot/dts/qcom/sm6150-bus.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ 
		};



		mas_qhm_qup1: mas-qhm-qup1 {

			cell-id = <MSM_BUS_MASTER_BLSP_1>;

			cell-id = <MSM_BUS_MASTER_QUP_1>;

			label = "mas-qhm-qup1";

			qcom,buswidth = <4>;

			qcom,agg-ports = <1>;

arch/arm64/boot/dts/qcom/sm6150-qupv3.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
	qupv3_0: qcom,qupv3_0_geni_se@8c0000 {

		compatible = "qcom,qupv3-geni-se";

		reg = <0x8c0000 0x6000>;

		qcom,bus-mas-id = <MSM_BUS_MASTER_BLSP_1>;

		qcom,bus-mas-id = <MSM_BUS_MASTER_QUP_0>;

		qcom,bus-slv-id = <MSM_BUS_SLAVE_EBI_CH0>;

		qcom,iommu-s1-bypass;
@@ -144,7 +144,7 @@ 
	qupv3_1: qcom,qupv3_1_geni_se@ac0000 {

		compatible = "qcom,qupv3-geni-se";

		reg = <0xac0000 0x6000>;

		qcom,bus-mas-id = <MSM_BUS_MASTER_BLSP_2>;

		qcom,bus-mas-id = <MSM_BUS_MASTER_QUP_1>;

		qcom,bus-slv-id = <MSM_BUS_SLAVE_EBI_CH0>;

		qcom,iommu-s1-bypass;