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

Commit 351d8d23 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: properly configure camera key for SDM670" into msm-4.9

parents e3392f93 66112e5e

arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* 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
@@ -143,7 +143,7 @@ 


		cam_snapshot {

			label = "cam_snapshot";

			gpios = <&tlmm 91 0>;

			gpios = <&tlmm 91 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <766>;

			gpio-key,wakeup;
@@ -153,7 +153,7 @@ 


		cam_focus {

			label = "cam_focus";

			gpios = <&tlmm 92 0>;

			gpios = <&tlmm 92 GPIO_ACTIVE_HIGH>;

			linux,input-type = <1>;

			linux,code = <528>;

			gpio-key,wakeup;

arch/arm64/boot/dts/qcom/sdm670-mtp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ 


		cam_snapshot {

			label = "cam_snapshot";

			gpios = <&tlmm 91 0>;

			gpios = <&tlmm 91 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <766>;

			gpio-key,wakeup;
@@ -212,7 +212,7 @@ 


		cam_focus {

			label = "cam_focus";

			gpios = <&tlmm 92 0>;

			gpios = <&tlmm 92 GPIO_ACTIVE_HIGH>;

			linux,input-type = <1>;

			linux,code = <528>;

			gpio-key,wakeup;