diff options
| author | Sean Rhodes <sean@starlabs.systems> | 2022-06-08 21:41:53 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-06-20 12:06:56 +0000 |
| commit | 9088b681f539873e70a8904ca41165f3e830232f (patch) | |
| tree | 2454d6d4ecd3c11dd87a9d0f516725cd25632d6c /src | |
| parent | ae64b6e5db2e35b45e76ee4ef9ec416a6f09384e (diff) | |
soc/intel/apollolake: Hook up UfsEnabled to devicetree
Hook up FSP S UfsEnabled UPD (1d.0) to devicetree.
UFS only exist on GLK, and has been there since its
initial releases.
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: I1976bfd340c728c64aaf36d296ac41dcd47bfc61
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65044
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src')
4 files changed, 9 insertions, 0 deletions
diff --git a/src/mainboard/google/octopus/variants/baseboard/devicetree.cb b/src/mainboard/google/octopus/variants/baseboard/devicetree.cb index 3dbc5ef080..abf53b47c5 100644 --- a/src/mainboard/google/octopus/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/octopus/variants/baseboard/devicetree.cb @@ -263,6 +263,7 @@ chip soc/intel/apollolake device pci 19.2 on end # - SPI 2 device pci 1a.0 on end # - PWM device pci 1c.0 on end # - eMMC + device pci 1d.0 on end # - UFS device pci 1e.0 off end # - SDIO device pci 1f.0 on chip ec/google/chromeec diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb index 75d69d309a..f025d1fd0a 100644 --- a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb +++ b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb @@ -177,6 +177,7 @@ chip soc/intel/apollolake device pci 1a.0 on end # - PWM device pci 1b.0 on end # - SDCARD device pci 1c.0 on end # - eMMC + device pci 1d.0 on end # - UFS device pci 1e.0 off end # - SDIO device pci 1f.0 on # - LPC chip drivers/pc80/tpm diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index bab39bb4b6..20bbde9288 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -449,6 +449,9 @@ static void disable_dev(struct device *dev, FSP_S_CONFIG *silconfig) case PCH_DEVFN_CNVI: silconfig->CnviMode = 0; break; + case PCH_DEVFN_UFS: + silconfig->UfsEnabled = 0; + break; #endif case PCH_DEVFN_HDA: silconfig->HdaEnable = 0; diff --git a/src/soc/intel/apollolake/include/soc/pci_devs.h b/src/soc/intel/apollolake/include/soc/pci_devs.h index 9dbc11c3d6..cc31370d93 100644 --- a/src/soc/intel/apollolake/include/soc/pci_devs.h +++ b/src/soc/intel/apollolake/include/soc/pci_devs.h @@ -148,6 +148,10 @@ #define PCH_DEVFN_EMMC _PCH_DEVFN(EMMC, 0) #define PCH_DEV_EMMC _PCH_DEV(EMMC, 0) +#define PCH_DEV_SLOT_UFS 0x1d +#define PCH_DEVFN_UFS _PCH_DEVFN(UFS, 0) +#define PCH_DEV_UFS _PCH_DEV(UFS, 0) + #define PCH_DEV_SLOT_SDIO 0x1e #define PCH_DEVFN_SDIO _PCH_DEVFN(SDIO, 0) #define PCH_DEV_SDIO _PCH_DEV(SDIO, 0) |