mb/google/zork: only enable RTD2141 when present

An MST hub is only present on some devices that are configured with a
particular daughterboard indicated by EC fw_config, so add a fw_config
probe that matches the USB daughterboard ID from CBI to only enable it
on devices where present, using variant-specific daughterboard IDs.

BUG=b:185862297
TEST=RTD2141 remains in ACPI tables on a berknip with Dali DB, and is
     not present on the same system if probe is changed to enable it
     for picasso DB.
BRANCH=zork

Change-Id: I4ada9b492ab221fa98350bf2faf27a23342f3a55
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56990
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sam McNally <sammc@google.com>
This commit is contained in:
Peter Marheine 2021-08-17 11:06:01 +10:00 committed by Felix Held
parent b90e6fdd25
commit 2c36b1b667
5 changed files with 55 additions and 1 deletions

View File

@ -1,4 +1,9 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
fw_config
field USB_DAUGHTERBOARD 0 3 end
end
chip soc/amd/picasso chip soc/amd/picasso
# Set FADT Configuration # Set FADT Configuration
@ -408,7 +413,8 @@ chip soc/amd/picasso
register "name" = ""MSTH"" register "name" = ""MSTH""
register "uid" = "1" register "uid" = "1"
register "desc" = ""Realtek RTD2141B"" register "desc" = ""Realtek RTD2141B""
device i2c 4a on end # Device presence is variant-specific
device i2c 4a alias db_mst off end
end end
end end
end end

View File

@ -1,4 +1,12 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
fw_config
field USB_DAUGHTERBOARD
option BERKNIP_DB_PICASSO 0
option BERKNIP_DB_DALI 1
end
end
chip soc/amd/picasso chip soc/amd/picasso
# Start : OPN Performance Configuration # Start : OPN Performance Configuration
@ -171,4 +179,8 @@ chip soc/amd/picasso
end end
end end
device ref db_mst on
probe USB_DAUGHTERBOARD BERKNIP_DB_DALI
end
end # chip soc/amd/picasso end # chip soc/amd/picasso

View File

@ -1,4 +1,12 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
fw_config
field USB_DAUGHTERBOARD
option MORPHIUS_DB_PICASSO 0
option MORPHIUS_DB_DALI 1
end
end
chip soc/amd/picasso chip soc/amd/picasso
# Start : OPN Performance Configuration # Start : OPN Performance Configuration
@ -136,4 +144,8 @@ chip soc/amd/picasso
end end
end end
device ref db_mst on
probe USB_DAUGHTERBOARD MORPHIUS_DB_DALI
end
end # chip soc/amd/picasso end # chip soc/amd/picasso

View File

@ -1,4 +1,13 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
fw_config
field USB_DAUGHTERBOARD
option TREMBYLE_DB_PICASSO 0
option TREMBYLE_DB_DALI 1
option TREMBYLE_DB_DALI_HDMI 2
end
end
chip soc/amd/picasso chip soc/amd/picasso
# Start : OPN Performance Configuration # Start : OPN Performance Configuration
@ -104,4 +113,8 @@ chip soc/amd/picasso
end end
end end
device ref db_mst on
probe USB_DAUGHTERBOARD TREMBYLE_DB_DALI_HDMI
end
end # chip soc/amd/picasso end # chip soc/amd/picasso

View File

@ -1,5 +1,12 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
fw_config
field USB_DAUGHTERBOARD
option WOOMAX_DB_PICASSO 0
option WOOMAX_DB_DALI 1
end
end
chip soc/amd/picasso chip soc/amd/picasso
# Start : OPN Performance Configuration # Start : OPN Performance Configuration
@ -110,4 +117,8 @@ chip soc/amd/picasso
end end
end end
device ref db_mst on
probe USB_DAUGHTERBOARD WOOMAX_DB_DALI
end
end # chip soc/amd/picasso end # chip soc/amd/picasso