2023-08-04 00:22:43

by Tao Ren

[permalink] [raw]
Subject: [PATCH 0/3] ARM: dts: aspeed: Fixup Wedge400 dts

From: Tao Ren <[email protected]>

The patch series fixes a few entries in wedge400 device tree.

Patch #1 sets spi alias in ast2500-facebook-netbmc-common.dtsi (included
by wedge400 dts) to make sure spi bus is consistent with flash labels in
flash layout.

Patch #2 enables more ADC channels in wedge400 dts.

Patch #3 sets eMMC max frequency to 25MHz in wedge400 dts.

Tao Ren (3):
ARM: dts: aspeed: Update spi alias in Facebook AST2500 Common dtsi
ARM: dts: aspeed: wedge400: Enable more ADC channels
ARM: dts: aspeed: wedge400: Set eMMC max frequency

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts | 4 +++-
arch/arm/boot/dts/aspeed/ast2500-facebook-netbmc-common.dtsi | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)

--
2.40.1



2023-08-04 02:03:32

by Tao Ren

[permalink] [raw]
Subject: [PATCH 1/3] ARM: dts: aspeed: Update spi alias in Facebook AST2500 Common dtsi

From: Tao Ren <[email protected]>

Set FMC controller to "spi0" in ast2500-facebook-netbmc-common.dtsi so
the spi bus is consistent with the flash labels defined in flash layout.

Signed-off-by: Tao Ren <[email protected]>
---
arch/arm/boot/dts/aspeed/ast2500-facebook-netbmc-common.dtsi | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed/ast2500-facebook-netbmc-common.dtsi b/arch/arm/boot/dts/aspeed/ast2500-facebook-netbmc-common.dtsi
index c0c43b8644ee..7f1ae3f4df9d 100644
--- a/arch/arm/boot/dts/aspeed/ast2500-facebook-netbmc-common.dtsi
+++ b/arch/arm/boot/dts/aspeed/ast2500-facebook-netbmc-common.dtsi
@@ -4,6 +4,10 @@
#include "aspeed-g5.dtsi"

/ {
+ aliases {
+ spi0 = &fmc;
+ };
+
memory@80000000 {
reg = <0x80000000 0x40000000>;
};
--
2.40.1


2023-08-04 02:11:18

by Tao Ren

[permalink] [raw]
Subject: [PATCH 2/3] ARM: dts: aspeed: wedge400: Enable more ADC channels

From: Tao Ren <[email protected]>

Enable ASPEED-ADC channels 5-8 to support voltage monitoring of all the
Wedge400 hardware revisions.

Signed-off-by: Tao Ren <[email protected]>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
index ed305948386f..5c55afed946f 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
@@ -59,7 +59,8 @@ chosen {

ast-adc-hwmon {
compatible = "iio-hwmon";
- io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>, <&adc 4>;
+ io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>, <&adc 4>,
+ <&adc 5>, <&adc 6>, <&adc 7>, <&adc 8>;
};

/*
--
2.40.1


2023-08-09 09:14:18

by Joel Stanley

[permalink] [raw]
Subject: Re: [PATCH 0/3] ARM: dts: aspeed: Fixup Wedge400 dts

On Thu, 3 Aug 2023 at 23:03, <[email protected]> wrote:
>
> From: Tao Ren <[email protected]>
>
> The patch series fixes a few entries in wedge400 device tree.
>
> Patch #1 sets spi alias in ast2500-facebook-netbmc-common.dtsi (included
> by wedge400 dts) to make sure spi bus is consistent with flash labels in
> flash layout.
>
> Patch #2 enables more ADC channels in wedge400 dts.
>
> Patch #3 sets eMMC max frequency to 25MHz in wedge400 dts.
>
> Tao Ren (3):
> ARM: dts: aspeed: Update spi alias in Facebook AST2500 Common dtsi

I wondered if we should do this in the aspeed-g5.dtsi.

> ARM: dts: aspeed: wedge400: Enable more ADC channels
> ARM: dts: aspeed: wedge400: Set eMMC max frequency

Reviewed-by: Joel Stanley <[email protected]>

>
> arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts | 4 +++-
> arch/arm/boot/dts/aspeed/ast2500-facebook-netbmc-common.dtsi | 4 ++++
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> --
> 2.40.1
>

2023-08-10 06:09:27

by Tao Ren

[permalink] [raw]
Subject: Re: [PATCH 0/3] ARM: dts: aspeed: Fixup Wedge400 dts

On Thu, Aug 10, 2023 at 05:37:41AM +0000, Joel Stanley wrote:
> On Thu, 10 Aug 2023 at 05:34, Tao Ren <[email protected]> wrote:
> >
> > Hi Joel,
> >
> > On Wed, Aug 09, 2023 at 08:08:12AM +0000, Joel Stanley wrote:
> > > On Thu, 3 Aug 2023 at 23:03, <[email protected]> wrote:
> > > >
> > > > From: Tao Ren <[email protected]>
> > > >
> > > > The patch series fixes a few entries in wedge400 device tree.
> > > >
> > > > Patch #1 sets spi alias in ast2500-facebook-netbmc-common.dtsi (included
> > > > by wedge400 dts) to make sure spi bus is consistent with flash labels in
> > > > flash layout.
> > > >
> > > > Patch #2 enables more ADC channels in wedge400 dts.
> > > >
> > > > Patch #3 sets eMMC max frequency to 25MHz in wedge400 dts.
> > > >
> > > > Tao Ren (3):
> > > > ARM: dts: aspeed: Update spi alias in Facebook AST2500 Common dtsi
> > >
> > > I wondered if we should do this in the aspeed-g5.dtsi.
> >
> > I also hesitated if I should do it in aspeed-g5.dtsi, but I didn't do it
> > because I was not sure if others care about the spi aliases.. Should I
> > send out v2 to move the alias to aspeed-g5.dtsi?
>
> I wasn't sure either. Lets leave it as-is, but if we see other systems
> wanting similar numbering then we can put it in the common dtsi.
>
> I've applied this to the aspeed tree now.
>
> Cheers,
>
> Joel

Got it. Thanks Joel.


Cheers,

Tao

2023-08-10 06:35:09

by Joel Stanley

[permalink] [raw]
Subject: Re: [PATCH 0/3] ARM: dts: aspeed: Fixup Wedge400 dts

On Thu, 10 Aug 2023 at 05:34, Tao Ren <[email protected]> wrote:
>
> Hi Joel,
>
> On Wed, Aug 09, 2023 at 08:08:12AM +0000, Joel Stanley wrote:
> > On Thu, 3 Aug 2023 at 23:03, <[email protected]> wrote:
> > >
> > > From: Tao Ren <[email protected]>
> > >
> > > The patch series fixes a few entries in wedge400 device tree.
> > >
> > > Patch #1 sets spi alias in ast2500-facebook-netbmc-common.dtsi (included
> > > by wedge400 dts) to make sure spi bus is consistent with flash labels in
> > > flash layout.
> > >
> > > Patch #2 enables more ADC channels in wedge400 dts.
> > >
> > > Patch #3 sets eMMC max frequency to 25MHz in wedge400 dts.
> > >
> > > Tao Ren (3):
> > > ARM: dts: aspeed: Update spi alias in Facebook AST2500 Common dtsi
> >
> > I wondered if we should do this in the aspeed-g5.dtsi.
>
> I also hesitated if I should do it in aspeed-g5.dtsi, but I didn't do it
> because I was not sure if others care about the spi aliases.. Should I
> send out v2 to move the alias to aspeed-g5.dtsi?

I wasn't sure either. Lets leave it as-is, but if we see other systems
wanting similar numbering then we can put it in the common dtsi.

I've applied this to the aspeed tree now.

Cheers,

Joel

2023-08-10 07:22:39

by Tao Ren

[permalink] [raw]
Subject: Re: [PATCH 0/3] ARM: dts: aspeed: Fixup Wedge400 dts

Hi Joel,

On Wed, Aug 09, 2023 at 08:08:12AM +0000, Joel Stanley wrote:
> On Thu, 3 Aug 2023 at 23:03, <[email protected]> wrote:
> >
> > From: Tao Ren <[email protected]>
> >
> > The patch series fixes a few entries in wedge400 device tree.
> >
> > Patch #1 sets spi alias in ast2500-facebook-netbmc-common.dtsi (included
> > by wedge400 dts) to make sure spi bus is consistent with flash labels in
> > flash layout.
> >
> > Patch #2 enables more ADC channels in wedge400 dts.
> >
> > Patch #3 sets eMMC max frequency to 25MHz in wedge400 dts.
> >
> > Tao Ren (3):
> > ARM: dts: aspeed: Update spi alias in Facebook AST2500 Common dtsi
>
> I wondered if we should do this in the aspeed-g5.dtsi.

I also hesitated if I should do it in aspeed-g5.dtsi, but I didn't do it
because I was not sure if others care about the spi aliases.. Should I
send out v2 to move the alias to aspeed-g5.dtsi?

Cheers,

Tao