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

Commit f5674cd6 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: use gpio pinctrl function for fpc SDMMAGPIE/SM6150"

parents 9b8aecf6 f9b9f506

arch/arm64/boot/dts/qcom/sdmmagpie-pinctrl.dtsi

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

/* Copyright (c) 2018-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
@@ -417,7 +417,7 @@ 
			fpc_reset_low: reset_low {

				mux {

					pins = "gpio91";

					function = "fpc_reset_gpio_low";

					function = "gpio";

				};

				config {

					pins = "gpio91";
@@ -430,7 +430,7 @@ 
			fpc_reset_high: reset_high {

				mux {

					pins = "gpio91";

					function = "fpc_reset_gpio_high";

					function = "gpio";

				};



				config {
@@ -444,6 +444,7 @@ 
			fpc_int_low: int_low {

				mux {

					pins = "gpio90";

					function = "gpio";

				};

				config {

					pins = "gpio90";

arch/arm64/boot/dts/qcom/sm6150-pinctrl.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ 
			fpc_reset_low: reset_low {

				mux {

					pins = "gpio101";

					function = "fpc_reset_gpio_low";

					function = "gpio";

				};

				config {

					pins = "gpio101";
@@ -206,7 +206,7 @@ 
			fpc_reset_high: reset_high {

				mux {

					pins = "gpio101";

					function = "fpc_reset_gpio_high";

					function = "gpio";

				};



				config {
@@ -220,6 +220,7 @@ 
			fpc_int_low: int_low {

				mux {

					pins = "gpio93";

					function = "gpio";

				};

				config {

					pins = "gpio93";