diff options
Diffstat (limited to 'src/mainboard/google')
5 files changed, 16 insertions, 35 deletions
diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb index 2ab9a3d195..aac4bca376 100644 --- a/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb +++ b/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb @@ -11,6 +11,7 @@ fw_config option STORAGE_EMMC 0 option STORAGE_NVME 1 option STORAGE_UFS 2 + option STORAGE_UNKNOWN 3 end end diff --git a/src/mainboard/google/brya/variants/riven/Makefile.mk b/src/mainboard/google/brya/variants/riven/Makefile.mk index 86ba20d3c3..8ae0e3b61c 100644 --- a/src/mainboard/google/brya/variants/riven/Makefile.mk +++ b/src/mainboard/google/brya/variants/riven/Makefile.mk @@ -4,5 +4,4 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_FW_CONFIG) += fw_config.c -ramstage-$(CONFIG_FW_CONFIG) += variant.c ramstage-y += gpio.c diff --git a/src/mainboard/google/brya/variants/riven/fw_config.c b/src/mainboard/google/brya/variants/riven/fw_config.c index 7967282c00..b22463f01f 100644 --- a/src/mainboard/google/brya/variants/riven/fw_config.c +++ b/src/mainboard/google/brya/variants/riven/fw_config.c @@ -90,9 +90,11 @@ void fw_config_gpio_padbased_override(struct pad_config *padbased_table) ARRAY_SIZE(stylus_disable_pads)); } - if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_EMMC))) { - printk(BIOS_INFO, "Disable eMMC GPIO pins.\n"); - gpio_padbased_override(padbased_table, emmc_disable_pads, + if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNKNOWN))) { + if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_EMMC))) { + printk(BIOS_INFO, "Disable eMMC GPIO pins.\n"); + gpio_padbased_override(padbased_table, emmc_disable_pads, ARRAY_SIZE(emmc_disable_pads)); + } } } diff --git a/src/mainboard/google/brya/variants/riven/overridetree.cb b/src/mainboard/google/brya/variants/riven/overridetree.cb index 796a79c708..301d72a966 100644 --- a/src/mainboard/google/brya/variants/riven/overridetree.cb +++ b/src/mainboard/google/brya/variants/riven/overridetree.cb @@ -478,14 +478,22 @@ chip soc/intel/alderlake end end device ref pcie_rp7 off end # PCIE7 no SD card - device ref emmc on end + device ref emmc on + probe STORAGE STORAGE_UNKNOWN + probe STORAGE STORAGE_EMMC + end device ref ish on chip drivers/intel/ish register "add_acpi_dma_property" = "true" device generic 0 on end end + probe STORAGE STORAGE_UNKNOWN + probe STORAGE STORAGE_UFS + end + device ref ufs on + probe STORAGE STORAGE_UNKNOWN + probe STORAGE STORAGE_UFS end - device ref ufs on end device ref pch_espi on chip ec/google/chromeec use conn0 as mux_conn[0] diff --git a/src/mainboard/google/brya/variants/riven/variant.c b/src/mainboard/google/brya/variants/riven/variant.c deleted file mode 100644 index 937215c06d..0000000000 --- a/src/mainboard/google/brya/variants/riven/variant.c +++ /dev/null @@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <baseboard/variants.h> -#include <console/console.h> -#include <device/device.h> -#include <fw_config.h> - -void variant_devtree_update(void) -{ - struct device *emmc = DEV_PTR(emmc); - struct device *ufs = DEV_PTR(ufs); - struct device *ish = DEV_PTR(ish); - - if (!fw_config_is_provisioned()) { - printk(BIOS_INFO, "fw_config unprovisioned so enable all storage devices\n"); - return; - } - - if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_EMMC))) { - printk(BIOS_INFO, "eMMC disabled by fw_config\n"); - emmc->enabled = 0; - } - - if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UFS))) { - printk(BIOS_INFO, "UFS disabled by fw_config\n"); - ufs->enabled = 0; - ish->enabled = 0; - } -} |