Change in coreboot[master]: mb/google/volteer: Add ALC5682 + MAX98360 configuration

[Chen Wisley (Code Review)]

Chen Wisley has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47291 )

Change subject: mb/google/volteer: Add  ALC5682 + MAX98360 configuration
......................................................................

mb/google/volteer: Add  ALC5682 + MAX98360 configuration

BUG=b:171174991
TEST=emerge-volteer coreboot

Change-Id: I85bc37980957a3fb6c795858a4e4f44f3e3cc332
Signed-off-by: Wisley Chen 
---
M src/mainboard/google/volteer/fw_config.c
M src/mainboard/google/volteer/variants/baseboard/devicetree.cb
2 files changed, 3 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/47291/1

diff --git a/src/mainboard/google/volteer/fw_config.c b/src/mainboard/google/volteer/fw_config.c
index 0538e74..4067fa5 100644
--- a/src/mainboard/google/volteer/fw_config.c
+++ b/src/mainboard/google/volteer/fw_config.c
@@ -81,7 +81,8 @@
    	gpio_configure_pads(i2s_disable_pads, ARRAY_SIZE(i2s_disable_pads));
    }
    if (fw_config_probe(FW_CONFIG(AUDIO, MAX98357_ALC5682I_I2S)) ||
-	    fw_config_probe(FW_CONFIG(AUDIO, MAX98373_ALC5682I_I2S))) {
+	    fw_config_probe(FW_CONFIG(AUDIO, MAX98373_ALC5682I_I2S)) ||
+	    fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_I2S))) {
    	printk(BIOS_INFO, "Configure GPIOs for I2S audio on UP3.\n");
    	gpio_configure_pads(i2s_up3_enable_pads, ARRAY_SIZE(i2s_up3_enable_pads));
    	gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads));
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index 20a3843..50be736 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -15,6 +15,7 @@
    	option MAX98373_ALC5682I_I2S 2
    	option MAX98373_ALC5682_SNDW 3
    	option MAX98373_ALC5682I_I2S_UP4 4
+		option MAX98360_ALC5682I_I2S 5
    end
    field TABLETMODE 11
    	option TABLETMODE_DISABLED 0

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47291 )

Change subject: mb/google/volteer: Add  ALC5682 + MAX98360 configuration
......................................................................

Patch Set 1:

(3 comments)

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG@7 
PS1, Line 7:  
nit: extra space

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG@7 
PS1, Line 7:  
nit: "audio configuration"

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG@8 
PS1, Line 8: 
Something like this for a description:
"Add new MAX98360_ALC5682I_I2S Audio option to FW_CONFIG" ?

Change in coreboot[master]: mb/google/volteer: Add new MAX98360_ALC5682I_I2S Audio option to FW_C...

[Chen Wisley (Code Review)]

Hello build bot (Jenkins), Tim Wawrzynczak, Nick Vaccaro, YH Lin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47291

to look at the new patch set (#2).

Change subject: mb/google/volteer: Add new MAX98360_ALC5682I_I2S Audio option to FW_CONFIG
......................................................................

mb/google/volteer: Add new MAX98360_ALC5682I_I2S Audio option to FW_CONFIG

BUG=b:171174991
TEST=emerge-volteer coreboot

Change-Id: I85bc37980957a3fb6c795858a4e4f44f3e3cc332
Signed-off-by: Wisley Chen 
---
M src/mainboard/google/volteer/fw_config.c
M src/mainboard/google/volteer/variants/baseboard/devicetree.cb
2 files changed, 3 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/47291/2

Change in coreboot[master]: mb/google/volteer: Add new MAX98360_ALC5682I_I2S Audio option to FW_C...

[Chen Wisley (Code Review)]

Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47291 )

Change subject: mb/google/volteer: Add new MAX98360_ALC5682I_I2S Audio option to FW_CONFIG
......................................................................

Patch Set 2:

(3 comments)

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG@7 
PS1, Line 7:
> nit: "audio configuration"

Done

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG@7 
PS1, Line 7:
> nit: extra space

Done

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG@8 
PS1, Line 8:
> Something like this for a description: […]

Done, thanks

Change in coreboot[master]: mb/google/volteer: Add new MAX98360_ALC5682I_I2S Audio option to FW_C...

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47291 )

Change subject: mb/google/volteer: Add new MAX98360_ALC5682I_I2S Audio option to FW_CONFIG
......................................................................

Patch Set 2: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/47291/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/47291/2//COMMIT_MSG@7 
PS2, Line 7: mb/google/volteer: Add new MAX98360_ALC5682I_I2S Audio option to FW_CONFIG
Sorry I guess that was too wide. How about:
```
mb/google/volteer: Add new Audio option to FW_CONFIG

Volteer has a new Audio option in FW_CONFIG. This patch adds
support for it and when enabled, programs GPIO pins for I2S
functionality.
```

Change in coreboot[master]: mb/google/volteer: Add new Audio option to FW_CONFIG

[Chen Wisley (Code Review)]

Hello build bot (Jenkins), Tim Wawrzynczak, Nick Vaccaro, YH Lin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47291

to look at the new patch set (#3).

Change subject: mb/google/volteer: Add new Audio option to FW_CONFIG
......................................................................

mb/google/volteer: Add new Audio option to FW_CONFIG

Volteer has a new Audio option in FW_CONFIG. This patch adds
support for it and when enabled, programs GPIO pins for I2S
functionality.

BUG=b:171174991
TEST=emerge-volteer coreboot

Change-Id: I85bc37980957a3fb6c795858a4e4f44f3e3cc332
Signed-off-by: Wisley Chen 
---
M src/mainboard/google/volteer/fw_config.c
M src/mainboard/google/volteer/variants/baseboard/devicetree.cb
2 files changed, 3 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/47291/3

Change in coreboot[master]: mb/google/volteer: Add new Audio option to FW_CONFIG

[Chen Wisley (Code Review)]

Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47291 )

Change subject: mb/google/volteer: Add new Audio option to FW_CONFIG
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47291/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/47291/2//COMMIT_MSG@7 
PS2, Line 7: mb/google/volteer: Add new MAX98360_ALC5682I_I2S Audio option to FW_CONFIG
> Sorry I guess that was too wide. How about: […]

Done

Change in coreboot[master]: mb/google/volteer: Add new Audio option to FW_CONFIG

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47291 )

Change subject: mb/google/volteer: Add new Audio option to FW_CONFIG
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/47291/1//COMMIT_MSG@8 
PS1, Line 8:
> Done, thanks

Ack

Change in coreboot[master]: mb/google/volteer: Add new Audio option to FW_CONFIG

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47291 )

Change subject: mb/google/volteer: Add new Audio option to FW_CONFIG
......................................................................

mb/google/volteer: Add new Audio option to FW_CONFIG

Volteer has a new Audio option in FW_CONFIG. This patch adds
support for it and when enabled, programs GPIO pins for I2S
functionality.

BUG=b:171174991
TEST=emerge-volteer coreboot

Change-Id: I85bc37980957a3fb6c795858a4e4f44f3e3cc332
Signed-off-by: Wisley Chen 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47291
Tested-by: build bot (Jenkins) 
Reviewed-by: Tim Wawrzynczak 
---
M src/mainboard/google/volteer/fw_config.c
M src/mainboard/google/volteer/variants/baseboard/devicetree.cb
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Tim Wawrzynczak: Looks good to me, approved

diff --git a/src/mainboard/google/volteer/fw_config.c b/src/mainboard/google/volteer/fw_config.c
index 0538e74..4067fa5 100644
--- a/src/mainboard/google/volteer/fw_config.c
+++ b/src/mainboard/google/volteer/fw_config.c
@@ -81,7 +81,8 @@
    	gpio_configure_pads(i2s_disable_pads, ARRAY_SIZE(i2s_disable_pads));
    }
    if (fw_config_probe(FW_CONFIG(AUDIO, MAX98357_ALC5682I_I2S)) ||
-	    fw_config_probe(FW_CONFIG(AUDIO, MAX98373_ALC5682I_I2S))) {
+	    fw_config_probe(FW_CONFIG(AUDIO, MAX98373_ALC5682I_I2S)) ||
+	    fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_I2S))) {
    	printk(BIOS_INFO, "Configure GPIOs for I2S audio on UP3.\n");
    	gpio_configure_pads(i2s_up3_enable_pads, ARRAY_SIZE(i2s_up3_enable_pads));
    	gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads));
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index 20a3843..50be736 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -15,6 +15,7 @@
    	option MAX98373_ALC5682I_I2S 2
    	option MAX98373_ALC5682_SNDW 3
    	option MAX98373_ALC5682I_I2S_UP4 4
+		option MAX98360_ALC5682I_I2S 5
    end
    field TABLETMODE 11
    	option TABLETMODE_DISABLED 0