2 files changed, 43 insertions, 48 deletions
diff --git a/src/mainboard/google/lars/acpi/mainboard.asl b/src/mainboard/google/lars/acpi/mainboard.asl
index 73d43bc276..e8397a1f12 100644
--- a/src/mainboard/google/lars/acpi/mainboard.asl
+++ b/src/mainboard/google/lars/acpi/mainboard.asl
@@ -44,6 +44,46 @@ Scope (\_SB)
 	{
 		Name (_HID, EisaId ("PNP0C0C"))
 	}
+
+	Device (MAXM)
+	{
+		Name (_HID, "MX98357A")
+		Name (_DDN, "Maxim Integrated 98357A Amplifier")
+		Name (_UID, 1)
+		Name (_CRS, ResourceTemplate()
+		{
+			GpioIo (Exclusive, PullDefault, 0x0000, 0x0000,
+				IoRestrictionNone,
+				"\\_SB.PCI0.GPIO", 0x00, ResourceConsumer,,)
+			{
+				GPIO_SPEAKER_MAXIM_AMP_SDMODE,
+			}
+		})
+		Name (_DSD, Package ()
+		{
+			ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+			Package ()
+			{
+				Package () {
+					/*
+					 * Create a named GPIO
+					 * "sdmode-gpio" for the
+					 * kernel codec driver
+					 * to use.
+					 */
+
+					"sdmode-gpio", Package () {
+								^MAXM, 0, 0, 0
+							}
+				},
+			}
+		})
+
+		Method (_STA)
+		{
+			Return (0xF)
+		}
+	}
 }
 
 /*
@@ -201,52 +241,4 @@ Scope (\_SB.PCI0.I2C4)
 			Return (0xF)
 		}
 	}
-
-	/* Left Speaker Amp */
-	Device (SPKL)
-	{
-		Name (_HID, "INT343B")
-		Name (_DDN, "SSM4567 Speaker Amp")
-		Name (_UID, 0)
-
-		Name (_CRS, ResourceTemplate()
-		{
-			I2cSerialBus (
-				BOARD_LEFT_SPEAKER_AMP_I2C_ADDR,
-				ControllerInitiated,
-				400000,
-				AddressingMode7Bit,
-				"\\_SB.PCI0.I2C4",
-			)
-		})
-
-		Method (_STA)
-		{
-			Return (0xF)
-		}
-	}
-
-	/* Right Speaker Amp */
-	Device (SPKR)
-	{
-		Name (_HID, "INT343B")
-		Name (_DDN, "SSM4567 Speaker Amp")
-		Name (_UID, 1)
-
-		Name (_CRS, ResourceTemplate()
-		{
-			I2cSerialBus (
-				BOARD_RIGHT_SPEAKER_AMP_I2C_ADDR,
-				ControllerInitiated,
-				400000,
-				AddressingMode7Bit,
-				"\\_SB.PCI0.I2C4",
-			)
-		})
-
-		Method (_STA)
-		{
-			Return (0xF)
-		}
-	}
 }
diff --git a/src/mainboard/google/lars/gpio.h b/src/mainboard/google/lars/gpio.h
index 7ebeb5d7a3..bc11729f74 100755
--- a/src/mainboard/google/lars/gpio.h
+++ b/src/mainboard/google/lars/gpio.h
@@ -20,6 +20,9 @@
 #include <soc/gpe.h>
 #include <soc/gpio.h>
 
+/* MAX98357A SD_MODE */
+#define GPIO_SPEAKER_MAXIM_AMP_SDMODE	GPP_B2
+
 /* EC in RW */
 #define GPIO_EC_IN_RW		GPP_C6