[PATCH] rockchip: pinebook-pro: fix SPI flash detection

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] rockchip: pinebook-pro: fix SPI flash detection

Marcin Juszkiewicz
Copy changes done to rockpro64 in commit
c180e2939d3ccb43f89565d6660a0d6f912712b6 ("rockchip: rockpro64: fix boot
from SPI flash on spi1")

Remove the spi0 alias, set the default bus for SPI flash to 1, and
enable support for numbered aliases in SPL so that it uses the same bus
numbering as U-Boot proper. This fixes detection of SPI flash on the
pinebook-pro board.

Signed-off-by: Marcin Juszkiewicz <[hidden email]>
---
 arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ----
 configs/pinebook-pro-rk3399_defconfig        | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
index ded7db0aef..ee3b98698e 100644
--- arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+++ arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
@@ -7,10 +7,6 @@
 #include "rk3399-sdram-lpddr4-100.dtsi"
 
 / {
- aliases {
- spi0 = &spi1;
- };
-
  chosen {
  u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc;
  };
diff --git configs/pinebook-pro-rk3399_defconfig configs/pinebook-pro-rk3399_defconfig
index 8fbd7280ac..a471c3e06a 100644
--- configs/pinebook-pro-rk3399_defconfig
+++ configs/pinebook-pro-rk3399_defconfig
@@ -37,6 +37,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_DM_KEYBOARD=y
@@ -49,6 +50,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
--
2.29.2

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] rockchip: pinebook-pro: fix SPI flash detection

Peter Robinson
> Copy changes done to rockpro64 in commit
> c180e2939d3ccb43f89565d6660a0d6f912712b6 ("rockchip: rockpro64: fix boot
> from SPI flash on spi1")
>
> Remove the spi0 alias, set the default bus for SPI flash to 1, and
> enable support for numbered aliases in SPL so that it uses the same bus
> numbering as U-Boot proper. This fixes detection of SPI flash on the
> pinebook-pro board.

This has already been sent but hasn't been merged:
http://patchwork.ozlabs.org/project/uboot/patch/20201122130346.11621-2-sigmaris@.../

Tom/Kever can we get this fix in for 2021.01 so it fixes the regression?

> Signed-off-by: Marcin Juszkiewicz <[hidden email]>
> ---
>  arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ----
>  configs/pinebook-pro-rk3399_defconfig        | 2 ++
>  2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> index ded7db0aef..ee3b98698e 100644
> --- arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> +++ arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> @@ -7,10 +7,6 @@
>  #include "rk3399-sdram-lpddr4-100.dtsi"
>
>  / {
> -       aliases {
> -               spi0 = &spi1;
> -       };
> -
>         chosen {
>                 u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc;
>         };
> diff --git configs/pinebook-pro-rk3399_defconfig configs/pinebook-pro-rk3399_defconfig
> index 8fbd7280ac..a471c3e06a 100644
> --- configs/pinebook-pro-rk3399_defconfig
> +++ configs/pinebook-pro-rk3399_defconfig
> @@ -37,6 +37,7 @@ CONFIG_SPL_OF_CONTROL=y
>  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
>  CONFIG_ENV_IS_IN_SPI_FLASH=y
>  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SPL_DM_SEQ_ALIAS=y
>  CONFIG_ROCKCHIP_GPIO=y
>  CONFIG_SYS_I2C_ROCKCHIP=y
>  CONFIG_DM_KEYBOARD=y
> @@ -49,6 +50,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_SDMA=y
>  CONFIG_MMC_SDHCI_ROCKCHIP=y
> +CONFIG_SF_DEFAULT_BUS=1
>  CONFIG_SF_DEFAULT_SPEED=20000000
>  CONFIG_SPI_FLASH_GIGADEVICE=y
>  CONFIG_SPI_FLASH_WINBOND=y
> --
> 2.29.2
>
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] rockchip: pinebook-pro: fix SPI flash detection

Tom Rini-4
On Fri, Jan 08, 2021 at 10:38:39AM +0000, Peter Robinson wrote:

> > Copy changes done to rockpro64 in commit
> > c180e2939d3ccb43f89565d6660a0d6f912712b6 ("rockchip: rockpro64: fix boot
> > from SPI flash on spi1")
> >
> > Remove the spi0 alias, set the default bus for SPI flash to 1, and
> > enable support for numbered aliases in SPL so that it uses the same bus
> > numbering as U-Boot proper. This fixes detection of SPI flash on the
> > pinebook-pro board.
>
> This has already been sent but hasn't been merged:
> http://patchwork.ozlabs.org/project/uboot/patch/20201122130346.11621-2-sigmaris@.../
>
> Tom/Kever can we get this fix in for 2021.01 so it fixes the regression?
Yes, I'll get on that.  Thanks!

--
Tom

signature.asc (673 bytes) Download Attachment