diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-21 14:25:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-21 14:25:37 -0400 |
| commit | 751b18b8a1b576aecf51faf22c2bb9e7ce70debd (patch) | |
| tree | 9339296afd74657deb93955cf5b187f9194d7b5d /doc/device-tree-bindings | |
| parent | 3bacb5ee76eadc97c0606e1b408604d20db9a97d (diff) | |
| parent | ba2a0cbb053951ed6d36161989d38da724696b4d (diff) | |
| download | u-boot-751b18b8a1b576aecf51faf22c2bb9e7ce70debd.zip u-boot-751b18b8a1b576aecf51faf22c2bb9e7ce70debd.tar.gz u-boot-751b18b8a1b576aecf51faf22c2bb9e7ce70debd.tar.bz2 | |
Merge branch 'master' into next
Merge in v2020.10-rc5
Diffstat (limited to 'doc/device-tree-bindings')
| -rw-r--r-- | doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt | 2 | ||||
| -rw-r--r-- | doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt index 666400e..36936f2 100644 --- a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt +++ b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt @@ -174,7 +174,7 @@ Optional properties: - fspm,oem-loading-base: OEM File Loading Address - fspm,oem-file-name: OEM File Name to Load - fspm,mrc-boot-data-ptr: -- fspm,e-mmc-trace-len: eMMC Trace Length +- fspm,emmc-trace-len: eMMC Trace Length 0x0: Long 0x1: Short - fspm,skip-cse-rbp: Skip CSE RBP to support zero sized IBB diff --git a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt index 731a310..b605ed0 100644 --- a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt +++ b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt @@ -318,7 +318,7 @@ Optional properties: 0x6: warm reset (default) 0xE: cold reset - fsps,sdcard-enabled: SD Card Support (D27:F0) -- fsps,e-mmc-enabled: SeMMC Support (D28:F0) +- fsps,emmc-enabled: SeMMC Support (D28:F0) - fsps,emmc-host-max-speed: eMMC Max Speed 0: HS400(default) 1: HS200 |