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

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

Merge changes Ied9ec629,I1ed04593 into kernel.lnx.4.9.r27-rel 

* changes:
  ARM: dts: msm: Updated correct cam-vdig-supply for MSM8953 QRD
  ARM: dts: msm: add camera support for MSM8953 QRD
parents 1abfdb1f 055ea6f7

arch/arm64/boot/dts/qcom/msm8953-camera-sensor-qrd.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
		qcom,cci-master = <0>;

		reg = <0x0>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&pm8953_l23>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vaf-supply = <&pm8953_l17>;

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

		qcom,cam-vreg-min-voltage = <0 1200000 2850000>;
@@ -111,7 +111,7 @@ 
		qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&pm8953_l23>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vaf-supply = <&pm8953_l17>;

		cam_vana-supply = <&pm8953_l22>;

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

arch/arm64/boot/dts/qcom/msm8953-qrd-sku3.dts

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

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

 * Copyright (c) 2015-2017, 2019 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,7 +14,9 @@ 
/dts-v1/;



#include "msm8953.dtsi"

#include "pmi8950.dtsi"

#include "msm8953-qrd-sku3.dtsi"

#include "msm8953-pmi8950.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8953 + PMI8950 QRD SKU3";

arch/arm64/boot/dts/qcom/msm8953-qrd-sku3.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



#include "msm8953-qrd.dtsi"

#include "msm8953-camera-sensor-qrd.dtsi"



&spmi_bus {

	qcom,pmi8950@3 {