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

Commit ffeb8875 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm-camera:isp: Obtain QoS and D/S information from dtsi files"

parents 95f7929d e3327f54

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

+51 −0
Original line number Diff line number Diff line
@@ -16,6 +16,18 @@ Required properties: 
  property defined.

    - "vfe" - Required.

- vdd-supply: phandle to GDSC regulator controlling VFE core.

- qos-entries: number of QoS registers to program

- qos-regs: relative address offsets of QoS registers

- qos-settings: QoS values to be written to QoS registers

- vbif-entries - number of VBIF registers to program (optional)

- vbif-regs: relative address offsets of VBIF registers (optional)

- vbif-settings: VBIF values to be written to VBIF registers (optional)

- ds-entries: number danger/safe registers to program (optional)

- ds-regs: relative address offsets of danger/safe registers (optional)

- 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.



Example:
@@ -27,4 +39,43 @@ Example: 
       interrupts = <0 58 0>;

       interrupt-names = "vfe";

       vdd-supply = <&gdsc_vfe>;

       qos-entries = <8>;

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

               0x2DC 0x2E0>;

       qos-settings = <0xAAAAAAAA 0xAAAAAAAA 0xAAAAAAAA

               0xAAAAAAAA 0xAAAAAAAA 0xAAAAAAAA

               0xAAAAAAAA 0x0002AAAA>;

       qos-v2-settings = <0xAAA9AAA9 0xAAA9AAA9 0xAAA9AAA9

               0xAAA9AAA9 0xAAA9AAA9 0xAAA9AAA9

               0xAAA9AAA9 0x0001AAA9>;

       qos-v3-settings = <0xAAA9AAA9 0xAAA9AAA9 0xAAA9AAA9

               0xAAA9AAA9 0xAAA9AAA9 0xAAA9AAA9

               0xAAA9AAA9 0x0001AAA9>;

       vbif-entries = <17>;

       vbif-regs = <0x4 0xB0 0xB4 0xB8 0xC0 0xC4 0xC8 0xD0

               0xD4 0xD8 0xDC 0xF0 0x178 0x17C 0x124 0x160

               0x164>;

       vbif-settings = <0x1 0x01010101 0x01010101 0x10010110

               0x10101010 0x10101010 0x10101010 0x00001010

               0x00001010 0x00000707 0x00000707 0x00000030

               0x00000FFF 0x0FFF0FFF 0x00000001 0x22222222

               0x00002222>;

       vbif-v2-entries = <16>;

       vbif-v2-regs = <0x4 0xB0 0xB4 0xB8 0xC0 0xC4 0xC8 0xD0

               0xD4 0xD8 0xF0 0x178 0x17C 0x124 0x160

               0x164>;

       vbif-v2-settings = <0x1 0x10101010 0x10101010 0x10101010

                0x10101010 0x10101010 0x10101010 0x00000010

                0x00000010 0x00000707 0x00000010 0x00000FFF

                0x0FFF0FFF 0x00000003 0x22222222 0x00002222>;

       ds-entries = <17>;

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

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

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

       ds-settings = <0x44441111 0x44441111 0x44441111

                0x44441111 0x44441111 0x44441111

                0x44441111 0x44441111 0x44441111

                0x44441111 0x44441111 0x44441111

                0x44441111 0x44441111 0x44441111

                0x44441111 0x00000103>;

   };

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

+16 −0
Original line number Diff line number Diff line
@@ -101,6 +101,22 @@ 
			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",

			"bus_clk";

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

		qos-entries = <8>;

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

				0x2DC 0x2E0>;

		qos-settings = <0xAAAAAAAA 0xAAAAAAAA 0xAAAAAAAA

				0xAAAAAAAA 0xAAAAAAAA 0xAAAAAAAA

				0xAAAAAAAA 0x0002AAAA>;

		qos-v2-settings = <0xAAAAAAAA 0xAAAAAAAA 0xAAAAAAAA

				0xAAAAAAAA 0xAAAAAAAA 0xAAAAAAAA

				0xAAAAAAAA 0x0002AAAA>;

		vbif-entries = <11>;

		vbif-regs = <0xB0 0xB4 0xC0 0xC4 0xD0 0xD4 0xD8

				0x178 0x17C 0x124 0x160>;

		vbif-settings = <0x10101010 0x10101010 0x10101010

				0x10101010 0x00000010 0x00000010

				0x00000707 0x000000FF 0x00FF00FF

				0x00000003 0x22222222>;

	};



	qcom,jpeg@fda1c000 {

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

+6 −0
Original line number Diff line number Diff line
@@ -172,6 +172,12 @@ 
			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",

			"bus_clk", "camss_ahb_clk";

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

		qos-entries = <8>;

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

				0x2DC 0x2E0>;

		qos-settings = <0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0x0001AAA5>;

		};



	qcom,jpeg@1b1c000 {

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

+19 −0
Original line number Diff line number Diff line
@@ -197,6 +197,25 @@ 
			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",

			"bus_clk", "camss_ahb_clk", "ispif_ahb_clk";

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

		qos-entries = <8>;

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

				0x2DC 0x2E0>;

		qos-settings = <0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0x0001AAA5>;

		vbif-entries = <2>;

		vbif-regs = <0x30 0x34>;

		vbif-settings = <0x00000fff 0x00555000>;

		ds-entries = <17>;

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

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

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

		ds-settings = <0x44441111 0x44441111 0x44441111

				0x44441111 0x44441111 0x44441111

				0x44441111 0x44441111 0x44441111

				0x44441111 0x44441111 0x44441111

				0x44441111 0x44441111 0x44441111

				0x44441111 0x00000103>;

		};



	qcom,jpeg@1b1c000 {

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

+29 −0
Original line number Diff line number Diff line
@@ -146,6 +146,35 @@ 
			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",

			"bus_clk";

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

		qos-entries = <8>;

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

				0x2DC 0x2E0>;

		qos-settings = <0xAAAAAAAA 0xAAAAAAAA 0xAAAAAAAA

				0xAAAAAAAA 0xAAAAAAAA 0xAAAAAAAA

				0xAAAAAAAA 0x0002AAAA>;

		qos-v2-settings = <0xAAA9AAA9 0xAAA9AAA9 0xAAA9AAA9

				0xAAA9AAA9 0xAAA9AAA9 0xAAA9AAA9

				0xAAA9AAA9 0x0001AAA9>;

		qos-v3-settings = <0xAAA9AAA9 0xAAA9AAA9 0xAAA9AAA9

				0xAAA9AAA9 0xAAA9AAA9 0xAAA9AAA9

				0xAAA9AAA9 0x0001AAA9>;

		vbif-entries = <17>;

		vbif-regs = <0x4 0xB0 0xB4 0xB8 0xC0 0xC4 0xC8 0xD0

				0xD4 0xD8 0xDC 0xF0 0x178 0x17C 0x124 0x160

				0x164>;

		vbif-settings = <0x1 0x01010101 0x01010101 0x10010110

				0x10101010 0x10101010 0x10101010 0x00001010

				0x00001010 0x00000707 0x00000707 0x00000030

				0x00000FFF 0x0FFF0FFF 0x00000001 0x22222222

				0x00002222>;

		vbif-v2-entries = <16>;

		vbif-v2-regs = <0x4 0xB0 0xB4 0xB8 0xC0 0xC4 0xC8 0xD0

				0xD4 0xD8 0xF0 0x178 0x17C 0x124 0x160

				0x164>;

		vbif-v2-settings = <0x1 0x10101010 0x10101010 0x10101010

				0x10101010 0x10101010 0x10101010 0x00000010

				0x00000010 0x00000707 0x00000010 0x00000FFF

				0x0FFF0FFF 0x00000003 0x22222222 0x00002222>;

	};



	qcom,vfe@fda14000 {