diff --git a/src/mainboard/google/skywalker/chromeos.c b/src/mainboard/google/skywalker/chromeos.c index 36be542606..700d815c68 100644 --- a/src/mainboard/google/skywalker/chromeos.c +++ b/src/mainboard/google/skywalker/chromeos.c @@ -56,6 +56,11 @@ void fill_lb_gpios(struct lb_gpios *gpios) {GPIO_EN_SPKR.id, ACTIVE_HIGH, -1, "rt9123_spk_en"}, }; lb_add_gpios(gpios, rt9123_gpios, ARRAY_SIZE(rt9123_gpios)); + } else if (fw_config_probe(FW_CONFIG(AUDIO_AMP, AMP_RT1019))) { + struct lb_gpio rt1019_gpios[] = { + {GPIO_EN_SPKR.id, ACTIVE_HIGH, -1, "rt1019_spk_en"}, + }; + lb_add_gpios(gpios, rt1019_gpios, ARRAY_SIZE(rt1019_gpios)); } else if (fw_config_probe(FW_CONFIG(AUDIO_AMP, AMP_ALC5645))) { struct lb_gpio alc5645_gpios[] = { {GPIO_EN_SPKR.id, ACTIVE_HIGH, -1, "alc5645_spk_en"}, diff --git a/src/mainboard/google/skywalker/devicetree.cb b/src/mainboard/google/skywalker/devicetree.cb index bb54417867..92f9c5d9e3 100644 --- a/src/mainboard/google/skywalker/devicetree.cb +++ b/src/mainboard/google/skywalker/devicetree.cb @@ -7,6 +7,7 @@ end fw_config field AUDIO_AMP 25 27 option AMP_RT9123 0 + option AMP_RT1019 1 option AMP_ALC5645 3 end end diff --git a/src/mainboard/google/skywalker/mainboard.c b/src/mainboard/google/skywalker/mainboard.c index bd1829904a..652d81253f 100644 --- a/src/mainboard/google/skywalker/mainboard.c +++ b/src/mainboard/google/skywalker/mainboard.c @@ -17,7 +17,7 @@ #define AFE_SE_SECURE_CON1 (AUDIO_BASE + 0x5634) -static void configure_rt9123(void) +static void configure_rt9123_rt1019(void) { /* SoC I2S */ gpio_set_mode(GPIO_I2SOUT1_BCK, GPIO_FUNC(DMIC0_DAT0, I2SOUT1_BCK)); @@ -49,8 +49,9 @@ static void configure_audio(void) /* Switch to normal mode */ write32p(AFE_SE_SECURE_CON1, 0x0); - if (fw_config_probe(FW_CONFIG(AUDIO_AMP, AMP_RT9123))) - configure_rt9123(); + if (fw_config_probe(FW_CONFIG(AUDIO_AMP, AMP_RT9123)) || + fw_config_probe(FW_CONFIG(AUDIO_AMP, AMP_RT1019))) + configure_rt9123_rt1019(); else if (fw_config_probe(FW_CONFIG(AUDIO_AMP, AMP_ALC5645))) configure_alc5645(); else