summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaveen Manohar <naveen.m@intel.com>2017-10-12 15:50:21 +0900
committerMartin Roth <martinroth@google.com>2017-12-11 14:25:59 +0000
commit1533dfdd0e85cd2390e33e8eb96379d567b19136 (patch)
tree7c974f042fdc401394c50b2cfd6c78312debf8f8
parent3417ee9a3fc4fcb6e758962781c9b8ff0a353f6d (diff)
google/nautilus: Add Maxim98357a support
Adds Maxim98357a support for Nautilus using the generic driver in drivers/generic/max98357 BUG=b:68686020 TEST=With entire merged audio should be enabled on max98357 speaker codec. Change-Id: I958bf7c1395259b3e3fb30332882fd51a48dc0cc Signed-off-by: Naveen Manohar <naveen.m@intel.com> Reviewed-on: https://review.coreboot.org/22458 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
-rw-r--r--src/mainboard/google/poppy/Kconfig1
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/devicetree.cb5
2 files changed, 6 insertions, 0 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 57c19543ab..75c9648067 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -124,6 +124,7 @@ config VARIANT_SPECIFIC_OPTIONS_NAMI
config VARIANT_SPECIFIC_OPTIONS_NAUTILUS
def_bool n
+ select DRIVERS_GENERIC_MAX98357A
select DRIVERS_I2C_DA7219
select DRIVERS_PS2_KEYBOARD
select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA
diff --git a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
index 771bd72a2c..ac3bd1dc45 100644
--- a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
@@ -311,6 +311,11 @@ chip soc/intel/skylake
device pci 17.0 off end # SATA
device pci 19.0 on end # UART #2
device pci 19.1 on
+ chip drivers/generic/max98357a
+ register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A23)"
+ register "sdmode_delay" = "5"
+ device generic 0 on end
+ end
chip drivers/i2c/da7219
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D9_IRQ)"
register "btn_cfg" = "50"