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

Commit 2b4485c4 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: remove redundant flash and torch node"

parents bf312d89 f33e242d

arch/arm/boot/dts/qcom/msm8937-pmi8937-qrd-sku2.dtsi

+3 −3
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
@@ -40,8 +40,8 @@ 
		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8937_flash0 &pmi8937_flash1>;

		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;

		qcom,flash-source = <&pmi8937_flash0>;

		qcom,torch-source = <&pmi8937_torch0>;

		qcom,switch-source = <&pmi8937_switch>;

	};

arch/arm/boot/dts/qcom/msm8937-pmi8950-qrd-sku1.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ 
		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8950_flash0 &pmi8950_flash1>;

		qcom,torch-source = <&pmi8950_torch0 &pmi8950_torch1>;

		qcom,flash-source = <&pmi8950_flash0>;

		qcom,torch-source = <&pmi8950_torch0>;

		qcom,switch-source = <&pmi8950_switch>;

	};