[PATCH] x86: fsp: Replace e-mmc with emmc in devicetree bindings

[PATCH] x86: fsp: Replace e-mmc with emmc in devicetree bindings

[Wolfgang Wallner]

The term eMMC is used inconsistently within the FSP devicetree
bindigs (e-mmc and emmc), especially for "emmc-host-max-speed"
documentation and code disagree.

Change all eMMC instances within the FSP bindings to consistently
use "emmc". The term "emmc" is already used a lot within U-Boot,
while "e-mmc" is only used in the FSP bindings.

Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>

---

 arch/x86/cpu/apollolake/fsp_bindings.c                 | 6 +++---
 doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt | 2 +-
 doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index bbf04b5009..319c78b95a 100644
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -555,7 +555,7 @@ const struct fsp_binding fsp_m_bindings[] = {
 	}, {
 	.type = FSP_UINT8,
 	.offset = offsetof(struct fsp_m_config, e_mmc_trace_len),
-	.propname = "fspm,e-mmc-trace-len",
+	.propname = "fspm,emmc-trace-len",
 	}, {
 	.type = FSP_UINT8,
 	.offset = offsetof(struct fsp_m_config, skip_cse_rbp),
@@ -1465,11 +1465,11 @@ const struct fsp_binding fsp_s_bindings[] = {
 	}, {
 	.type = FSP_UINT8,
 	.offset = offsetof(struct fsp_s_config, e_mmc_enabled),
-	.propname = "fsps,e-mmc-enabled",
+	.propname = "fsps,emmc-enabled",
 	}, {
 	.type = FSP_UINT8,
 	.offset = offsetof(struct fsp_s_config, e_mmc_host_max_speed),
-	.propname = "fsps,e-mmc-host-max-speed",
+	.propname = "fsps,emmc-host-max-speed",
 	}, {
 	.type = FSP_UINT8,
 	.offset = offsetof(struct fsp_s_config, ufs_enabled),
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 666400e085..36936f2eb6 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 731a310cf8..b605ed0056 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
-- 
2.28.0

[PATCH] x86: fsp: Replace e-mmc with emmc in devicetree bindings

[Simon Glass]

On Fri, 11 Sep 2020 at 08:52, Wolfgang Wallner
<wolfgang.wallner@br-automation.com> wrote:
>
> The term eMMC is used inconsistently within the FSP devicetree
> bindigs (e-mmc and emmc), especially for "emmc-host-max-speed"
> documentation and code disagree.
>
> Change all eMMC instances within the FSP bindings to consistently
> use "emmc". The term "emmc" is already used a lot within U-Boot,
> while "e-mmc" is only used in the FSP bindings.
>
> Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
>
> ---
>
>  arch/x86/cpu/apollolake/fsp_bindings.c                 | 6 +++---
>  doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt | 2 +-
>  doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

[PATCH] x86: fsp: Replace e-mmc with emmc in devicetree bindings

[Bin Meng]

On Fri, Sep 11, 2020 at 10:52 PM Wolfgang Wallner
<wolfgang.wallner@br-automation.com> wrote:
>
> The term eMMC is used inconsistently within the FSP devicetree
> bindigs (e-mmc and emmc), especially for "emmc-host-max-speed"

typo: bindings

I can fix this when applying

> documentation and code disagree.
>
> Change all eMMC instances within the FSP bindings to consistently
> use "emmc". The term "emmc" is already used a lot within U-Boot,
> while "e-mmc" is only used in the FSP bindings.
>
> Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
>
> ---
>
>  arch/x86/cpu/apollolake/fsp_bindings.c                 | 6 +++---
>  doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt | 2 +-
>  doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[PATCH] x86: fsp: Replace e-mmc with emmc in devicetree bindings

[Bin Meng]

On Mon, Sep 21, 2020 at 9:33 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> On Fri, Sep 11, 2020 at 10:52 PM Wolfgang Wallner
> <wolfgang.wallner@br-automation.com> wrote:
> >
> > The term eMMC is used inconsistently within the FSP devicetree
> > bindigs (e-mmc and emmc), especially for "emmc-host-max-speed"
>
> typo: bindings
>
> I can fix this when applying

Fixed the typo, and

>
> > documentation and code disagree.
> >
> > Change all eMMC instances within the FSP bindings to consistently
> > use "emmc". The term "emmc" is already used a lot within U-Boot,
> > while "e-mmc" is only used in the FSP bindings.
> >
> > Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
> >
> > ---
> >
> >  arch/x86/cpu/apollolake/fsp_bindings.c                 | 6 +++---
> >  doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt | 2 +-
> >  doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt | 2 +-
> >  3 files changed, 5 insertions(+), 5 deletions(-)
> >
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

applied to u-boot-x86, thanks!