2022-09-13 05:51:42

by 'Manivannan Sadhasivam'

[permalink] [raw]
Subject: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

The firmware location in linux-firmware has been changed to include the
SoC name. So use the updated location in Thinkpad devicetree.

Signed-off-by: Manivannan Sadhasivam <[email protected]>
---
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index c379650e52b1..3b7943d6e164 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -554,13 +554,13 @@ keyboard@68 {
};

&remoteproc_adsp {
- firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
+ firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";

status = "okay";
};

&remoteproc_nsp0 {
- firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
+ firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";

status = "okay";
};
--
2.30.2


2022-09-13 10:23:02

by Johan Hovold

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

On Tue, Sep 13, 2022 at 11:10:30AM +0530, Manivannan Sadhasivam wrote:
> The firmware location in linux-firmware has been changed to include the
> SoC name. So use the updated location in Thinkpad devicetree.
>
> Signed-off-by: Manivannan Sadhasivam <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

I guess we should pick a commit prefix that we stick to for changes to
this driver.

arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s:

is arguably unnecessarily long even if it follows the pattern of some
other qcom dts.

Shall we just use

arm64: dts: qcom: sc8280xp-x13s:

which matches sc8280xp-crd? Or stick "lenovo" in there as well? Or just
keep the whole thing unchanged?

> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> index c379650e52b1..3b7943d6e164 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -554,13 +554,13 @@ keyboard@68 {
> };
>
> &remoteproc_adsp {
> - firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
>
> status = "okay";
> };
>
> &remoteproc_nsp0 {
> - firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
>
> status = "okay";
> };

Change itself looks good otherwise:

Reviewed-by: Johan Hovold <[email protected]>

Johan

2022-09-13 10:36:25

by Johan Hovold

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

[ Resend with Bjorn's address updated as the Linaro one now bounces. ]

On Tue, Sep 13, 2022 at 11:10:30AM +0530, Manivannan Sadhasivam wrote:
> The firmware location in linux-firmware has been changed to include the
> SoC name. So use the updated location in Thinkpad devicetree.
>
> Signed-off-by: Manivannan Sadhasivam <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

I guess we should pick a commit prefix that we stick to for changes to
this driver.

arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s:

is arguably unnecessarily long even if it follows the pattern of some
other qcom dts.

Shall we just use

arm64: dts: qcom: sc8280xp-x13s:

which matches sc8280xp-crd? Or stick "lenovo" in there as well? Or just
keep the whole thing unchanged?

> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> index c379650e52b1..3b7943d6e164 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -554,13 +554,13 @@ keyboard@68 {
> };
>
> &remoteproc_adsp {
> - firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
>
> status = "okay";
> };
>
> &remoteproc_nsp0 {
> - firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
>
> status = "okay";
> };

Change itself looks good otherwise:

Reviewed-by: Johan Hovold <[email protected]>

Johan

2022-09-13 11:15:52

by 'Manivannan Sadhasivam'

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

On Tue, Sep 13, 2022 at 12:07:32PM +0200, Johan Hovold wrote:
> [ Resend with Bjorn's address updated as the Linaro one now bounces. ]
>
> On Tue, Sep 13, 2022 at 11:10:30AM +0530, Manivannan Sadhasivam wrote:
> > The firmware location in linux-firmware has been changed to include the
> > SoC name. So use the updated location in Thinkpad devicetree.
> >
> > Signed-off-by: Manivannan Sadhasivam <[email protected]>
> > ---
> > arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
>
> I guess we should pick a commit prefix that we stick to for changes to
> this driver.
>
> arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s:
>
> is arguably unnecessarily long even if it follows the pattern of some
> other qcom dts.
>
> Shall we just use
>
> arm64: dts: qcom: sc8280xp-x13s:

This looks looks better. I did look into the earlier commits but I found
the prefix to be too long, so went with the last commit prefix.

>
> which matches sc8280xp-crd? Or stick "lenovo" in there as well? Or just
> keep the whole thing unchanged?
>
> > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > index c379650e52b1..3b7943d6e164 100644
> > --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > @@ -554,13 +554,13 @@ keyboard@68 {
> > };
> >
> > &remoteproc_adsp {
> > - firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> > + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
> >
> > status = "okay";
> > };
> >
> > &remoteproc_nsp0 {
> > - firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> > + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
> >
> > status = "okay";
> > };
>
> Change itself looks good otherwise:
>
> Reviewed-by: Johan Hovold <[email protected]>
>

Thanks! I will respin with the agreed prefix.

Regards,
Mani

> Johan

2022-09-13 20:54:46

by Steev Klimaszewski

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location


On 9/13/22 12:40 AM, Manivannan Sadhasivam wrote:
> The firmware location in linux-firmware has been changed to include the
> SoC name. So use the updated location in Thinkpad devicetree.
>
> Signed-off-by: Manivannan Sadhasivam <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> index c379650e52b1..3b7943d6e164 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -554,13 +554,13 @@ keyboard@68 {
> };
>
> &remoteproc_adsp {
> - firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
>
> status = "okay";
> };
>
> &remoteproc_nsp0 {
> - firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
>
> status = "okay";
> };

Tested-by: Steev Klimaszewski <[email protected]>

2022-09-13 21:12:01

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

On Tue, Sep 13, 2022 at 04:27:34PM +0530, Manivannan Sadhasivam wrote:
> On Tue, Sep 13, 2022 at 12:07:32PM +0200, Johan Hovold wrote:
> > [ Resend with Bjorn's address updated as the Linaro one now bounces. ]
> >
> > On Tue, Sep 13, 2022 at 11:10:30AM +0530, Manivannan Sadhasivam wrote:
> > > The firmware location in linux-firmware has been changed to include the
> > > SoC name. So use the updated location in Thinkpad devicetree.
> > >
> > > Signed-off-by: Manivannan Sadhasivam <[email protected]>
> > > ---
> > > arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > I guess we should pick a commit prefix that we stick to for changes to
> > this driver.
> >
> > arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s:
> >
> > is arguably unnecessarily long even if it follows the pattern of some
> > other qcom dts.
> >
> > Shall we just use
> >
> > arm64: dts: qcom: sc8280xp-x13s:
>
> This looks looks better. I did look into the earlier commits but I found
> the prefix to be too long, so went with the last commit prefix.
>

+1

> >
> > which matches sc8280xp-crd? Or stick "lenovo" in there as well? Or just
> > keep the whole thing unchanged?
> >
> > > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > > index c379650e52b1..3b7943d6e164 100644
> > > --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > > @@ -554,13 +554,13 @@ keyboard@68 {
> > > };
> > >
> > > &remoteproc_adsp {
> > > - firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> > > + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
> > >
> > > status = "okay";
> > > };
> > >
> > > &remoteproc_nsp0 {
> > > - firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> > > + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
> > >
> > > status = "okay";
> > > };
> >
> > Change itself looks good otherwise:
> >
> > Reviewed-by: Johan Hovold <[email protected]>
> >
>
> Thanks! I will respin with the agreed prefix.
>
> Regards,
> Mani
>
> > Johan