From 68f0eb52696397d664c343dacef5c8b390a614e1 Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@linux.intel.com>
Date: Fri, 1 Nov 2019 12:09:28 +0200
Subject: mb/google/poppy: Remove redundant mutex

The mutex is only used in one method and that method is serialised. Remove
the mutex.

BUG=chromium:959232

Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Jacopo Mondi <jacopo@jmondi.org>
Change-Id: Ic173d557f4b49cc9e860d13b782fc4940fd80869
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36745
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 .../include/baseboard/acpi/camera_pmic.asl         | 67 ++++++++++------------
 1 file changed, 29 insertions(+), 38 deletions(-)

(limited to 'src/mainboard')

diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera_pmic.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera_pmic.asl
index fc23d065b7..d70726f49e 100644
--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera_pmic.asl
+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera_pmic.asl
@@ -400,50 +400,41 @@ Scope (\_SB.PCI0.I2C2)
 		}
 
 		/* Reference count for VSIO */
-		Mutex (MUTV, 0)
 		Name (VSIC, 0)
 		Method (DOVD, 1, Serialized) {
-			/* Save Acquire result so we can check for
-			Mutex acquired */
-			Store (Acquire (MUTV, 1000), Local0)
-			/* Check for Mutex acquired */
-			If (LEqual (Local0, Zero)) {
-				/* Turn off VSIO */
-				If (LEqual (Arg0, Zero)) {
-					/* Decrement only if VSIC > 0 */
-					if (LGreater (VSIC, 0)) {
-						Decrement (VSIC)
-						If (LEqual (VSIC, Zero)) {
-							VSIO = 0
-							Sleep(1)
-							PMOF()
-						}
+			/* Turn off VSIO */
+			If (LEqual (Arg0, Zero)) {
+				/* Decrement only if VSIC > 0 */
+				if (LGreater (VSIC, 0)) {
+					Decrement (VSIC)
+					If (LEqual (VSIC, Zero)) {
+						VSIO = 0
+						Sleep(1)
+						PMOF()
 					}
-				} ElseIf (LEqual (Arg0, 1)) {
-					/* Increment only if VSIC < 4 */
-					If (LLess (VSIC, 4)) {
-						/* Turn on VSIO */
-						If (LEqual (VSIC, Zero)) {
-							PMON()
-							VSIO = 3
-
-							if (LNotEqual (IOVA, 52)) {
-								/* Set VSIO value as
-								1.8006 V */
-								IOVA = 52
-							}
-							if (LNotEqual (SIOV, 52)) {
-								/* Set VSIO value as
-								1.8006 V */
-								SIOV = 52
-							}
-							Sleep(3)
+				}
+			} ElseIf (LEqual (Arg0, 1)) {
+				/* Increment only if VSIC < 4 */
+				If (LLess (VSIC, 4)) {
+					/* Turn on VSIO */
+					If (LEqual (VSIC, Zero)) {
+						PMON()
+						VSIO = 3
+
+						if (LNotEqual (IOVA, 52)) {
+							/* Set VSIO value as
+							1.8006 V */
+							IOVA = 52
+						}
+						if (LNotEqual (SIOV, 52)) {
+							/* Set VSIO value as
+							1.8006 V */
+							SIOV = 52
 						}
-						Increment (VSIC)
+						Sleep(3)
 					}
+					Increment (VSIC)
 				}
-
-				Release (MUTV)
 			}
 		}
 
-- 
cgit v1.2.3