From 7f4c30c1d5c16539faf564d38ebbc695bca8836a Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Tue, 16 Mar 2021 14:22:21 +0800 Subject: [PATCH] mb/google/zork: Move max98357a out of baseboard Not all of dalboz variants support the this amp. Thus, move out of baseboard. BUG=b:182815488 TEST=builds Signed-off-by: Eric Lai Change-Id: If708574f5fb18dd3b4f2ef978529a16a40d5dc0c Reviewed-on: https://review.coreboot.org/c/coreboot/+/51511 Tested-by: build bot (Jenkins) Reviewed-by: Yu-hsuan Hsu Reviewed-by: Kangheui Won --- .../google/zork/variants/baseboard/devicetree_dalboz.cb | 7 ------- src/mainboard/google/zork/variants/dalboz/overridetree.cb | 7 +++++++ .../google/zork/variants/dirinboz/overridetree.cb | 7 +++++++ src/mainboard/google/zork/variants/gumboz/overridetree.cb | 7 +++++++ src/mainboard/google/zork/variants/shuboz/overridetree.cb | 7 +++++++ 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index 824506437e..d4120731c1 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb @@ -402,13 +402,6 @@ chip soc/amd/picasso device pci 18.6 on end end # domain - chip drivers/generic/max98357a - register "hid" = ""MX98357A"" - register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_91)" - register "sdmode_delay" = "5" - device generic 0.1 on end - end - device mmio 0xfedc5000 on chip drivers/i2c/tpm register "hid" = ""GOOG0005"" diff --git a/src/mainboard/google/zork/variants/dalboz/overridetree.cb b/src/mainboard/google/zork/variants/dalboz/overridetree.cb index d047211f30..f6061e5040 100644 --- a/src/mainboard/google/zork/variants/dalboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/dalboz/overridetree.cb @@ -110,4 +110,11 @@ chip soc/amd/picasso device i2c 2c on end end end + + chip drivers/generic/max98357a + register "hid" = ""MX98357A"" + register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_91)" + register "sdmode_delay" = "5" + device generic 0.1 on end + end end # chip soc/amd/picasso diff --git a/src/mainboard/google/zork/variants/dirinboz/overridetree.cb b/src/mainboard/google/zork/variants/dirinboz/overridetree.cb index 43f4ff7a4f..7139ac8ec2 100644 --- a/src/mainboard/google/zork/variants/dirinboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/dirinboz/overridetree.cb @@ -145,4 +145,11 @@ chip soc/amd/picasso device i2c 40 on end end end + + chip drivers/generic/max98357a + register "hid" = ""MX98357A"" + register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_91)" + register "sdmode_delay" = "5" + device generic 0.1 on end + end end # chip soc/amd/picasso diff --git a/src/mainboard/google/zork/variants/gumboz/overridetree.cb b/src/mainboard/google/zork/variants/gumboz/overridetree.cb index b25641a828..9e62a58339 100644 --- a/src/mainboard/google/zork/variants/gumboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/gumboz/overridetree.cb @@ -145,4 +145,11 @@ chip soc/amd/picasso device i2c 40 on end end end + + chip drivers/generic/max98357a + register "hid" = ""MX98357A"" + register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_91)" + register "sdmode_delay" = "5" + device generic 0.1 on end + end end # chip soc/amd/picasso diff --git a/src/mainboard/google/zork/variants/shuboz/overridetree.cb b/src/mainboard/google/zork/variants/shuboz/overridetree.cb index 4358ac20b9..663bbb89d2 100644 --- a/src/mainboard/google/zork/variants/shuboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/shuboz/overridetree.cb @@ -82,4 +82,11 @@ chip soc/amd/picasso end end end # device + + chip drivers/generic/max98357a + register "hid" = ""MX98357A"" + register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_91)" + register "sdmode_delay" = "5" + device generic 0.1 on end + end end # chip soc/amd/picasso