* [PATCH linux] ARM: dts: aspeed-g5: Update zaius with new spi-nor binding
@ 2016-11-01 23:30 Xo Wang
2016-11-01 23:45 ` Joel Stanley
0 siblings, 1 reply; 4+ messages in thread
From: Xo Wang @ 2016-11-01 23:30 UTC (permalink / raw)
To: openbmc
Zaius has one flash module for the BMC firmware, one flash module for
the host firmware, and one more flash module on SPI2.
Signed-off-by: Xo Wang <xow@google.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 66 ++++++++++++------------------
1 file changed, 26 insertions(+), 40 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index eef045b..2004615 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -20,46 +20,6 @@
reg = <0x80000000 0x40000000>;
};
- ahb {
- bmc_pnor: fmc@1e620000 {
- reg = < 0x1e620000 0xc4
- 0x20000000 0x04000000 >;
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "aspeed,ast2500-fmc";
- flash@0 {
- reg = < 0 >;
- compatible = "jedec,spi-nor" ;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
- };
- };
-
- host_pnor: spi@1e630000 {
- reg = < 0x1e630000 0xc4
- 0x30000000 0x04000000 >;
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "aspeed,ast2500-smc";
- flash@0 {
- reg = < 0 >;
- compatible = "jedec,spi-nor" ;
- label = "pnor";
- };
- };
-
- data_pnor: spi@1e631000 {
- reg = < 0x1e631000 0xc4
- 0x38000000 0x00800000 >;
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "aspeed,ast2500-smc";
- flash@0 {
- reg = < 0 >;
- compatible = "jedec,spi-nor" ;
- };
- };
- };
-
leds {
compatible = "gpio-leds";
@@ -85,6 +45,32 @@
};
};
+&fmc {
+ status = "okay";
+ flash@0 {
+ status = "okay";
+#include "aspeed-bmc-opp-flash-layout.dtsi"
+ };
+};
+
+&spi1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spi1_default>;
+
+ flash@0 {
+ status = "okay";
+ label = "pnor";
+ };
+};
+
+&spi2 {
+ status = "okay";
+ flash@0 {
+ status = "okay";
+ };
+};
+
&uart5 {
status = "okay";
};
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH linux] ARM: dts: aspeed-g5: Update zaius with new spi-nor binding
2016-11-01 23:30 [PATCH linux] ARM: dts: aspeed-g5: Update zaius with new spi-nor binding Xo Wang
@ 2016-11-01 23:45 ` Joel Stanley
2016-11-01 23:58 ` Andrew Jeffery
0 siblings, 1 reply; 4+ messages in thread
From: Joel Stanley @ 2016-11-01 23:45 UTC (permalink / raw)
To: Xo Wang; +Cc: OpenBMC Maillist, Andrew Jeffery
Hey Xo,
On Wed, Nov 2, 2016 at 10:00 AM, Xo Wang <xow@google.com> wrote:
> +&spi1 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi1_default>;
> +
> + flash@0 {
> + status = "okay";
> + label = "pnor";
> + };
> +};
> +
> +&spi2 {
> + status = "okay";
I think we want to request the pins here. Something like this:
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spi2ck_default
+ &pinctrl_spi2cs0_default
+ &pinctrl_spi2cs1_default
+ &pinctrl_spi2miso_default
+ &pinctrl_spi2mosi_default>;
+
Can you try that and do a test boot on your hardware?
Cheers,
Joel
> + flash@0 {
> + status = "okay";
> + };
> +};
> +
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH linux] ARM: dts: aspeed-g5: Update zaius with new spi-nor binding
2016-11-01 23:45 ` Joel Stanley
@ 2016-11-01 23:58 ` Andrew Jeffery
2016-11-02 0:47 ` Xo Wang
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Jeffery @ 2016-11-01 23:58 UTC (permalink / raw)
To: Joel Stanley, Xo Wang; +Cc: OpenBMC Maillist
[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]
On Wed, 2016-11-02 at 10:15 +1030, Joel Stanley wrote:
> Hey Xo,
>
> On Wed, Nov 2, 2016 at 10:00 AM, Xo Wang <xow@google.com> wrote:
>
> >
> > +&spi1 {
> > + status = "okay";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_spi1_default>;
> > +
> > + flash@0 {
> > + status = "okay";
> > + label = "pnor";
> > + };
> > +};
> > +
> > +&spi2 {
> > + status = "okay";
> I think we want to request the pins here. Something like this:
>
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi2ck_default
> + &pinctrl_spi2cs0_default
> + &pinctrl_spi2cs1_default
> + &pinctrl_spi2miso_default
> + &pinctrl_spi2mosi_default>;
Yes, we need this, though maybe the chip selects should be pushed out
to the board dts?
Andrew
> +
>
> Can you try that and do a test boot on your hardware?
>
> Cheers,
>
> Joel
>
> >
> > + flash@0 {
> > + status = "okay";
> > + };
> > +};
> > +
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH linux] ARM: dts: aspeed-g5: Update zaius with new spi-nor binding
2016-11-01 23:58 ` Andrew Jeffery
@ 2016-11-02 0:47 ` Xo Wang
0 siblings, 0 replies; 4+ messages in thread
From: Xo Wang @ 2016-11-02 0:47 UTC (permalink / raw)
To: Andrew Jeffery; +Cc: Joel Stanley, OpenBMC Maillist
Hi Joel, Andrew,
On Tue, Nov 1, 2016 at 4:58 PM, Andrew Jeffery <andrew@aj.id.au> wrote:
> On Wed, 2016-11-02 at 10:15 +1030, Joel Stanley wrote:
>> Hey Xo,
>>
>> On Wed, Nov 2, 2016 at 10:00 AM, Xo Wang <xow@google.com> wrote:
>>
>> >
>> > +&spi1 {
>> > + status = "okay";
>> > + pinctrl-names = "default";
>> > + pinctrl-0 = <&pinctrl_spi1_default>;
>> > +
>> > + flash@0 {
>> > + status = "okay";
>> > + label = "pnor";
>> > + };
>> > +};
>> > +
>> > +&spi2 {
>> > + status = "okay";
>> I think we want to request the pins here. Something like this:
>>
>> +
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_spi2ck_default
>> + &pinctrl_spi2cs0_default
>> + &pinctrl_spi2cs1_default
>> + &pinctrl_spi2miso_default
>> + &pinctrl_spi2mosi_default>;
>
> Yes, we need this, though maybe the chip selects should be pushed out
> to the board dts?
>
> Andrew
>
>> +
>>
>> Can you try that and do a test boot on your hardware?
Good catch! I hadn't picked up that the SPI2 flash wasn't being
probed. Now it's showing up:
platform 1e620000.flash-controller:flash@0: mx66l51235l (65536 Kbytes)
6 ofpart partitions found on MTD device bmc
Creating 6 MTD partitions on "bmc":
0x000000000000-0x000000060000 : "u-boot"
0x000000060000-0x000000080000 : "u-boot-env"
0x000000080000-0x000000300000 : "kernel"
0x000000300000-0x0000004c0000 : "initramfs"
0x0000004c0000-0x000001c00000 : "rofs"
0x000001c00000-0x000002000000 : "rwfs"
aspeed-smc 1e630000.flash-controller: no DMA support.
platform 1e630000.flash-controller:flash@0: mx66l51235l (65536 Kbytes)
aspeed-smc 1e631000.flash-controller: no DMA support.
platform 1e631000.flash-controller:flash@0: mx25l6405d (8192 Kbytes)
cheers
xo
>>
>> Cheers,
>>
>> Joel
>>
>> >
>> > + flash@0 {
>> > + status = "okay";
>> > + };
>> > +};
>> > +
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-02 0:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-01 23:30 [PATCH linux] ARM: dts: aspeed-g5: Update zaius with new spi-nor binding Xo Wang
2016-11-01 23:45 ` Joel Stanley
2016-11-01 23:58 ` Andrew Jeffery
2016-11-02 0:47 ` Xo Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.