diff mbox series

[3/4] x86: coral: Correct some FSP-S settings

Message ID 20200525141554.3.Id58c8292b7bc9a9dc55c21e4f5ad6a1a8000dc99@changeid
State Superseded
Delegated to: Bin Meng
Headers show
Series [1/4] x86: coral: Correct some FSP-M settings | expand

Commit Message

Simon Glass May 25, 2020, 8:15 p.m. UTC
Some settings were modified slightly in the device-tree conversion. Return
these to their original values. This makes WiFi work again.

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

 arch/x86/dts/chromebook_coral.dts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Bin Meng May 26, 2020, 8:15 a.m. UTC | #1
Hi Simon,

On Tue, May 26, 2020 at 4:16 AM Simon Glass <sjg@chromium.org> wrote:
>
> Some settings were modified slightly in the device-tree conversion. Return
> these to their original values. This makes WiFi work again.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  arch/x86/dts/chromebook_coral.dts | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts
> index 5ee056fc95..a17a9c2800 100644
> --- a/arch/x86/dts/chromebook_coral.dts
> +++ b/arch/x86/dts/chromebook_coral.dts
> @@ -600,13 +600,9 @@
>         fsps,emmc-rx-cmd-data-cntl1 = <0x00181717>;
>         fsps,emmc-rx-cmd-data-cntl2 = <0x10008>;
>
> -       /* Enable Audio Clock and Power gating */
> -       fsps,hd-audio-clk-gate = <1>;
> -       fsps,hd-audio-pwr-gate = <1>;
> -       fsps,bios-cfg-lock-down = <1>;
> -
> -       /* Enable lpss s0ix */
> -       fsps,lpss-s0ix-enable = <1>;
> +       /* Enable WiFi */
> +       fsps,pcie-root-port-en = [01 00 00 00 00 00];
> +       fsps,pcie-rp-hot-plug = [00 00 00 00 00 00];

It looks some settings are dropped and some are added. I assume we
only need to add something to override the default, no? The HDAudio
stuff looks nothing related to WiFi?

>
>         fsps,skip-mp-init = <1>;
>         fsps,spi-eiss = <0>;
> --

Regards,
Bin
Simon Glass May 27, 2020, 11:40 a.m. UTC | #2
Hi Bin,

On Tue, 26 May 2020 at 02:15, Bin Meng <bmeng.cn@gmail.com> wrote:
>
> Hi Simon,
>
> On Tue, May 26, 2020 at 4:16 AM Simon Glass <sjg@chromium.org> wrote:
> >
> > Some settings were modified slightly in the device-tree conversion. Return
> > these to their original values. This makes WiFi work again.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> >  arch/x86/dts/chromebook_coral.dts | 10 +++-------
> >  1 file changed, 3 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts
> > index 5ee056fc95..a17a9c2800 100644
> > --- a/arch/x86/dts/chromebook_coral.dts
> > +++ b/arch/x86/dts/chromebook_coral.dts
> > @@ -600,13 +600,9 @@
> >         fsps,emmc-rx-cmd-data-cntl1 = <0x00181717>;
> >         fsps,emmc-rx-cmd-data-cntl2 = <0x10008>;
> >
> > -       /* Enable Audio Clock and Power gating */
> > -       fsps,hd-audio-clk-gate = <1>;
> > -       fsps,hd-audio-pwr-gate = <1>;
> > -       fsps,bios-cfg-lock-down = <1>;
> > -
> > -       /* Enable lpss s0ix */
> > -       fsps,lpss-s0ix-enable = <1>;
> > +       /* Enable WiFi */
> > +       fsps,pcie-root-port-en = [01 00 00 00 00 00];
> > +       fsps,pcie-rp-hot-plug = [00 00 00 00 00 00];
>
> It looks some settings are dropped and some are added. I assume we
> only need to add something to override the default, no? The HDAudio
> stuff looks nothing related to WiFi?

Yes that's right. It is just intended to get it back the way it was.

I'll update the commit message.

>
> >
> >         fsps,skip-mp-init = <1>;
> >         fsps,spi-eiss = <0>;
> > --
>

Regards,
Simon
diff mbox series

Patch

diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts
index 5ee056fc95..a17a9c2800 100644
--- a/arch/x86/dts/chromebook_coral.dts
+++ b/arch/x86/dts/chromebook_coral.dts
@@ -600,13 +600,9 @@ 
 	fsps,emmc-rx-cmd-data-cntl1 = <0x00181717>;
 	fsps,emmc-rx-cmd-data-cntl2 = <0x10008>;
 
-	/* Enable Audio Clock and Power gating */
-	fsps,hd-audio-clk-gate = <1>;
-	fsps,hd-audio-pwr-gate = <1>;
-	fsps,bios-cfg-lock-down = <1>;
-
-	/* Enable lpss s0ix */
-	fsps,lpss-s0ix-enable = <1>;
+	/* Enable WiFi */
+	fsps,pcie-root-port-en = [01 00 00 00 00 00];
+	fsps,pcie-rp-hot-plug = [00 00 00 00 00 00];
 
 	fsps,skip-mp-init = <1>;
 	fsps,spi-eiss = <0>;