From e57576829df4de1a9c7957c3604144f5c469bc3b Mon Sep 17 00:00:00 2001
From: Vignesh Kulothungan <vigneshk@quicinc.com>
Date: Thu, 12 Mar 2020 12:05:17 -0700
Subject: [PATCH] ARM: dts: msm: add gpio cells property

Add gpio cells property to define the number of cells in the gpio
specifier.
Update non-gpio property names to not have -gpio/gpios suffix.

Change-Id: I66e0a02d76d11747d55a86e9043b1484737e53b1
---
 qcom/lahaina-audio-overlay.dtsi | 14 ++++++++++----
 qcom/lahaina-audio.dtsi         |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/qcom/lahaina-audio-overlay.dtsi b/qcom/lahaina-audio-overlay.dtsi
index a009b563efec..ea7d59fab3f4 100644
--- a/qcom/lahaina-audio-overlay.dtsi
+++ b/qcom/lahaina-audio-overlay.dtsi
@@ -362,6 +362,7 @@
 		pinctrl-0 = <&wsa_swr_clk_active &wsa_swr_data_active>;
 		pinctrl-1 = <&wsa_swr_clk_sleep &wsa_swr_data_sleep>;
 		qcom,lpi-gpios;
+		#gpio-cells = <0>;
 	};
 
 	rx_swr_gpios: rx_swr_clk_data_pinctrl {
@@ -372,6 +373,7 @@
 		pinctrl-1 = <&rx_swr_clk_sleep &rx_swr_data_sleep
 				&rx_swr_data1_sleep>;
 		qcom,lpi-gpios;
+		#gpio-cells = <0>;
 	};
 
 	tx_swr_gpios: tx_swr_clk_data_pinctrl {
@@ -382,7 +384,8 @@
 		pinctrl-1 = <&tx_swr_clk_sleep &tx_swr_data0_sleep
 			    &tx_swr_data1_sleep &tx_swr_data2_sleep>;
 		qcom,lpi-gpios;
-		qcom,tlmm-gpio = <169>;
+		qcom,tlmm-pins = <169>;
+		#gpio-cells = <0>;
 	};
 
 	cdc_dmic01_gpios: cdc_dmic01_pinctrl {
@@ -391,7 +394,8 @@
 		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;
 		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;
 		qcom,lpi-gpios;
-		qcom,tlmm-gpio = <174 175>;
+		qcom,tlmm-pins = <174 175>;
+		#gpio-cells = <0>;
 	};
 
 	cdc_dmic23_gpios: cdc_dmic23_pinctrl {
@@ -400,7 +404,8 @@
 		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;
 		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;
 		qcom,lpi-gpios;
-		qcom,tlmm-gpio = <177>;
+		qcom,tlmm-pins = <177>;
+		#gpio-cells = <0>;
 	};
 
 	cdc_dmic45_gpios: cdc_dmic45_pinctrl {
@@ -409,7 +414,8 @@
 		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;
 		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;
 		qcom,lpi-gpios;
-		qcom,tlmm-gpio = <180>;
+		qcom,tlmm-pins = <180>;
+		#gpio-cells = <0>;
 	};
 };
 
diff --git a/qcom/lahaina-audio.dtsi b/qcom/lahaina-audio.dtsi
index 7f5e36bd653c..2db5c223dd00 100644
--- a/qcom/lahaina-audio.dtsi
+++ b/qcom/lahaina-audio.dtsi
@@ -27,7 +27,7 @@
 			compatible = "qcom,lpi-pinctrl";
 			reg = <0x33c0000 0x0>;
 			qcom,slew-reg = <0x355a000 0x0>;
-			qcom,num-gpios = <15>;
+			qcom,gpios-count = <15>;
 			gpio-controller;
 			#gpio-cells = <2>;
 			qcom,lpi-offset-tbl = <0x00000000>, <0x00001000>,