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

Commit 23c93cdc 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: Fix 8952 vfe nodes"

parents bda8711c cd722250

arch/arm/boot/dts/qcom/msm8952-camera.dtsi

+102 −101
Original line number Diff line number Diff line
@@ -195,10 +195,6 @@ 
			"INIT_RATE", "NO_SET_RATE", "NO_SET_RATE";

	};



	qcom,vfe {

		compatible = "qcom,vfe";

		ranges;



	vfe0: qcom,vfe0@1b10000 {

		cell-index = <0>;

		compatible = "qcom,vfe40";
@@ -222,8 +218,8 @@ 
			"bus_clk", "iface_ahb_clk";

		qcom,clock-rates = <0 0 266670000 0 0 0 0 0>;

		qos-entries = <8>;

			qos-regs = <0x2C4 0x2C8 0x2CC 0x2D0 0x2D4 0x2D8

				0x2DC 0x2E0>;

		qos-regs = <0x2c4 0x2c8 0x2cc 0x2d0 0x2d4 0x2d8

			0x2dc 0x2e0>;

		qos-settings = <0xA555A555

			0xA555A555	0xA555A555

			0xA555A555	0xA555A555
@@ -233,9 +229,9 @@ 
		vbif-regs = <0x124>;

		vbif-settings = <0x3>;

		ds-entries = <17>;

			ds-regs = <0x988 0x98C 0x990 0x994 0x998

				0x99C 0x9A0 0x9A4 0x9A8 0x9AC 0x9B0

				0x9B4 0x9B8 0x9BC 0x9C0 0x9C4 0x9C8>;

		ds-regs = <0x988 0x98c 0x990 0x994 0x998

			0x99c 0x9a0 0x9a4 0x9a8 0x9ac 0x9b0

			0x9b4 0x9b8 0x9bc 0x9c0 0x9c4 0x9c8>;

		ds-settings = <0xCCCC1111

			0xCCCC1111	0xCCCC1111

			0xCCCC1111	0xCCCC1111
@@ -272,8 +268,8 @@ 
			"bus_clk", "iface_ahb_clk";

		qcom,clock-rates = <0 0 266670000 0 0 0 0 0>;

		qos-entries = <8>;

			qos-regs = <0x2C4 0x2C8 0x2CC 0x2D0 0x2D4 0x2D8

				0x2DC 0x2E0>;

		qos-regs = <0x2c4 0x2c8 0x2cc 0x2d0 0x2d4 0x2d8

			0x2dc 0x2e0>;

		qos-settings = <0xA555A555

			0xA555A555	0xA555A555

			0xA555A555	0xA555A555
@@ -283,9 +279,9 @@ 
		vbif-regs = <0x124>;

		vbif-settings = <0x3>;

		ds-entries = <17>;

			ds-regs = <0x988 0x98C 0x990 0x994 0x998

				0x99C 0x9A0 0x9A4 0x9A8 0x9AC 0x9B0

				0x9B4 0x9B8 0x9BC 0x9C0 0x9C4 0x9C8>;

		ds-regs = <0x988 0x98c 0x990 0x994 0x998

			0x99c 0x9a0 0x9a4 0x9a8 0x9ac 0x9b0

			0x9b4 0x9b8 0x9bc 0x9c0 0x9c4 0x9c8>;

		ds-settings = <0xCCCC1111

			0xCCCC1111	0xCCCC1111

			0xCCCC1111	0xCCCC1111
@@ -298,7 +294,12 @@ 
		max-clk-nominal = <308570000>;

		max-clk-turbo = <360000000>;

	};



	qcom,vfe {

		compatible = "qcom,vfe";

		num_child = <2>;

	};



	qcom,cam_smmu {

		status = "ok";

		compatible = "qcom,msm-cam-smmu";