| Message ID | 20190228075322.17316-1-judge.packham@gmail.com |
|---|---|
| State | Accepted |
| Commit | 5860532264326d8eb387ccfd9037792cc6d57fd1 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [U-Boot] ARM: kirkwood: add spi0 alias for dreamplug | expand |
Hi Chris, I tested together with my own patch. It fixes the issue, thanks very much! Tested-by: Leigh Brown <leigh@solinno.co.uk> Output: U-Boot 2019.04-rc2-00134-g783e66816d-dirty (Feb 28 2019 - 08:27:16 +0000) Marvell-DreamPlug SoC: Kirkwood 88F6281_A1 DRAM: 512 MiB Loading Environment from SPI Flash... SF: Detected mx25l1606e with page size 256 Bytes, erase size 4 KiB, total 2 MiB OK In: serial Out: serial Err: serial Net: egiga0, egiga1 88E1116 Initialized on egiga0 88E1116 Initialized on egiga1 IDE: ide_preinit failed Hit any key to stop autoboot: 0 starting USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... 4 USB Device(s) found scanning usb for storage devices... Device NOT ready Request Sense returned 02 3A 00 1 Storage Device(s) found 1879928 bytes read in 130 ms (13.8 MiB/s) 9949 bytes read in 40 ms (242.2 KiB/s) 2746404 bytes read in 163 ms (16.1 MiB/s) ## Booting kernel from Legacy Image at 06000000 ... Image Name: uImage-4.19.7+ Created: 2018-12-06 14:10:50 UTC Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 1879864 Bytes = 1.8 MiB Load Address: 00008000 Entry Point: 00008000 Verifying Checksum ... OK ## Loading init Ramdisk from Legacy Image at 06600000 ... Image Name: uInitrd-4.19.7+ Created: 2018-12-06 14:10:50 UTC Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 2746340 Bytes = 2.6 MiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 06400000 Booting using the fdt blob at 0x6400000 Loading Kernel Image ... OK Loading Ramdisk to 0fd61000, end 0ffff7e4 ... OK Loading Device Tree to 0fd5b000, end 0fd606dc ... OK Starting kernel ... On 2019-02-28 07:53, Chris Packham wrote: > The conversion to DM_SPI managed to break accessing the environment on > dreamplug. This is because the environment code relies on being to able > to select the SPI device based on the sequence number. Add an alias so > that the spi0 bus gets sequence number 0. > > Reported-by: Leigh Brown <leigh@solinno.co.uk> > Signed-off-by: Chris Packham <judge.packham@gmail.com> > --- > Leigh, > > Could you test this on your system for me. I'm only able to compile > test > this myself. > > arch/arm/dts/kirkwood-dreamplug.dts | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/arm/dts/kirkwood-dreamplug.dts > b/arch/arm/dts/kirkwood-dreamplug.dts > index a647a65c20a0..ccd74dd7fb33 100644 > --- a/arch/arm/dts/kirkwood-dreamplug.dts > +++ b/arch/arm/dts/kirkwood-dreamplug.dts > @@ -18,6 +18,10 @@ > stdout-path = &uart0; > }; > > + aliases { > + spi0 = &spi0; > + }; > + > ocp@f1000000 { > pinctrl: pin-controller@10000 { > pmx_led_bluetooth: pmx-led-bluetooth { Regards, Leigh.
On Thu, 28 Feb 2019 22:13 Leigh Brown, <leigh@solinno.co.uk> wrote: > Hi Chris, > > I tested together with my own patch. It fixes the issue, thanks very > much! > Great. Thanks again for the bug report. Slightly related I've got a series of changes for USB on kirkwood. Would you be in a position to take them for a spin? > Tested-by: Leigh Brown <leigh@solinno.co.uk> > > Output: > > U-Boot 2019.04-rc2-00134-g783e66816d-dirty (Feb 28 2019 - 08:27:16 > +0000) > Marvell-DreamPlug > > SoC: Kirkwood 88F6281_A1 > DRAM: 512 MiB > Loading Environment from SPI Flash... SF: Detected mx25l1606e with page > size 256 Bytes, erase size 4 KiB, total 2 MiB > OK > In: serial > Out: serial > Err: serial > Net: egiga0, egiga1 > 88E1116 Initialized on egiga0 > 88E1116 Initialized on egiga1 > IDE: ide_preinit failed > Hit any key to stop autoboot: 0 > starting USB... > USB0: USB EHCI 1.00 > scanning bus 0 for devices... 4 USB Device(s) found > scanning usb for storage devices... Device NOT ready > Request Sense returned 02 3A 00 > 1 Storage Device(s) found > 1879928 bytes read in 130 ms (13.8 MiB/s) > 9949 bytes read in 40 ms (242.2 KiB/s) > 2746404 bytes read in 163 ms (16.1 MiB/s) > ## Booting kernel from Legacy Image at 06000000 ... > Image Name: uImage-4.19.7+ > Created: 2018-12-06 14:10:50 UTC > Image Type: ARM Linux Kernel Image (uncompressed) > Data Size: 1879864 Bytes = 1.8 MiB > Load Address: 00008000 > Entry Point: 00008000 > Verifying Checksum ... OK > ## Loading init Ramdisk from Legacy Image at 06600000 ... > Image Name: uInitrd-4.19.7+ > Created: 2018-12-06 14:10:50 UTC > Image Type: ARM Linux RAMDisk Image (uncompressed) > Data Size: 2746340 Bytes = 2.6 MiB > Load Address: 00000000 > Entry Point: 00000000 > Verifying Checksum ... OK > ## Flattened Device Tree blob at 06400000 > Booting using the fdt blob at 0x6400000 > Loading Kernel Image ... OK > Loading Ramdisk to 0fd61000, end 0ffff7e4 ... OK > Loading Device Tree to 0fd5b000, end 0fd606dc ... OK > > Starting kernel ... > > On 2019-02-28 07:53, Chris Packham wrote: > > The conversion to DM_SPI managed to break accessing the environment on > > dreamplug. This is because the environment code relies on being to able > > to select the SPI device based on the sequence number. Add an alias so > > that the spi0 bus gets sequence number 0. > > > > Reported-by: Leigh Brown <leigh@solinno.co.uk> > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > > --- > > Leigh, > > > > Could you test this on your system for me. I'm only able to compile > > test > > this myself. > > > > arch/arm/dts/kirkwood-dreamplug.dts | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/arch/arm/dts/kirkwood-dreamplug.dts > > b/arch/arm/dts/kirkwood-dreamplug.dts > > index a647a65c20a0..ccd74dd7fb33 100644 > > --- a/arch/arm/dts/kirkwood-dreamplug.dts > > +++ b/arch/arm/dts/kirkwood-dreamplug.dts > > @@ -18,6 +18,10 @@ > > stdout-path = &uart0; > > }; > > > > + aliases { > > + spi0 = &spi0; > > + }; > > + > > ocp@f1000000 { > > pinctrl: pin-controller@10000 { > > pmx_led_bluetooth: pmx-led-bluetooth { > > Regards, > > Leigh. >
Hi Chris, On 2019-02-28 19:00, Chris Packham wrote: > On Thu, 28 Feb 2019 22:13 Leigh Brown, <leigh@solinno.co.uk> wrote: > >> Hi Chris, >> >> I tested together with my own patch. It fixes the issue, thanks very >> much! > > Great. Thanks again for the bug report. > > Slightly related I've got a series of changes for USB on kirkwood. Would you be in a position to take them for a spin? Sure, happy to. Regards, Leigh.
On 28.02.19 08:53, Chris Packham wrote: > The conversion to DM_SPI managed to break accessing the environment on > dreamplug. This is because the environment code relies on being to able > to select the SPI device based on the sequence number. Add an alias so > that the spi0 bus gets sequence number 0. > > Reported-by: Leigh Brown <leigh@solinno.co.uk> > Signed-off-by: Chris Packham <judge.packham@gmail.com> Applied to u-boot-marvell/master. Thanks, Stefan
diff --git a/arch/arm/dts/kirkwood-dreamplug.dts b/arch/arm/dts/kirkwood-dreamplug.dts index a647a65c20a0..ccd74dd7fb33 100644 --- a/arch/arm/dts/kirkwood-dreamplug.dts +++ b/arch/arm/dts/kirkwood-dreamplug.dts @@ -18,6 +18,10 @@ stdout-path = &uart0; }; + aliases { + spi0 = &spi0; + }; + ocp@f1000000 { pinctrl: pin-controller@10000 { pmx_led_bluetooth: pmx-led-bluetooth {
The conversion to DM_SPI managed to break accessing the environment on dreamplug. This is because the environment code relies on being to able to select the SPI device based on the sequence number. Add an alias so that the spi0 bus gets sequence number 0. Reported-by: Leigh Brown <leigh@solinno.co.uk> Signed-off-by: Chris Packham <judge.packham@gmail.com> --- Leigh, Could you test this on your system for me. I'm only able to compile test this myself. arch/arm/dts/kirkwood-dreamplug.dts | 4 ++++ 1 file changed, 4 insertions(+)