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

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

Merge "UPSTREAM: Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into msm-4.9 08/21"

parents d52440df 6ab799b4

Documentation/devicetree/bindings/media/video/msm-cam-icp.txt

+7 −8
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ of A5, IPE and BPS devices present on the hardware. 
  Definition: Should be "qcom,cam-icp".



- compat-hw-name



  Usage: required

  Value type: <string>

  Definition: Should be "qcom,a5" or "qcom,ipe".

  Definition: Should be "qcom,a5" or "qcom,ipe0" or "qcom,ipe1" or "qcom,bps".



- num-a5

  Usage: required
@@ -63,7 +62,7 @@ and name of firmware image. 
- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,cam-cdm-intf".

  Definition: Should be "qcom,cam-a5" or "qcom,cam-ipe" or "qcom,cam-bps".



- reg-names

  Usage: optional
@@ -128,9 +127,9 @@ and name of firmware image. 
  Definition: Name of firmware image.



Examples:

a5: qcom,a5@a10000 {

a5: qcom,a5@ac00000 {

	cell-index = <0>;

	compatible = "qcom,cam_a5";

	compatible = "qcom,cam-a5";

	reg = <0xac00000 0x6000>,

		<0xac10000 0x8000>,

		<0xac18000 0x3000>;
@@ -169,7 +168,7 @@ a5: qcom,a5@a10000 { 


qcom,ipe0 {

	cell-index = <0>;

	compatible = "qcom,cam_ipe";

	compatible = "qcom,cam-ipe";

	regulator-names = "ipe0-vdd";

	ipe0-vdd-supply = <&ipe_0_gdsc>;

	clock-names = "ipe_0_ahb_clk",
@@ -189,7 +188,7 @@ qcom,ipe0 { 


qcom,ipe1 {

	cell-index = <1>;

	compatible = "qcom,cam_ipe";

	compatible = "qcom,cam-ipe";

	regulator-names = "ipe1-vdd";

	ipe1-vdd-supply = <&ipe_1_gdsc>;

	clock-names = "ipe_1_ahb_clk",
@@ -209,7 +208,7 @@ qcom,ipe1 { 


bps: qcom,bps {

	cell-index = <0>;

	compatible = "qcom,cam_bps";

	compatible = "qcom,cam-bps";

	regulator-names = "bps-vdd";

	bps-vdd-supply = <&bps_gdsc>;

	clock-names = "bps_ahb_clk",

Documentation/devicetree/bindings/media/video/msm-cam-smmu.txt

+7 −1
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ Third Level Node - CAM SMMU memory map device 
      - Scratch region: 0x02

      - IO region: 0x03



- iova-granularity

  Usage: optional

  Value type: <u32>

  Definition: Should specify IOVA granularity for shared memory region.



Example:

	qcom,cam_smmu@0 {

		compatible = "qcom,msm-cam-smmu";
@@ -114,6 +119,7 @@ Example: 
				        iova-region-start = <0x7400000>;

				        iova-region-len = <0x6400000>;

					iova-region-id = <0x1>;

					iova-granularity = <0x15>;

					status = "ok";

				};

arch/arm64/boot/dts/qcom/sdm845-camera.dtsi

+48 −48
Original line number Diff line number Diff line
@@ -163,62 +163,62 @@ 
					"CCI_I2C_CLK1";



		i2c_freq_100Khz: qcom,i2c_standard_mode {

			qcom,hw-thigh = <201>;

			qcom,hw-tlow = <174>;

			qcom,hw-tsu-sto = <204>;

			qcom,hw-tsu-sta = <231>;

			qcom,hw-thd-dat = <22>;

			qcom,hw-thd-sta = <162>;

			qcom,hw-tbuf = <227>;

			qcom,hw-scl-stretch-en = <0>;

			qcom,hw-trdhld = <6>;

			qcom,hw-tsp = <3>;

			qcom,cci-clk-src = <37500000>;

			hw-thigh = <201>;

			hw-tlow = <174>;

			hw-tsu-sto = <204>;

			hw-tsu-sta = <231>;

			hw-thd-dat = <22>;

			hw-thd-sta = <162>;

			hw-tbuf = <227>;

			hw-scl-stretch-en = <0>;

			hw-trdhld = <6>;

			hw-tsp = <3>;

			cci-clk-src = <37500000>;

			status = "ok";

		};



		i2c_freq_400Khz: qcom,i2c_fast_mode {

			qcom,hw-thigh = <38>;

			qcom,hw-tlow = <56>;

			qcom,hw-tsu-sto = <40>;

			qcom,hw-tsu-sta = <40>;

			qcom,hw-thd-dat = <22>;

			qcom,hw-thd-sta = <35>;

			qcom,hw-tbuf = <62>;

			qcom,hw-scl-stretch-en = <0>;

			qcom,hw-trdhld = <6>;

			qcom,hw-tsp = <3>;

			qcom,cci-clk-src = <37500000>;

			hw-thigh = <38>;

			hw-tlow = <56>;

			hw-tsu-sto = <40>;

			hw-tsu-sta = <40>;

			hw-thd-dat = <22>;

			hw-thd-sta = <35>;

			hw-tbuf = <62>;

			hw-scl-stretch-en = <0>;

			hw-trdhld = <6>;

			hw-tsp = <3>;

			cci-clk-src = <37500000>;

			status = "ok";

		};



		i2c_freq_custom: qcom,i2c_custom_mode {

			qcom,hw-thigh = <38>;

			qcom,hw-tlow = <56>;

			qcom,hw-tsu-sto = <40>;

			qcom,hw-tsu-sta = <40>;

			qcom,hw-thd-dat = <22>;

			qcom,hw-thd-sta = <35>;

			qcom,hw-tbuf = <62>;

			qcom,hw-scl-stretch-en = <1>;

			qcom,hw-trdhld = <6>;

			qcom,hw-tsp = <3>;

			qcom,cci-clk-src = <37500000>;

			hw-thigh = <38>;

			hw-tlow = <56>;

			hw-tsu-sto = <40>;

			hw-tsu-sta = <40>;

			hw-thd-dat = <22>;

			hw-thd-sta = <35>;

			hw-tbuf = <62>;

			hw-scl-stretch-en = <1>;

			hw-trdhld = <6>;

			hw-tsp = <3>;

			cci-clk-src = <37500000>;

			status = "ok";

		};



		i2c_freq_1Mhz: qcom,i2c_fast_plus_mode {

			qcom,hw-thigh = <16>;

			qcom,hw-tlow = <22>;

			qcom,hw-tsu-sto = <17>;

			qcom,hw-tsu-sta = <18>;

			qcom,hw-thd-dat = <16>;

			qcom,hw-thd-sta = <15>;

			qcom,hw-tbuf = <24>;

			qcom,hw-scl-stretch-en = <0>;

			qcom,hw-trdhld = <3>;

			qcom,hw-tsp = <3>;

			qcom,cci-clk-src = <37500000>;

			hw-thigh = <16>;

			hw-tlow = <22>;

			hw-tsu-sto = <17>;

			hw-tsu-sta = <18>;

			hw-thd-dat = <16>;

			hw-thd-sta = <15>;

			hw-tbuf = <24>;

			hw-scl-stretch-en = <0>;

			hw-trdhld = <3>;

			hw-tsp = <3>;

			cci-clk-src = <37500000>;

			status = "ok";

		};

	};
@@ -795,7 +795,7 @@ 


	cam_a5: qcom,a5@ac00000 {

		cell-index = <0>;

		compatible = "qcom,cam_a5";

		compatible = "qcom,cam-a5";

		reg = <0xac00000 0x6000>,

			<0xac10000 0x8000>,

			<0xac18000 0x3000>;
@@ -832,7 +832,7 @@ 


	cam_ipe0: qcom,ipe0 {

		cell-index = <0>;

		compatible = "qcom,cam_ipe";

		compatible = "qcom,cam-ipe";

		regulator-names = "ipe0-vdd";

		ipe0-vdd-supply = <&ipe_0_gdsc>;

		clock-names = "ipe_0_ahb_clk",
@@ -853,7 +853,7 @@ 


	cam_ipe1: qcom,ipe1 {

		cell-index = <1>;

		compatible = "qcom,cam_ipe";

		compatible = "qcom,cam-ipe";

		regulator-names = "ipe1-vdd";

		ipe1-vdd-supply = <&ipe_1_gdsc>;

		clock-names = "ipe_1_ahb_clk",
@@ -874,7 +874,7 @@ 


	cam_bps: qcom,bps {

		cell-index = <0>;

		compatible = "qcom,cam_bps";

		compatible = "qcom,cam-bps";

		regulator-names = "bps-vdd";

		bps-vdd-supply = <&bps_gdsc>;

		clock-names = "bps_ahb_clk",

arch/arm64/boot/dts/qcom/sdm845-v2-camera.dtsi

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

 * Copyright (c) 2017, 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.

 */



&soc {

	cam_csiphy0: qcom,csiphy@ac65000 {

		cell-index = <0>;

		compatible = "qcom,csiphy-v1.0", "qcom,csiphy";

		reg = <0x0ac65000 0x1000>;

		reg-names = "csiphy";

		reg-cam-base = <0x65000>;

		interrupts = <0 477 0>;

		interrupt-names = "csiphy";

		regulator-names = "gdscr";

		gdscr-supply = <&titan_top_gdsc>;

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-dsi-vdd-supply = <&pm8998_l1>;

		clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,

			<&clock_camcc CAM_CC_SOC_AHB_CLK>,

			<&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,

			<&clock_camcc CAM_CC_CPAS_AHB_CLK>,

			<&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&clock_camcc CAM_CC_CSIPHY0_CLK>,

			<&clock_camcc CAM_CC_CSI0PHYTIMER_CLK_SRC>,

			<&clock_camcc CAM_CC_CSI0PHYTIMER_CLK>;

		clock-names = "camnoc_axi_clk",

			"soc_ahb_clk",

			"slow_ahb_src_clk",

			"cpas_ahb_clk",

			"cphy_rx_clk_src",

			"csiphy0_clk",

			"csi0phytimer_clk_src",

			"csi0phytimer_clk";

		clock-cntl-level = "turbo";

		clock-rates =

			<0 0 0 0 384000000 0 269333333 0>;

		status = "ok";

	};



	cam_csiphy1: qcom,csiphy@ac66000{

		cell-index = <1>;

		compatible = "qcom,csiphy-v1.0", "qcom,csiphy";

		reg = <0xac66000 0x1000>;

		reg-names = "csiphy";

		reg-cam-base = <0x66000>;

		interrupts = <0 478 0>;

		interrupt-names = "csiphy";

		regulator-names = "gdscr";

		gdscr-supply = <&titan_top_gdsc>;

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-dsi-vdd-supply = <&pm8998_l1>;

		clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,

			<&clock_camcc CAM_CC_SOC_AHB_CLK>,

			<&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,

			<&clock_camcc CAM_CC_CPAS_AHB_CLK>,

			<&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&clock_camcc CAM_CC_CSIPHY1_CLK>,

			<&clock_camcc CAM_CC_CSI1PHYTIMER_CLK_SRC>,

			<&clock_camcc CAM_CC_CSI1PHYTIMER_CLK>;

		clock-names = "camnoc_axi_clk",

			"soc_ahb_clk",

			"slow_ahb_src_clk",

			"cpas_ahb_clk",

			"cphy_rx_clk_src",

			"csiphy1_clk",

			"csi1phytimer_clk_src",

			"csi1phytimer_clk";

		clock-cntl-level = "turbo";

		clock-rates =

			<0 0 0 0 384000000 0 269333333 0>;



		status = "ok";

	};



	cam_csiphy2: qcom,csiphy@ac67000 {

		cell-index = <2>;

		compatible = "qcom,csiphy-v1.0", "qcom,csiphy";

		reg = <0xac67000 0x1000>;

		reg-names = "csiphy";

		reg-cam-base = <0x67000>;

		interrupts = <0 479 0>;

		interrupt-names = "csiphy";

		regulator-names = "gdscr";

		gdscr-supply = <&titan_top_gdsc>;

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-dsi-vdd-supply = <&pm8998_l1>;

		clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,

			<&clock_camcc CAM_CC_SOC_AHB_CLK>,

			<&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,

			<&clock_camcc CAM_CC_CPAS_AHB_CLK>,

			<&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&clock_camcc CAM_CC_CSIPHY2_CLK>,

			<&clock_camcc CAM_CC_CSI2PHYTIMER_CLK_SRC>,

			<&clock_camcc CAM_CC_CSI2PHYTIMER_CLK>;

		clock-names = "camnoc_axi_clk",

			"soc_ahb_clk",

			"slow_ahb_src_clk",

			"cpas_ahb_clk",

			"cphy_rx_clk_src",

			"csiphy2_clk",

			"csi2phytimer_clk_src",

			"csi2phytimer_clk";

		clock-cntl-level = "turbo";

		clock-rates =

			<0 0 0 0 384000000 0 269333333 0>;

		status = "ok";

	};



	cam_csiphy3: qcom,csiphy@ac68000 {

		cell-index = <3>;

		compatible = "qcom,csiphy-v1.0", "qcom,csiphy";

		reg = <0xac67000 0x1000>;

		reg-names = "csiphy";

		reg-cam-base = <0x68000>;

		interrupts = <0 448 0>;

		interrupt-names = "csiphy";

		regulator-names = "gdscr";

		gdscr-supply = <&titan_top_gdsc>;

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-dsi-vdd-supply = <&pm8998_l1>;

		clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,

			<&clock_camcc CAM_CC_SOC_AHB_CLK>,

			<&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,

			<&clock_camcc CAM_CC_CPAS_AHB_CLK>,

			<&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&clock_camcc CAM_CC_CSIPHY3_CLK>,

			<&clock_camcc CAM_CC_CSI3PHYTIMER_CLK_SRC>,

			<&clock_camcc CAM_CC_CSI3PHYTIMER_CLK>;

		clock-names = "camnoc_axi_clk",

			"soc_ahb_clk",

			"slow_ahb_src_clk",

			"cpas_ahb_clk",

			"cphy_rx_clk_src",

			"csiphy3_clk",

			"csi3phytimer_clk_src",

			"csi3phytimer_clk";

		clock-cntl-level = "turbo";

		clock-rates =

			<0 0 0 0 384000000 0 269333333 0>;

		status = "ok";

	};



	qcom,cam_smmu {

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

		status = "ok";



		msm_cam_smmu_ife {

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

			iommus = <&apps_smmu 0x808 0x0>,

				<&apps_smmu 0x810 0x8>,

				<&apps_smmu 0xc08 0x0>,

				<&apps_smmu 0xc10 0x8>;

			label = "ife";

			ife_iova_mem_map: iova-mem-map {

				/* IO region is approximately 3.4 GB */

				iova-mem-region-io {

					iova-region-name = "io";

					iova-region-start = <0x7400000>;

					iova-region-len = <0xd8c00000>;

					iova-region-id = <0x3>;

					status = "ok";

				};

			};

		};



		msm_cam_icp_fw {

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

			label="icp";

			memory-region = <&pil_camera_mem>;

		};



		msm_cam_smmu_icp {

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

			iommus = <&apps_smmu 0x107A 0x2>,

				<&apps_smmu 0x1020 0x8>,

				<&apps_smmu 0x1040 0x8>,

				<&apps_smmu 0x1030 0x0>,

				<&apps_smmu 0x1050 0x0>;

			label = "icp";

			icp_iova_mem_map: iova-mem-map {

				iova-mem-region-firmware {

					/* Firmware region is 5MB */

					iova-region-name = "firmware";

					iova-region-start = <0x0>;

					iova-region-len = <0x500000>;

					iova-region-id = <0x0>;

					status = "ok";

				};



				iova-mem-region-shared {

					/* Shared region is 100MB long */

					iova-region-name = "shared";

					iova-region-start = <0x7400000>;

					iova-region-len = <0x6400000>;

					iova-region-id = <0x1>;

					iova-granularity = <0x15>;

					status = "ok";

				};



				iova-mem-region-io {

					/* IO region is approximately 3.3 GB */

					iova-region-name = "io";

					iova-region-start = <0xd800000>;

					iova-region-len = <0xd2800000>;

					iova-region-id = <0x3>;

					status = "ok";

				};

			};

		};



		msm_cam_smmu_cpas_cdm {

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

			iommus = <&apps_smmu 0x1000 0x0>;

			label = "cpas-cdm0";

			cpas_cdm_iova_mem_map: iova-mem-map {

				iova-mem-region-io {

					/* IO region is approximately 3.4 GB */

					iova-region-name = "io";

					iova-region-start = <0x7400000>;

					iova-region-len = <0xd8c00000>;

					iova-region-id = <0x3>;

					status = "ok";

				};

			};

		};



		msm_cam_smmu_secure {

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

			iommus = <&apps_smmu 0x1001 0x0>;

			label = "cam-secure";

			cam_secure_iova_mem_map: iova-mem-map {

				/* Secure IO region is approximately 3.4 GB */

				iova-mem-region-io {

					iova-region-name = "io";

					iova-region-start = <0x7400000>;

					iova-region-len = <0xd8c00000>;

					iova-region-id = <0x3>;

					status = "ok";

				};

			};

		};

	};



	qcom,cam-cpas@ac40000 {

		cell-index = <0>;

		compatible = "qcom,cam-cpas";

		label = "cpas";

		arch-compat = "cpas_top";

		status = "ok";

		reg-names = "cam_cpas_top", "cam_camnoc";

		reg = <0xac40000 0x1000>,

			<0xac42000 0x5000>;

		reg-cam-base = <0x40000 0x42000>;

		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",

			"gcc_axi_clk",

			"soc_ahb_clk",

			"slow_ahb_clk_src",

			"cpas_ahb_clk",

			"camnoc_axi_clk";

		clocks = <&clock_gcc GCC_CAMERA_AHB_CLK>,

			<&clock_gcc GCC_CAMERA_AXI_CLK>,

			<&clock_camcc CAM_CC_SOC_AHB_CLK>,

			<&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,

			<&clock_camcc CAM_CC_CPAS_AHB_CLK>,

			<&clock_camcc CAM_CC_CAMNOC_AXI_CLK>;

		src-clock-name = "slow_ahb_clk_src";

		clock-rates = <0 0 0 0 0 0>,

			<0 0 0 19200000 0 0>,

			<0 0 0 80000000 0 0>,

			<0 0 0 80000000 0 0>,

			<0 0 0 80000000 0 0>,

			<0 0 0 80000000 0 0>,

			<0 0 0 80000000 0 0>;

		clock-cntl-level = "suspend", "minsvs", "lowsvs", "svs",

			"svs_l1", "nominal", "turbo";

		qcom,msm-bus,name = "cam_ahb";

		qcom,msm-bus,num-cases = <7>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 0>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 153000>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 153000>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 300000>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 300000>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 600000>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 600000>;

		vdd-corners = <RPMH_REGULATOR_LEVEL_OFF

			RPMH_REGULATOR_LEVEL_RETENTION

			RPMH_REGULATOR_LEVEL_MIN_SVS

			RPMH_REGULATOR_LEVEL_LOW_SVS

			RPMH_REGULATOR_LEVEL_SVS

			RPMH_REGULATOR_LEVEL_SVS_L1

			RPMH_REGULATOR_LEVEL_NOM

			RPMH_REGULATOR_LEVEL_NOM_L1

			RPMH_REGULATOR_LEVEL_NOM_L2

			RPMH_REGULATOR_LEVEL_TURBO

			RPMH_REGULATOR_LEVEL_TURBO_L1>;

		vdd-corner-ahb-mapping = "suspend", "suspend",

			"minsvs", "lowsvs", "svs", "svs_l1",

			"nominal", "nominal", "nominal",

			"turbo", "turbo";

		client-id-based;

		client-names =

			"csiphy0", "csiphy1", "csiphy2", "cci0",

			"csid0", "csid1", "csid2",

			"ife0", "ife1", "ife2", "ipe0",

			"ipe1", "cam-cdm-intf0", "cpas-cdm0", "bps0",

			"icp0", "jpeg-dma0", "jpeg-enc0", "fd0";

		client-axi-port-names =

			"cam_hf_1", "cam_hf_2", "cam_hf_2", "cam_sf_1",

			"cam_hf_1", "cam_hf_2", "cam_hf_2",

			"cam_hf_1", "cam_hf_2", "cam_hf_2", "cam_sf_1",

			"cam_sf_1", "cam_sf_1", "cam_sf_1", "cam_sf_1",

			"cam_sf_1", "cam_sf_1", "cam_sf_1", "cam_sf_1";

		client-bus-camnoc-based;

		qcom,axi-port-list {

			qcom,axi-port1 {

				qcom,axi-port-name = "cam_hf_1";

				qcom,axi-port-mnoc {

					qcom,msm-bus,name = "cam_hf_1_mnoc";

					qcom,msm-bus-vector-dyn-vote;

					qcom,msm-bus,num-cases = <2>;

					qcom,msm-bus,num-paths = <1>;

					qcom,msm-bus,vectors-KBps =

					<MSM_BUS_MASTER_CAMNOC_HF0

					MSM_BUS_SLAVE_EBI_CH0 0 0>,

					<MSM_BUS_MASTER_CAMNOC_HF0

					MSM_BUS_SLAVE_EBI_CH0 0 0>;

				};

				qcom,axi-port-camnoc {

					qcom,msm-bus,name = "cam_hf_1_camnoc";

					qcom,msm-bus-vector-dyn-vote;

					qcom,msm-bus,num-cases = <2>;

					qcom,msm-bus,num-paths = <1>;

					qcom,msm-bus,vectors-KBps =

					<MSM_BUS_MASTER_CAMNOC_HF0_UNCOMP

					MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>,

					<MSM_BUS_MASTER_CAMNOC_HF0_UNCOMP

					MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>;

				};

			};

			qcom,axi-port2 {

				qcom,axi-port-name = "cam_hf_2";

				qcom,axi-port-mnoc {

					qcom,msm-bus,name = "cam_hf_2_mnoc";

					qcom,msm-bus-vector-dyn-vote;

					qcom,msm-bus,num-cases = <2>;

					qcom,msm-bus,num-paths = <1>;

					qcom,msm-bus,vectors-KBps =

					<MSM_BUS_MASTER_CAMNOC_HF1

					MSM_BUS_SLAVE_EBI_CH0 0 0>,

					<MSM_BUS_MASTER_CAMNOC_HF1

					MSM_BUS_SLAVE_EBI_CH0 0 0>;

				};

				qcom,axi-port-camnoc {

					qcom,msm-bus,name = "cam_hf_2_camnoc";

					qcom,msm-bus-vector-dyn-vote;

					qcom,msm-bus,num-cases = <2>;

					qcom,msm-bus,num-paths = <1>;

					qcom,msm-bus,vectors-KBps =

					<MSM_BUS_MASTER_CAMNOC_HF1_UNCOMP

					MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>,

					<MSM_BUS_MASTER_CAMNOC_HF1_UNCOMP

					MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>;

				};

			};

			qcom,axi-port3 {

				qcom,axi-port-name = "cam_sf_1";

				qcom,axi-port-mnoc {

					qcom,msm-bus,name = "cam_sf_1_mnoc";

					qcom,msm-bus-vector-dyn-vote;

					qcom,msm-bus,num-cases = <2>;

					qcom,msm-bus,num-paths = <1>;

					qcom,msm-bus,vectors-KBps =

					<MSM_BUS_MASTER_CAMNOC_SF

					MSM_BUS_SLAVE_EBI_CH0 0 0>,

					<MSM_BUS_MASTER_CAMNOC_SF

					MSM_BUS_SLAVE_EBI_CH0 0 0>;

				};

				qcom,axi-port-camnoc {

					qcom,msm-bus,name = "cam_sf_1_camnoc";

					qcom,msm-bus-vector-dyn-vote;

					qcom,msm-bus,num-cases = <2>;

					qcom,msm-bus,num-paths = <1>;

					qcom,msm-bus,vectors-KBps =

					<MSM_BUS_MASTER_CAMNOC_SF_UNCOMP

					MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>,

					<MSM_BUS_MASTER_CAMNOC_SF_UNCOMP

					MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>;

				};

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdm845-v2.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include "sdm845.dtsi"

#include "sdm845-v2-camera.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM845 V2";