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

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

Merge "defconfig: msm: camera: enable configurations to support apq8009"

parents 2d7415ad 60b2f676

arch/arm/configs/msm8909-perf_defconfig

+12 −2
Original line number Diff line number Diff line
@@ -321,6 +321,16 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISP_V1=y

CONFIG_MSM_ISPIF=y

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -374,8 +384,7 @@ CONFIG_MMC_TEST=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_VIBRATOR=y

CONFIG_LEDS_TRIGGERS=y
@@ -398,6 +407,7 @@ CONFIG_USB_BAM=y 
CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_MSM_SPM=y

CONFIG_MSM_L2_SPM=y

CONFIG_MSM_BOOT_STATS=y

arch/arm/configs/msm8909_defconfig

+12 −2
Original line number Diff line number Diff line
@@ -316,6 +316,16 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISP_V1=y

CONFIG_MSM_ISPIF=y

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -369,8 +379,7 @@ CONFIG_MMC_TEST=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_VIBRATOR=y

CONFIG_LEDS_TRIGGERS=y
@@ -393,6 +402,7 @@ CONFIG_USB_BAM=y 
CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_MSM_SPM=y

CONFIG_MSM_L2_SPM=y

CONFIG_MSM_BOOT_STATS=y

arch/arm64/boot/dts/qcom/apq8009-mtp-wcd9326-refboard.dts

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include "apq8009-audio-external_codec.dtsi"

#include "apq8009-memory.dtsi"

#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>

#include "msm8909-pm8916-camera.dtsi"

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



/ {

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

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

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

 * Copyright (c) 2017-2018, 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/arm64/boot/dts/qcom/msm8909-pm8916-camera.dtsi

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

 * Copyright (c) 2014-2018, 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 {

	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 {

		cell-index = <0>;

		compatible = "qcom,csiphy-v3.1", "qcom,csiphy";

		reg = <0x1b0ac00 0x200>,

			<0x1b00030 0x4>;

		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 78 0>;

		interrupt-names = "csiphy";

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_csi0phytimer_clk_src>,

			<&clock_gcc clk_gcc_camss_csi0phytimer_clk>,

			<&clock_gcc clk_camss_top_ahb_clk_src>,

			<&clock_gcc clk_gcc_camss_csi0phy_clk>,

			<&clock_gcc clk_gcc_camss_csi1phy_clk>,

			<&clock_gcc clk_gcc_camss_ahb_clk>;

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

			"csiphy_timer_src_clk", "csiphy_timer_clk",

			"camss_ahb_src", "csi0_phy_clk", "csi1_phy_clk",

			"camss_ahb_clk";

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

	};



	qcom,csid@1b08000  {

		cell-index = <0>;

		compatible = "qcom,csid-v3.1", "qcom,csid";

		reg = <0x1b08000 0x100>;

		reg-names = "csid";

		interrupts = <0 49 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1200000>;

		qcom,mipi-csi-vdd-supply = <&pm8916_l2>;

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_csi0_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_ahb_clk>;

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

			"csi_ahb_clk", "csi_src_clk",

			"csi_clk",  "csi_pix_clk",

			"csi_rdi_clk", "camss_ahb_clk";

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

	};



	qcom,csid@1b08400 {

		cell-index = <1>;

		compatible = "qcom,csid-v3.1", "qcom,csid";

		reg = <0x1b08400 0x100>;

		reg-names = "csid";

		interrupts = <0 50 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1200000>;

		qcom,mipi-csi-vdd-supply = <&pm8916_l2>;

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_csi1_ahb_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_ahb_clk>,

			<&clock_gcc clk_gcc_camss_csi1phy_clk>;

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

			"csi_ahb_clk", "csi_src_clk",

			"csi_clk", "csi_pix_clk",

			"csi_rdi_clk", "camss_ahb_clk", "camss_csi1_phy";

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

	};



	qcom,ispif@1b0a000 {

		cell-index = <0>;

		compatible = "qcom,ispif";

		reg = <0x1b0a000 0x500>,

			<0x1b00020 0x10>;

		reg-names = "ispif", "csi_clk_mux";

		interrupts = <0 51 0>;

		interrupt-names = "ispif";

		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_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_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 = "camss_top_ahb_clk", "ispif_ahb_clk",

			"csi0_src_clk", "csi0_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 = <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 {

		cell-index = <0>;

		compatible = "qcom,vfe32";

		reg = <0x1b10000 0x830>,

			<0x1b40000 0x200>;

		reg-names = "vfe", "vfe_vbif";

		interrupts = <0 52 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_vfe0_clk_src>,

			<&clock_gcc clk_gcc_camss_vfe0_clk>,

			<&clock_gcc clk_gcc_camss_csi_vfe0_clk>,

			<&clock_gcc clk_gcc_camss_vfe_ahb_clk>,

			<&clock_gcc clk_gcc_camss_vfe_axi_clk>,

			<&clock_gcc clk_gcc_camss_ahb_clk>,

			<&clock_gcc clk_gcc_camss_top_ahb_clk>;

		clock-names = "camss_top_ahb_clk", "vfe_clk_src",

			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",

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

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



		qos-entries = <8>;

		qos-regs = <0x7BC 0x7C0 0x7C4 0x7C8 0x7CC 0x7D0

				0x7D4 0x798>;

		qos-settings = <0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0x00010000>;

		vbif-entries = <1>;

		vbif-regs = <0x04>;

		vbif-settings = <0x1>;

		ds-entries = <15>;

		ds-regs = <0x7D8 0x7DC 0x7E0 0x7E4 0x7E8

			0x7EC 0x7F0 0x7F4 0x7F8 0x7FC 0x800

			0x804 0x808 0x80C 0x810>;

		ds-settings = <0xCCCC1111 0xCCCC1111 0xCCCC1111

				0xCCCC1111 0xCCCC1111 0xCCCC1111

				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,msm-cam-smmu-cb";

			iommus = <&apps_iommu 0x400 0x00>;

			label = "vfe";

			qcom,scratch-buf-support;

		};

	};



	qcom,irqrouter@1b00000 {

		status = "ok";

		cell-index = <0>;

		compatible = "qcom,irqrouter";

		reg = <0x1b00000 0x100>;

		reg-names = "irqrouter";

	};

};