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

Commit 6dcf9d5c 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 gpio standby entry to camera2"

parents 42df9a22 05c318d3

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

+8 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2014, 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
@@ -262,12 +262,15 @@ 
		qcom,cam-vreg-op-mode = <105000 80000 0>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,

			<&msmgpio 18 0>;

			<&msmgpio 18 0>,

			<&msmgpio 28 0>;

		qcom,gpio-reset = <1>;

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

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

		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_RESET1";

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,cci-master = <0>;

		status = "ok";

	};

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

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2014, 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
@@ -281,8 +281,8 @@ 
		qcom,gpio-req-tbl-num = <0 1 2>;

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

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

					  "CAM_RESET1",

					  "CAM_STANDBY";

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,cci-master = <1>;

		status = "ok";

	};

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

+3 −3
Original line number Diff line number Diff line 


/*

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2014, 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
@@ -268,8 +268,8 @@ 
		qcom,gpio-req-tbl-num = <0 1 2>;

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

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

					  "CAM_RESET1",

					  "CAM_STANDBY";

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,cci-master = <0>;

		status = "ok";

	};

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

+8 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2014, 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
@@ -272,12 +272,15 @@ 
		qcom,cam-vreg-op-mode = <105000 80000 0>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,

			<&msmgpio 18 0>;

			<&msmgpio 18 0>,

			<&msmgpio 28 0>;

		qcom,gpio-reset = <1>;

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

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

		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_RESET1";

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,cci-master = <1>;

		status = "ok";

	};