summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/kahlee/dsdt.asl10
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl (renamed from src/mainboard/google/kahlee/acpi/gpe.asl)0
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl (renamed from src/mainboard/google/kahlee/acpi/mainboard.asl)32
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl (renamed from src/mainboard/google/kahlee/acpi/routing.asl)0
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl (renamed from src/mainboard/google/kahlee/acpi/sleep.asl)0
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl (renamed from src/mainboard/google/kahlee/acpi/thermal.asl)0
-rw-r--r--src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl16
-rw-r--r--src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl16
-rw-r--r--src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl16
-rw-r--r--src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl16
-rw-r--r--src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl16
-rw-r--r--src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl16
-rw-r--r--src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl16
-rw-r--r--src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl16
-rw-r--r--src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl16
-rw-r--r--src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl16
16 files changed, 188 insertions, 14 deletions
diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
index ff3bb7371c..2237876081 100644
--- a/src/mainboard/google/kahlee/dsdt.asl
+++ b/src/mainboard/google/kahlee/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock (
#include <globalnvs.asl>
/* Globals for the platform */
- #include "acpi/mainboard.asl"
+ #include <variant/acpi/mainboard.asl>
/* PCI IRQ mapping for the Southbridge */
#include <pcie.asl>
@@ -43,7 +43,7 @@ DefinitionBlock (
#include <sleepstates.asl>
/* Contains the Sleep methods (WAK, PTS, GTS, etc.) */
- #include "acpi/sleep.asl"
+ #include <variant/acpi/sleep.asl>
/* System Bus */
Scope(\_SB) { /* Start \_SB scope */
@@ -51,7 +51,7 @@ DefinitionBlock (
#include <arch/x86/acpi/globutil.asl>
/* IRQ Routing mapping for this platform (in \_SB scope) */
- #include "acpi/routing.asl"
+ #include <variant/acpi/routing.asl>
Device(PWRB) {
Name(_HID, EISAID("PNP0C0C"))
@@ -64,7 +64,7 @@ DefinitionBlock (
} /* End \_SB scope */
/* Thermal handler */
- #include "acpi/thermal.asl"
+ #include <variant/acpi/thermal.asl>
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
@@ -82,6 +82,6 @@ DefinitionBlock (
#include <smbus.asl>
/* Define the General Purpose Events for the platform */
- #include "acpi/gpe.asl"
+ #include <variant/acpi/gpe.asl>
}
/* End of ASL file */
diff --git a/src/mainboard/google/kahlee/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl
index 9dbbde557c..9dbbde557c 100644
--- a/src/mainboard/google/kahlee/acpi/gpe.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl
diff --git a/src/mainboard/google/kahlee/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
index 30b7adeffc..ddf1211eee 100644
--- a/src/mainboard/google/kahlee/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
@@ -56,20 +56,20 @@ Device (ETPA)
Name (_S0W, 3)
}
-/* Realtek Audio Codec */
-Device (RTEK) /* Audio Codec driver I2CS*/
+/* DA7219 codec */
+Device (DIAL) /* audio codec*/
{
Name (_ADR, 0)
- Name (_HID, "10EC5650")
- Name (_CID, "10EC5650")
- Name (_DDN, "RTEK Codec Controller ")
+ Name (_HID, "DLGS7219")
+ Name (_CID, "DLGS7219")
+ Name (_DDN, "DA7219 Codec Controller ")
Name (_UID, 1)
Device (I2S) /* I2S machine driver for RT5650 */
{
Name (_ADR, 1)
- Name (_HID, "AMDI1002")
- Name (_CID, "AMDI1002")
+ Name (_HID, "AMDI7219")
+ Name (_CID, "AMDI7219")
}
Method (_CRS, 0x0, Serialized)
@@ -84,9 +84,9 @@ Device (RTEK) /* Audio Codec driver I2CS*/
"\\_SB.I2CA", /* ResourceSource: I2C bus controller name */
)
- /* Jack Detect AGPIO90 */
+ /* Jack Detect AGPIO14 */
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
- "\\_SB.GPIO") { 90 }
+ "\\_SB.GPIO") { 14 }
})
Return (SBUF)
}
@@ -96,3 +96,17 @@ Device (RTEK) /* Audio Codec driver I2CS*/
Return (0xF)
}
}
+
+/* MAX98357 codec */
+Device (MAXA)
+{
+ Name (_ADR, 0)
+ Name (_HID, "MX98357A")
+ Name (_CID, "MX98357A")
+ Name (_DDN, "MX98357A Codec Controller ")
+ Name (_UID, 1)
+
+ Method (_STA, 0x0, NotSerialized) {
+ Return (0x0F)
+ }
+}
diff --git a/src/mainboard/google/kahlee/acpi/routing.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
index c61bc4bb6c..c61bc4bb6c 100644
--- a/src/mainboard/google/kahlee/acpi/routing.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
diff --git a/src/mainboard/google/kahlee/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
index 1e3a617ad5..1e3a617ad5 100644
--- a/src/mainboard/google/kahlee/acpi/sleep.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
diff --git a/src/mainboard/google/kahlee/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
index 86f8758892..86f8758892 100644
--- a/src/mainboard/google/kahlee/acpi/thermal.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl
new file mode 100644
index 0000000000..0a08774206
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/gpe.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
new file mode 100644
index 0000000000..7e7c158d88
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/mainboard.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl
new file mode 100644
index 0000000000..233494f51e
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/routing.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl
new file mode 100644
index 0000000000..c5a1557962
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/sleep.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl
new file mode 100644
index 0000000000..77137bb903
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/thermal.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl
new file mode 100644
index 0000000000..0a08774206
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/gpe.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl
new file mode 100644
index 0000000000..7e7c158d88
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/mainboard.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl
new file mode 100644
index 0000000000..233494f51e
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/routing.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl
new file mode 100644
index 0000000000..c5a1557962
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/sleep.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl
new file mode 100644
index 0000000000..77137bb903
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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 <baseboard/acpi/thermal.asl>