From 4b3269e21d50da6ce33b72f356b6714e58f7478f Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Thu, 10 Dec 2020 21:54:24 +0800 Subject: mb/google/kukui: help payload to identify correct speaker amp type Kukui based devices may use different speaker amplifiers, for example MAX98357A, RT1015, or RT1015Q/automode. To help payloads identifying which component was installed on board, we want to pass the speaker GPIO in different name. This can be set in Kconfig as CONFIG_SPEAKER_GPIO_NAME. BUG=b:174534548 TEST=emerge-kukui coreboot depthcharge chromeos-bootimage BRANCH=kukui Signed-off-by: Hung-Te Lin Change-Id: I4b44b026bee4d3b58646eee207aea0120071dd46 Reviewed-on: https://review.coreboot.org/c/coreboot/+/48558 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu --- src/mainboard/google/kukui/Kconfig | 14 ++++++++++++++ src/mainboard/google/kukui/chromeos.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig index cff94daf20..0e3a4dc23c 100644 --- a/src/mainboard/google/kukui/Kconfig +++ b/src/mainboard/google/kukui/Kconfig @@ -83,4 +83,18 @@ config BOARD_OVERRIDE_LCM_ID default 0x1 if BOARD_GOOGLE_BURNET || BOARD_GOOGLE_ESCHE default 0x0 +config SPEAKER_GPIO_NAME + string + # MAX98357A, should include KENZO in future. + default "speaker enable" if BOARD_GOOGLE_JACUZZI || BOARD_GOOGLE_JUNIPER + default "speaker enable" if BOARD_GOOGLE_WILLOW || BOARD_GOOGLE_DAMU + # MAX98360 + default "speaker enable" if BOARD_GOOGLE_BURNET || BOARD_GOOGLE_ESCHE + default "speaker enable" if BOARD_GOOGLE_KAPPA + # ALC1015Q (default for Jacuzzi followers) + default "rt1015p sdb" if BOARD_GOOGLE_KAKADU + default "rt1015p sdb" if BOARD_GOOGLE_JACUZZI_COMMON + # MAX98357A (default for Kukui followers) + default "speaker enable" + endif diff --git a/src/mainboard/google/kukui/chromeos.c b/src/mainboard/google/kukui/chromeos.c index c5810d11aa..3f15a3fb91 100644 --- a/src/mainboard/google/kukui/chromeos.c +++ b/src/mainboard/google/kukui/chromeos.c @@ -23,7 +23,7 @@ void fill_lb_gpios(struct lb_gpios *gpios) {EC_IN_RW.id, ACTIVE_HIGH, -1, "EC in RW"}, {EC_IRQ.id, ACTIVE_LOW, -1, "EC interrupt"}, {CR50_IRQ.id, ACTIVE_HIGH, -1, "TPM interrupt"}, - {GPIO_EN_SPK_AMP.id, ACTIVE_HIGH, -1, "speaker enable"}, + {GPIO_EN_SPK_AMP.id, ACTIVE_HIGH, -1, CONFIG_SPEAKER_GPIO_NAME}, }; lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); } -- cgit v1.2.3