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

Commit adadf847 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: move VFE QOS,VBIF,DS to version specific DT"

parents c8b9e2bd db024e7b

Documentation/devicetree/bindings/media/video/msm-vfe.txt

+45 −1
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ Required properties: 
- ds-settings: danger/safe values to be written to registers (optional)

  NOTE: For all qos*, vbif*, ds* parameters, same SoC can have different

  hardware versions with different entries/registers/settings. They can be

  specified by adding version to the string e.g. qos-v2-settings.

  specified by adding version to the string e.g. qos-v2-settings. Also

  different SoC can have same hardware version and still different QOS, VBIF,

  and DS parameters. In this case they are exported if separate SoC version

  specific dts files.



Example:
@@ -80,3 +83,44 @@ Example: 
                0x44441111 0x44441111 0x44441111

                0x44441111 0x00000103>;

   };



In version specific file one needs to move only entries that differ between

SoC versions with same VFE HW version:



	&vfe0 {

		qos-entries = <8>;

		qos-regs = <0x378 0x37C 0x380 0x384 0x388 0x38C

				0x390 0x394>;

		qos-settings = <0xAAA9AAA9

			0xAAA9AAA9

			0xAAA9AAA9

			0xAAA9AAA9

			0xAAA9AAA9

			0xAAA9AAA9

			0xAAA9AAA9

			0x0001AAA9>;

		vbif-entries = <1>;

		vbif-regs = <0x124>;

		vbif-settings = <0x3>;

		ds-entries = <17>;

		ds-regs = <0xBD8 0xBDC 0xBE0 0xBE4 0xBE8

			0xBEC 0xBF0 0xBF4 0xBF8 0xBFC 0xC00

			0xC04 0xC08 0xC0C 0xC10 0xC14 0xC18>;

		ds-settings = <0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x44441111

			0x00000103>;

	};

arch/arm/boot/dts/qcom/msm8994-camera-v1.dtsi

0 → 100644
+88 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&vfe0 {

	qos-entries = <8>;

	qos-regs = <0x378 0x37C 0x380 0x384 0x388 0x38C

			0x390 0x394>;

	qos-settings = <0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0x0001AAA9>;

	vbif-entries = <1>;

	vbif-regs = <0x124>;

	vbif-settings = <0x3>;

	ds-entries = <17>;

	ds-regs = <0xBD8 0xBDC 0xBE0 0xBE4 0xBE8

		0xBEC 0xBF0 0xBF4 0xBF8 0xBFC 0xC00

		0xC04 0xC08 0xC0C 0xC10 0xC14 0xC18>;

	ds-settings = <0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x00000103>;

};



&vfe1 {

	qos-entries = <8>;

	qos-regs = <0x378 0x37C 0x380 0x384 0x388 0x38C

			0x390 0x394>;

	qos-settings = <0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0x0001AAA9>;

	vbif-entries = <1>;

	vbif-regs = <0x124>;

	vbif-settings = <0x3>;

	ds-entries = <17>;

	ds-regs = <0xBD8 0xBDC 0xBE0 0xBE4 0xBE8

		0xBEC 0xBF0 0xBF4 0xBF8 0xBFC 0xC00

		0xC04 0xC08 0xC0C 0xC10 0xC14 0xC18>;

	ds-settings = <0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x44441111

		0x00000103>;

};

arch/arm/boot/dts/qcom/msm8994-camera-v2.dtsi

0 → 100644
+88 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&vfe0 {

	qos-entries = <8>;

	qos-regs = <0x378 0x37C 0x380 0x384 0x388 0x38C

			0x390 0x394>;

	qos-settings = <0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0x0001AAA9>;

	vbif-entries = <1>;

	vbif-regs = <0x124>;

	vbif-settings = <0x3>;

	ds-entries = <17>;

	ds-regs = <0xBD8 0xBDC 0xBE0 0xBE4 0xBE8

		0xBEC 0xBF0 0xBF4 0xBF8 0xBFC 0xC00

		0xC04 0xC08 0xC0C 0xC10 0xC14 0xC18>;

	ds-settings = <0x44441111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0x00000103>;

};



&vfe1 {

	qos-entries = <8>;

	qos-regs = <0x378 0x37C 0x380 0x384 0x388 0x38C

			0x390 0x394>;

	qos-settings = <0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0xAAA9AAA9

		0x0001AAA9>;

	vbif-entries = <1>;

	vbif-regs = <0x124>;

	vbif-settings = <0x3>;

	ds-entries = <17>;

	ds-regs = <0xBD8 0xBDC 0xBE0 0xBE4 0xBE8

		0xBEC 0xBF0 0xBF4 0xBF8 0xBFC 0xC00

		0xC04 0xC08 0xC0C 0xC10 0xC14 0xC18>;

	ds-settings = <0x44441111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0xCCCC1111

		0x00000103>;

};

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

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ 
			320000000 0 0>;

	};



	qcom,vfe@fda10000 {

	vfe0: qcom,vfe@fda10000 {

		cell-index = <0>;

		compatible = "qcom,vfe46";

		reg = <0xfda10000 0x1000>,
@@ -260,7 +260,7 @@ 


	};



	qcom,vfe@fda14000 {

	vfe1: qcom,vfe@fda14000 {

		cell-index = <1>;

		compatible = "qcom,vfe46";

		reg = <0xfda14000 0x1000>,

arch/arm/boot/dts/qcom/msm8994-v1.dtsi

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

#include "msm8994-coresight-v1.dtsi"

#include "msm8994-v1-pm.dtsi"

#include "msm8994-camera-v1.dtsi"



/ {

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