arm/dts: update guamna dts on pre-evb board

update guamna dts
Change-Id: I3deb43f34d0e7865743862601fdf017b894e910e
Signed-off-by: zhaoxp3 <zhaoxp3@motorola.com>
Reviewed-on: https://gerrit.mot.com/1549427
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Wang Wang <wangwang1@lenovo.com>
Submit-Approved: Jira Key

qcom/bengal-guamna-audio-overlay.dtsi

@@ -1,65 +0,0 @@
-/* Copyright (c) 2020, 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
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <dt-bindings/interrupt-controller/irq.h>
-
-&qupv3_se1_i2c {
-        status = "ok"
-        fs16xx@34 {
-                compatible = "foursemi,fs16xx";
-                reg = <0x34>;
-                fs,fs-dev = "left";
-                /* 1V8 supplied by LDO */
-                vddcore-supply = <&L9A>;
-                status = "okay";
-        };
-};
-
-/* Add pinctrl for MI2S0 */
-&soc {
-        cdc_pri_mi2s_gpios: msm_cdc_pinctrl_pri {
-                compatible = "qcom,msm-cdc-pinctrl";
-                pinctrl-names = "aud_active", "aud_sleep";
-                pinctrl-0 = <&lpi_i2s1_sck_active &lpi_i2s1_ws_active
-                        &lpi_i2s1_sd0_active &lpi_i2s1_sd1_active>;
-                pinctrl-1 = <&lpi_i2s1_sck_sleep &lpi_i2s1_ws_sleep
-                        &lpi_i2s1_sd0_sleep &lpi_i2s1_sd1_sleep>;
-        };
-};
-
-/* Configure MI2S0 SD0&SD1 */
-&dai_mi2s0 {
-        /* SD0 line for playback */
-        qcom,msm-mi2s-rx-lines = <1>;
-        /* SD1 line for recording(SmartPA EC) */
-        qcom,msm-mi2s-tx-lines = <2>;
-};
-
-/* Modify btfmslim_codec's compatible */
-&btfmslim_codec {
-        compatible = "btfmslim_slave";
-        status = "ok"
-};
-
-
-&bengal_snd {
-        qcom,model = "bengal-fs-snd-card";
-	fs,have-16xx = <1>;
-
-	qcom,mi2s-audio-intf = <1>;
-	qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>;
-        /delete-property/ qcom,cdc-dmic01-gpios;
-        /delete-property/ qcom,cdc-dmic23-gpios;
-
-        qcom,wsa-max-devs = <0>;
-        qcom,wsa-devs = <0>;
-};

qcom/bengal-guamna-common-overlay.dtsi

@@ -15,7 +15,6 @@
 #include "bengal-guam-display.dtsi"
 #include "bengal-audio-overlay.dtsi"
 #include "bengal-guam-touchscreen-overlay.dtsi"
-#include "camera/bengal-camera-sensor-mot-guam-overlay.dtsi"
 #include "bengal-guam-fps.dtsi"
 #include "bengal-guam-moto-thermal.dtsi"
 
@@ -40,16 +39,18 @@
 &tlmm{
 	capsense_sar_gpio_pins: capsense_sar_gpio_pins {
 		mux {
-			pins = "gpio96", "gpio97";
+			pins = "gpio36";
 			function = "gpio";
 		};
 
 		config {
-			pins = "gpio96", "gpio97";
+			pins = "gpio36";
 			drive-strength = <2>;
 			bias-pull-up;
+			input-enable;
 		};
 	};
+
 	tlmm_gpio_key {
 		gpio_key_active: gpio_key_active {
 			mux {
@@ -278,3 +279,10 @@
 		<17>;
 	};
 };
+
+&pm8008_8 {
+	status = "disabled";
+};
+&pm8008_9 {
+	status = "disabled";
+};

qcom/bengal-guamna-evt-overlay.dts

@@ -14,11 +14,11 @@
 /plugin/;
 
 #include "bengal-guamna-common-overlay.dtsi"
-#include "bengal-guamna-audio-overlay.dtsi"
+#include "bengal-guam-awinic-audio-overlay.dtsi"
 
 / {
-	model = "guam";
+	model = "guamna";
-	compatible = "qcom,bengal-guam", "qcom,bengal-moto", "qcom,bengal";
+	compatible = "qcom,bengal-guamna", "qcom,bengal-moto", "qcom,bengal";
 	qcom,msm-id = <417 0x10000>;
 	qcom,board-id = <0 0xA000>;
 };