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

Commit 99f7e0da 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: Add multi-module eeprom support on msmgold"

parents 49ad47cb 2466bbfe

arch/arm/boot/dts/qcom/msmgold-camera-sensor-cdp.dtsi

+27 −19
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2015-2016, 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
@@ -38,28 +38,36 @@ 


	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0x0>;

		qcom,eeprom-name = "le2464c";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0xa0>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <1>;



		qcom,page0 = <0 0 0 0 0 0>;

		qcom,poll0 = <0 0 0 0 0 0>;

		qcom,saddr0 = <0xa0>;

		qcom,mem0 = <8192 0x0000 2 0 1 0>;



		reg = <0x0>;

		cam_vdig-supply = <&pmgold_l23>;

		cam_vana-supply = <&pmgold_l22>;

		cam_vio-supply = <&pmgold_l6>;

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

		qcom,cam-vreg-min-voltage = <0>;

		qcom,cam-vreg-max-voltage = <0>;

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

		qcom,cam-power-seq-type = "sensor_vreg";

		qcom,cam-power-seq-val = "cam_vio";

		qcom,cam-power-seq-cfg-val = <1>;

		qcom,cam-power-seq-delay = <1>;

		cam_vaf-supply = <&pmgold_l17>;

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

							"cam_vaf";

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

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

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

		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 = <&tlmm 26 0>,

			<&tlmm 36 0>,

			<&tlmm 35 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_MCLK0",

			"CAM_RESET0",

			"CAM_STANDBY0";

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

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

	};



	eeprom1: qcom,eeprom@1 {

arch/arm/boot/dts/qcom/msmgold-camera-sensor-mtp.dtsi

+27 −19
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2015-2016, 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
@@ -38,28 +38,36 @@ 


	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0x0>;

		qcom,eeprom-name = "le2464c";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0xa0>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <1>;



		qcom,page0 = <0 0 0 0 0 0>;

		qcom,poll0 = <0 0 0 0 0 0>;

		qcom,saddr0 = <0xa0>;

		qcom,mem0 = <8192 0x0000 2 0 1 0>;



		reg = <0x0>;

		cam_vdig-supply = <&pmgold_l23>;

		cam_vana-supply = <&pmgold_l22>;

		cam_vio-supply = <&pmgold_l6>;

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

		qcom,cam-vreg-min-voltage = <0>;

		qcom,cam-vreg-max-voltage = <0>;

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

		qcom,cam-power-seq-type = "sensor_vreg";

		qcom,cam-power-seq-val = "cam_vio";

		qcom,cam-power-seq-cfg-val = <1>;

		qcom,cam-power-seq-delay = <1>;

		cam_vaf-supply = <&pmgold_l17>;

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

							"cam_vaf";

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

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

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

		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 = <&tlmm 26 0>,

			<&tlmm 36 0>,

			<&tlmm 35 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_MCLK0",

			"CAM_RESET0",

			"CAM_STANDBY0";

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

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

	};



	eeprom1: qcom,eeprom@1 {