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

Commit 5a83eb26 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: add vfe1 node on msm8937"

parents b85258ab 1cff7c27

arch/arm/boot/dts/qcom/msm8937-bus.dtsi

+18 −5
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ 
			qcom,qport = <6>;

			qcom,qos-mode = "bypass";

			qcom,connections = <&slv_snoc_bimc_2>;

			qcom,bus-dev = <&fab_snoc>;

			qcom,bus-dev = <&fab_snoc_mm>;

			qcom,mas-rpm-id = <ICBID_MASTER_JPEG>;

		};
@@ -323,7 +323,7 @@ 
			qcom,qport = <7>;

			qcom,qos-mode = "bypass";

			qcom,connections = <&slv_snoc_bimc_0>;

			qcom,bus-dev = <&fab_snoc>;

			qcom,bus-dev = <&fab_snoc_mm>;

			qcom,mas-rpm-id = <ICBID_MASTER_MDP>;

		};
@@ -350,7 +350,7 @@ 
			qcom,qport = <8>;

			qcom,qos-mode = "bypass";

			qcom,connections = <&slv_snoc_bimc_2>;

			qcom,bus-dev = <&fab_snoc>;

			qcom,bus-dev = <&fab_snoc_mm>;

			qcom,mas-rpm-id = <ICBID_MASTER_VIDEO>;

		};
@@ -363,10 +363,23 @@ 
			qcom,qport = <9>;

			qcom,qos-mode = "bypass";

			qcom,connections = <&slv_snoc_bimc_0>;

			qcom,bus-dev = <&fab_snoc>;

			qcom,bus-dev = <&fab_snoc_mm>;

			qcom,mas-rpm-id = <ICBID_MASTER_VFE>;

		};



		mas_vfe1: mas-vfe1 {

			cell-id = <MSM_BUS_MASTER_VFE1>;

			label = "mas-vfe1";

			qcom,buswidth = <16>;

			qcom,agg-ports = <1>;

			qcom,ap-owned;

			qcom,qport = <13>;

			qcom,qos-mode = "bypass";

			qcom,connections = <&slv_snoc_bimc_0>;

			qcom,bus-dev = <&fab_snoc_mm>;

			qcom,mas-rpm-id = <ICBID_MASTER_VFE1>;

		};



		mas_cpp: mas-cpp {

			cell-id = <MSM_BUS_MASTER_CPP>;

			label = "mas-cpp";
@@ -376,7 +389,7 @@ 
			qcom,qport = <12>;

			qcom,qos-mode = "bypass";

			qcom,connections = <&slv_snoc_bimc_2>;

			qcom,bus-dev = <&fab_snoc>;

			qcom,bus-dev = <&fab_snoc_mm>;

			qcom,mas-rpm-id = <ICBID_MASTER_CPP>;

		};