[PATCH 00/14] rockchip: rk35xx: Update defconfigs and enable boot from SPI NOR flash

[Jonas Karlman]

Hi Eugen,
On 2023-05-09 15:24, Kever Yang wrote:
> Hi Jonas and Eugen,
> 
> On 2023/4/22 09:23, Jonas Karlman wrote:
>> This series sync some defconfig options across the different rk35xx
>> boards and enables boot from SPI NOR flash on rk3568-rock-3a and
>> rk3588-rock-5b.
>>
>> Patch 1 fixes use of sfc-no-dma prop in rockchip sfc driver.
>> Patch 2-7 updates defconfig for rk356x boards.
>> Patch 8 enables boot from SPI NOR flash on rk3568-rock-3a.
>> Patch 9-12 updates defconfig for rk3588 boards.
>> Patch 13 enables boot from SPI NOR flash on rk3588-rock-5b.
>> Patch 14 reverts addition of regulator-boot-on props.
>>
>> Please note that patches related to rk3588 depend on [1] and [2], they
>> may not apply clean. The final patch revert a workaround to fix usb that
>> is not needed after series [1] and [3].
>>
>> This series can also be found at [4].
>>
>> [1] https://patchwork.ozlabs.org/project/uboot/patch/20230419134014.128461-1-eugen.hristev@collabora.com/
>> [2] https://patchwork.ozlabs.org/project/uboot/patch/20230417100641.5703-1-eugen.hristev@collabora.com/
>
> I'm not able to apply these two patchset and also this patchset, maybe 
> the conflict with latest code or the dependency is not correct,
> could you help to send a rebase for below patches?
> - rk3588 rst,
> - rock-5b pinctrl for sdmmc,
> - usb2.0 for rock5b
> - dw_pcie_rockchip for rk3588

Looks like the following two commits in your enablement efforts tree may
be a source of some of these dependency conflicts.

- rockchip: rk3588-rock-5b: Add spi nor flash node
- ARM: dts: rockchip: rk3588-rock-5b-u-boot: enable SPI flash in SPL

Those commits should come after all your pending series, same/similar
commits are included in this defconfig/spinor series, series that I have
tried to base on top of your series :-)

I will rebase my series on top of rockchip U-Boot Custodian Tree master
and Eugen's series.

Regards,
Jonas

> 
> Thanks,
> 
> - Kever
> 
>> [3] https://patchwork.ozlabs.org/project/uboot/patch/20230419134526.128800-1-eugen.hristev@collabora.com/
>> [4] https://github.com/Kwiboo/u-boot-rockchip/commits/rk35xx-defconfig-spi-v1
>>
>> Jonas Karlman (14):
>>    spi: rockchip_sfc: Use linux rockchip,sfc-no-dma prop
>>    rockchip: rk356x-u-boot: Add xin24m clock node to SPL
>>    rockchip: rk3566-radxa-cm3-io: Update defconfig
>>    rockchip: rk3566-radxa-cm3-io: Use pinctrl for sdmmc and sdhci in SPL
>>    rockchip: rk3568-evb: Update defconfig
>>    rockchip: rk3568-rock-3a: Update defconfig
>>    rockchip: rk3568-rock-3a: Use pinctrl for sdmmc and sdhci in SPL
>>    rockchip: rk3568-rock-3a: Enable boot from SPI NOR flash
>>    rockchip: rk3588: Select DM_RESET and DM_REGULATOR_FIXED in arch
>>      Kconfig
>>    rockchip: rk3588-evb: Update defconfig
>>    rockchip: rk3588-rock-5b: Update defconfig
>>    rockchip: rk3588-rock-5b: Add bootph prop to pinctrl for uart2 and
>>      sdhci
>>    rockchip: rk3588-rock-5b: Enable boot from SPI NOR flash
>>    Revert "arm: dts: rockchip: radxa-cm3-io, rock-3a: enable regulators
>>      for usb"
>>
>>   arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 65 ++++++++++++++-
>>   arch/arm/dts/rk3568-rock-3a-u-boot.dtsi      | 85 ++++++++++++++++++--
>>   arch/arm/dts/rk356x-u-boot.dtsi              | 16 ++++
>>   arch/arm/dts/rk3588-rock-5b-u-boot.dtsi      | 52 ++++++++++++
>>   arch/arm/dts/rk3588s-u-boot.dtsi             | 20 +++++
>>   arch/arm/mach-rockchip/Kconfig               |  2 +
>>   arch/arm/mach-rockchip/rk3588/rk3588.c       |  1 +
>>   configs/evb-rk3568_defconfig                 | 15 ++--
>>   configs/evb-rk3588_defconfig                 | 11 +--
>>   configs/neu6a-io-rk3588_defconfig            |  1 -
>>   configs/radxa-cm3-io-rk3566_defconfig        | 10 ++-
>>   configs/rock-3a-rk3568_defconfig             | 20 +++--
>>   configs/rock5b-rk3588_defconfig              | 19 +++--
>>   drivers/spi/rockchip_sfc.c                   | 10 ++-
>>   14 files changed, 285 insertions(+), 42 deletions(-)
>>