[PATCH 0/2] rockchip: rk3568-nanopi-r5: Add missing PCIe options

[Jonas Karlman]

With PCIe bifurcation fixed on RK3568 it is now safe to add the missing
PCIe Kconfig options to make use of the two on-board RTL8125B and the
M.2 slot on NanoPi R5C and NanoPi R5S.

First patch clean up and sync some generic Kconfig options with other
RK3568 boards. Second patch add the missing PCIe Kconfig options.

Boot log from NanoPi R5C (RTL8822CE in M.2 slot):

  U-Boot 2023.10-rc1 (Aug 01 2023 - 21:03:01 +0000)

  Model: FriendlyElec NanoPi R5C
  DRAM:  4 GiB (effective 3.7 GiB)
  PMIC:  RK8090 (on=0x40, off=0x00)
  Core:  316 devices, 26 uclasses, devicetree: separate
  MMC:   mmc at fe2b0000: 1, mmc at fe310000: 0
  Loading Environment from nowhere... OK
  In:    serial at fe660000
  Out:   serial at fe660000
  Err:   serial at fe660000
  Model: FriendlyElec NanoPi R5C
  Net:   No ethernet found.
  Hit any key to stop autoboot:  0
  => pci enum
  => pci
  BusDevFun  VendorId   DeviceId   Device Class       Sub-Class
  00.00.00   0x1d87     0x3566     Bridge device           0x04
  01.00.00   0x10ec     0xc822     Network controller      0x80
  02.00.00   0x1d87     0x3566     Bridge device           0x04
  03.00.00   0x10ec     0x8125     Network controller      0x00
  04.00.00   0x1d87     0x3566     Bridge device           0x04
  05.00.00   0x10ec     0x8125     Network controller      0x00
  => net list
  eth0 : eth_rtl8169 9e:7d:5d:d6:8f:02 active
  eth1 : eth_rtl8169 9e:7d:5d:d6:8f:03
  =>

Boot log from NanoPi R5S (NVMe in M.2 slot):

  U-Boot 2023.10-rc1 (Aug 01 2023 - 21:42:51 +0000)

  Model: FriendlyElec NanoPi R5S
  DRAM:  4 GiB (effective 3.7 GiB)
  PMIC:  RK8090 (on=0x40, off=0x00)
  Core:  318 devices, 26 uclasses, devicetree: separate
  MMC:   mmc at fe2b0000: 1, mmc at fe310000: 0
  Loading Environment from nowhere... OK
  In:    serial at fe660000
  Out:   serial at fe660000
  Err:   serial at fe660000
  Model: FriendlyElec NanoPi R5S
  Net:   No ethernet found.
  Hit any key to stop autoboot:  0
  => pci enum
  => pci
  BusDevFun  VendorId   DeviceId   Device Class       Sub-Class
  00.00.00   0x1d87     0x3566     Bridge device           0x04
  01.00.00   0x10ec     0x8125     Network controller      0x00
  02.00.00   0x1d87     0x3566     Bridge device           0x04
  03.00.00   0x10ec     0x8125     Network controller      0x00
  04.00.00   0x1d87     0x3566     Bridge device           0x04
  05.00.00   0x1d79     0x2263     Mass storage controller 0x08
  => nvme scan
  => nvme info
  Device 0: Vendor: 0x1d79 Rev: V0804S3  Prod: H786090037
              Type: Hard Disk
              Capacity: 244198.3 MB = 238.4 GB (500118192 x 512)
  => net list
  eth1 : eth_rtl8169 9a:cb:a2:72:4c:c6 active
  eth2 : eth_rtl8169 00:00:00:00:00:00
  =>

This series depends on the series "rockchip: rk3568: Fix use of PCIe
bifurcation" v2 [1]. Patches in this series is also aviliable at [2].

[1] https://patchwork.ozlabs.org/project/uboot/list/?series=366997
[2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk35xx-pcie-bifurcation-v2

Jonas Karlman (2):
  rockchip: rk3568-nanopi-r5: Update defconfig for NanoPi R5C and R5S
  rockchip: rk3568-nanopi-r5: Enable PCIe on NanoPi R5C and R5S

 arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi |  4 ++++
 arch/arm/dts/rk3568-nanopi-r5c.dts         |  2 +-
 arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi | 10 +++++++++-
 configs/nanopi-r5c-rk3568_defconfig        | 18 ++++++++++++------
 configs/nanopi-r5s-rk3568_defconfig        | 19 +++++++++++++------
 5 files changed, 39 insertions(+), 14 deletions(-)

-- 
2.41.0