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

Commit 250194d0 authored by Zhiquan Deng's avatar Zhiquan Deng Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: add camera sensor support for 8009 robot 



Add configuration for camera sensor nodes with required
properties for robot device and make necessary dtsi
changes for camera sub-system when using pm8916.

Change-Id: I8c34570ba94eb9bf5463150f37b2d6185f253ca0
Signed-off-by: default avatarZhiquan Deng <zhiquand@codeaurora.org>
parent 0e3466e4

arch/arm/boot/dts/qcom/apq8009-robot-refboard.dts

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include "msm8909-mtp.dtsi"

#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-mtp.dtsi"

#include "msm8909-pm8916-camera.dtsi"

#include "msm8909-pm8916-camera-sensor-robot.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8009 Robot Reference Board";

arch/arm/boot/dts/qcom/msm8909-pm8916-camera-sensor-robot.dtsi

0 → 100644
+91 −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.

 */



&i2c_3 {

	status = "ok";

};



&i2c_3 {

	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x2>;

		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8916_l2>;

		cam_vana-supply = <&pm8916_l17>;

		cam_vio-supply = <&pm8916_l6>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1200000 1800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 2850000>;

		qcom,cam-vreg-op-mode = <200000 0 80000>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep &cam_sensor_rear_sleep>;

		gpios = <&msm_gpio 26 0>,

			<&msm_gpio 35 0>,

			<&msm_gpio 34 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET",

			"CAM_STANDBY";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

		cam_vana-supply = <&pm8916_l17>;

		cam_vio-supply = <&pm8916_l6>;

		qcom,cam-vreg-name = "cam_vio","cam_vana";

		qcom,cam-vreg-min-voltage = <1800000 2850000>;

		qcom,cam-vreg-max-voltage = <1800000 2850000>;

		qcom,cam-vreg-op-mode = <0 80000>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep &cam_sensor_rear_sleep>;

		gpios = <&msm_gpio 26 0>,

			<&msm_gpio 35 0>,

			<&msm_gpio 34 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET",

			"CAM_STANDBY";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

};

arch/arm/boot/dts/qcom/msm8909-pm8916-camera.dtsi

+47 −9
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2014-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
@@ -14,6 +14,11 @@ 
&soc {

	qcom,msm-cam@1800000{

		compatible = "qcom,msm-cam";

		reg = <0x1b00000 0x40000>;

		reg-names = "msm-cam";

		status = "ok";

		bus-vectors = "suspend", "svs", "nominal", "turbo";

		qcom,bus-votes = <0 320000000 640000000 640000000>;

	};



	qcom,csiphy@1b0ac00 {
@@ -96,26 +101,38 @@ 
		reg-names = "ispif", "csi_clk_mux";

		interrupts = <0 51 0>;

		interrupt-names = "ispif";

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ahb_clk>,

		qcom,num-isps = <0x1>;

		vfe0_vdd_supply = <&gdsc_vfe>;

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,



			<&clock_gcc clk_csi0_clk_src>,

			<&clock_gcc clk_gcc_camss_csi0_clk>,

			<&clock_gcc clk_gcc_camss_csi0pix_clk>,

			<&clock_gcc clk_gcc_camss_csi0rdi_clk>,

			<&clock_gcc clk_gcc_camss_csi0pix_clk>,

			<&clock_gcc clk_csi1_clk_src>,

			<&clock_gcc clk_gcc_camss_csi1_clk>,

			<&clock_gcc clk_gcc_camss_csi1pix_clk>,

			<&clock_gcc clk_gcc_camss_csi1rdi_clk>,

			<&clock_gcc clk_gcc_camss_csi1pix_clk>,

			<&clock_gcc clk_vfe0_clk_src>,

			<&clock_gcc clk_gcc_camss_vfe0_clk>,

			<&clock_gcc clk_gcc_camss_csi_vfe0_clk>;

		clock-names = "ispif_ahb_clk","camss_ahb_clk",



		clock-names = "camss_top_ahb_clk", "ispif_ahb_clk",

			"csi0_src_clk", "csi0_clk",

			"csi0_pix_clk","csi0_rdi_clk", "csi1_src_clk",

			"csi1_clk", "csi1_pix_clk", "csi1_rdi_clk",

			"csi0_rdi_clk", "csi0_pix_clk",

			"csi1_src_clk", "csi1_clk",

			"csi1_rdi_clk", "csi1_pix_clk",

			"vfe0_clk_src", "camss_vfe_vfe0_clk",

			"camss_csi_vfe0_clk";

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

		qcom,clock-rates = <0 40000000

			200000000 0 0 0

			200000000 0 0 0

			0 0 0>;

		qcom,clock-control = "NO_SET_RATE", "SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE", "NO_SET_RATE", "NO_SET_RATE";

	};



	qcom,vfe@1b10000 {
@@ -158,5 +175,26 @@ 
				0xCCCC1111 0xCCCC1111 0xCCCC1111

				0xCCCC1111 0xCCCC1111 0xCCCC1111

				0xCCCC1111 0xCCCC1111 0x00000103>;



		bus-util-factor = <1024>;

	};



	qcom,cam_smmu {

		status = "ok";

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

		msm_cam_smmu_cb1: msm_cam_smmu_cb1 {

			compatible = "qcom,qsmmu-cam-cb";

			iommus = <&apps_iommu 0x400>;

			label = "vfe";

			qcom,scratch-buf-support;

		};

	};



	qcom,irqrouter@1b00000 {

		status = "ok";

		cell-index = <0>;

		compatible = "qcom,irqrouter";

		reg = <0x1b00000 0x100>;

		reg-names = "irqrouter";

	};

};