Pull request: u-boot-rockchip-20230509

Kever Yang kever.yang at rock-chips.com
Tue May 9 18:04:40 CEST 2023


Hi Tom,

Sorry for late to send this PR for some reason, but still a few patch sets are not merge
due to conflict.

Please pull the updates for rockchip platform:
- Rockchip NFC driver update and dev addr pointer api update;
- use standard dr_mode for usb driver;
- rock pi boards dts update;
- Add rk3566 Anbernic boards;
- Misc fixes for drivers;

CI:
https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/16305

Thanks,
- Kever

The following changes since commit ab75996ba49c140c529f14b5c40d0d16430feefb:

  Merge tag 'video-for-v2023.07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-video (2023-05-05 09:36:08 -0400)

are available in the Git repository at:

  https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20230509

for you to fetch changes up to 716ed2a8c0bba085372df0eb7edb580b11e8d94c:

  clk: rockchip: rk3588: add hardcoded assigned clocks values (2023-05-09 22:50:01 +0800)

----------------------------------------------------------------
Chris Morgan (1):
      board: rockchip: add Anbernic RGXX3 Series Devices

Christian Kohlschütter (1):
      rk3399: r4s: Derive local MAC address if EEPROM is missing

Eugen Hristev (4):
      pci: pcie_dw_rockchip: release resources on failing probe
      clk: rockchip: correct trivial typo in debug message
      reset: reset-rockchip: fix trivial line spacing alignment
      clk: rockchip: rk3588: add hardcoded assigned clocks values

FUKAUMI Naoki (7):
      arm: dts: rockchip: rock-pi-4: sync with Linux 6.3
      configs: rockchip: rock-pi-4: use dtb for ROCK Pi 4A instead of 4B
      arm: dts: rockchip: add Radxa ROCK 4C+
      configs: rockchip: add Radxa ROCK 4C+
      doc: rockchip: update list of Radxa ROCK (Pi) 4 boards
      arm: dts: rk356x: Makefile: sort
      arm: dts: rockchip: rock-3a: drop u-boot,spl-boot-order

Johan Jonker (24):
      mtd: nand: raw: rockchip_nfc: use dev_read_addr_ptr
      mtd: nand: raw: rockchip_nfc: remove the compatible string "rockchip,rk3308-nfc"
      mtd: nand: raw: rockchip_nfc: add layout structure
      mtd: nand: raw: rockchip_nfc: add flash_node to chip structure
      mtd: nand: raw: rockchip_nfc: fix oobfree offset and description
      mtd: nand: add support for the Sandisk SDTNQGAMA chip
      rockchip: adc: rockchip-saradc: use dev_read_addr_ptr
      rockchip: timer: dw-apb-timer: use regs variable with uintptr_t size
      rockchip: pwm: rk_pwm: use base variable with uintptr_t size
      rockchip: spi: rk_spi: use base variable with uintptr_t size
      include: dm: ofnode: fix headers
      core: remap: fix regmap_init_mem_plat() reg size handeling
      rockchip: rk3288: syscon_rk3288: store syscon platdata in regmap
      core: fdtaddr: add devfdt_get_addr_size_index_ptr function
      core: read: add dev_read_addr_index_ptr function
      spi: spi-aspeed-smc: use devfdt_get_addr_index_ptr
      drivers: use dev_read_addr_index_ptr when cast to pointer
      drivers: use dev_read_addr_ptr when cast to pointer
      drivers: use devfdt_get_addr_size_index_ptr when cast to pointer
      drivers: use devfdt_get_addr_index_ptr when cast to pointer
      drivers: use devfdt_get_addr_ptr when cast to pointer
      drivers: fix debug string with fdt_addr_t input
      arm: stm32mp: spl: fix function with fdt_addr_t input
      include: fdtdec: decouple fdt_addr_t and phys_addr_t size

John Keeping (2):
      rockchip: use standard dr_mode parsing function
      rockchip: handle peripheral as well as otg dr_mode

Tianling Shen (1):
      rockchip: rk3328: Add support for FriendlyARM NanoPi R2C

 Kconfig                                            |   8 +
 arch/arm/dts/Makefile                              |   6 +-
 arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi         |   3 +
 arch/arm/dts/rk3328-nanopi-r2c.dts                 |  40 ++
 arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi       |   5 +
 arch/arm/dts/rk3399-rock-4c-plus.dts               | 709 +++++++++++++++++++
 arch/arm/dts/rk3399-rock-pi-4.dtsi                 | 229 ++++--
 ...b-u-boot.dtsi => rk3399-rock-pi-4a-u-boot.dtsi} |   0
 arch/arm/dts/rk3399-rock-pi-4b.dts                 |  46 --
 arch/arm/dts/rk3399-rock-pi-4c.dts                 |  20 +-
 arch/arm/dts/rk3399-t-opp.dtsi                     | 114 +++
 arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi     |  86 +++
 arch/arm/dts/rk3566-anbernic-rgxx3.dts             |  18 +
 arch/arm/dts/rk3566-anbernic-rgxx3.dtsi            | 786 +++++++++++++++++++++
 arch/arm/dts/rk3568-rock-3a-u-boot.dtsi            |   1 -
 arch/arm/mach-mvebu/cpu.c                          |   2 +-
 arch/arm/mach-mvebu/system-controller.c            |   4 +-
 arch/arm/mach-rockchip/board.c                     |  13 +-
 arch/arm/mach-rockchip/rk3288/syscon_rk3288.c      | 121 ++++
 arch/arm/mach-rockchip/rk3568/Kconfig              |  14 +
 arch/arm/mach-stm32mp/spl.c                        |   2 +-
 board/anbernic/rgxx3_rk3566/Kconfig                |  15 +
 board/anbernic/rgxx3_rk3566/MAINTAINERS            |   6 +
 board/anbernic/rgxx3_rk3566/Makefile               |   6 +
 board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c         | 203 ++++++
 board/rockchip/evb_rk3328/MAINTAINERS              |   6 +
 configs/anbernic-rgxx3_defconfig                   |  78 ++
 configs/nanopi-r2c-rk3328_defconfig                | 112 +++
 configs/nanopi-r4s-rk3399_defconfig                |   4 +
 configs/rock-4c-plus-rk3399_defconfig              |  97 +++
 configs/rock-pi-4-rk3399_defconfig                 |   4 +-
 doc/board/anbernic/index.rst                       |   9 +
 doc/board/anbernic/rgxx3.rst                       |  47 ++
 doc/board/index.rst                                |   1 +
 doc/board/rockchip/rockchip.rst                    |   8 +-
 doc/develop/driver-model/livetree.rst              |   2 +-
 drivers/adc/rockchip-saradc.c                      |   6 +-
 drivers/ata/dwc_ahsata.c                           |   2 +-
 drivers/cache/cache-l2x0.c                         |   2 +-
 drivers/cache/cache-v5l2.c                         |   2 +-
 drivers/clk/at91/sama7g5.c                         |   2 +-
 drivers/clk/at91/sckc.c                            |   2 +-
 drivers/clk/clk-hsdk-cgu.c                         |   4 +-
 drivers/clk/rockchip/clk_px30.c                    |   2 +-
 drivers/clk/rockchip/clk_rk3036.c                  |   2 +-
 drivers/clk/rockchip/clk_rk3188.c                  |   2 +-
 drivers/clk/rockchip/clk_rk322x.c                  |   2 +-
 drivers/clk/rockchip/clk_rk3288.c                  |   2 +-
 drivers/clk/rockchip/clk_rk3308.c                  |   2 +-
 drivers/clk/rockchip/clk_rk3328.c                  |   2 +-
 drivers/clk/rockchip/clk_rk3368.c                  |   2 +-
 drivers/clk/rockchip/clk_rk3399.c                  |   4 +-
 drivers/clk/rockchip/clk_rk3568.c                  |   4 +-
 drivers/clk/rockchip/clk_rk3588.c                  |  24 +-
 drivers/clk/rockchip/clk_rv1108.c                  |   2 +-
 drivers/clk/rockchip/clk_rv1126.c                  |   4 +-
 drivers/clk/ti/clk-ctrl.c                          |   9 +-
 drivers/core/fdtaddr.c                             |   8 +
 drivers/core/read.c                                |  15 +-
 drivers/core/regmap.c                              |  23 +-
 drivers/core/syscon-uclass.c                       |  23 +-
 drivers/ddr/altera/sdram_gen5.c                    |   4 +-
 drivers/gpio/mscc_sgpio.c                          |   2 +-
 drivers/gpio/tegra_gpio.c                          |   4 +-
 drivers/gpio/xilinx_gpio.c                         |   2 +-
 drivers/i2c/i2c-cdns.c                             |   4 +-
 drivers/i2c/tegra_i2c.c                            |   4 +-
 drivers/mmc/am654_sdhci.c                          |   2 +-
 drivers/mmc/davinci_mmc.c                          |   2 +-
 drivers/mmc/piton_mmc.c                            |   2 +-
 drivers/mmc/tegra_mmc.c                            |   2 +-
 drivers/mmc/xenon_sdhci.c                          |   2 +-
 drivers/mmc/zynq_sdhci.c                           |   6 +-
 drivers/mtd/nand/raw/arasan_nfc.c                  |   2 +-
 drivers/mtd/nand/raw/cortina_nand.c                |   6 +-
 drivers/mtd/nand/raw/mxic_nand.c                   |   2 +-
 drivers/mtd/nand/raw/nand_ids.c                    |   3 +
 drivers/mtd/nand/raw/rockchip_nfc.c                |  78 +-
 drivers/mtd/nand/raw/tegra_nand.c                  |   2 +-
 drivers/mtd/nand/raw/zynq_nand.c                   |   2 +-
 drivers/net/dm9000x.c                              |   2 +-
 drivers/net/dwmac_meson8b.c                        |   4 +-
 drivers/net/mvmdio.c                               |   2 +-
 drivers/net/mvpp2.c                                |  24 +-
 drivers/net/qe/dm_qe_uec_phy.c                     |   2 +-
 drivers/pci/pci-aardvark.c                         |   4 +-
 drivers/pci/pcie_dw_meson.c                        |   8 +-
 drivers/pci/pcie_dw_mvebu.c                        |  10 +-
 drivers/pci/pcie_dw_rockchip.c                     |  49 +-
 drivers/pci/pcie_imx.c                             |   4 +-
 drivers/pci/pcie_layerscape_ep.c                   |   8 +-
 drivers/phy/allwinner/phy-sun50i-usb3.c            |   6 +-
 drivers/phy/marvell/comphy_core.c                  |  12 +-
 drivers/phy/phy-stm32-usbphyc.c                    |   4 +-
 drivers/phy/qcom/phy-qcom-usb-hs-28nm.c            |   4 +-
 drivers/phy/qcom/phy-qcom-usb-ss.c                 |   4 +-
 drivers/phy/rockchip/phy-rockchip-snps-pcie3.c     |   4 +-
 drivers/phy/rockchip/phy-rockchip-typec.c          |   6 +-
 drivers/pwm/rk_pwm.c                               |   2 +-
 drivers/pwm/tegra_pwm.c                            |   2 +-
 drivers/ram/rockchip/sdram_rk3066.c                |   2 +-
 drivers/ram/rockchip/sdram_rk3188.c                |   2 +-
 drivers/ram/rockchip/sdram_rk322x.c                |   2 +-
 drivers/ram/rockchip/sdram_rk3288.c                |   2 +-
 drivers/ram/rockchip/sdram_rk3328.c                |   2 +-
 drivers/ram/rockchip/sdram_rk3399.c                |   2 +-
 drivers/reset/reset-rockchip.c                     |   4 +-
 drivers/serial/serial_zynq.c                       |   6 +-
 drivers/spi/cadence_qspi.c                         |   5 +-
 drivers/spi/mpc8xxx_spi.c                          |   2 +-
 drivers/spi/mscc_bb_spi.c                          |   2 +-
 drivers/spi/mtk_snor.c                             |   2 +-
 drivers/spi/mtk_spim.c                             |   2 +-
 drivers/spi/rk_spi.c                               |   2 +-
 drivers/spi/sh_qspi.c                              |   2 +-
 drivers/spi/spi-aspeed-smc.c                       |  17 +-
 drivers/spi/spi-mxic.c                             |   2 +-
 drivers/spi/xilinx_spi.c                           |   2 +-
 drivers/timer/dw-apb-timer.c                       |   2 +-
 drivers/ufs/ufs.c                                  |   2 +-
 drivers/usb/host/ehci-tegra.c                      |   2 +-
 drivers/usb/musb-new/ti-musb.c                     |   2 +-
 drivers/video/dw_mipi_dsi.c                        |   4 +-
 drivers/video/rockchip/rk_vop.c                    |   2 +-
 drivers/video/stm32/stm32_dsi.c                    |   4 +-
 drivers/video/stm32/stm32_ltdc.c                   |   4 +-
 drivers/video/tegra124/display.c                   |   2 +-
 drivers/video/tegra124/sor.c                       |   6 +-
 drivers/video/ti/tilcdc.c                          |   4 +-
 drivers/watchdog/cdns_wdt.c                        |   6 +-
 drivers/watchdog/sbsa_gwdt.c                       |  12 +-
 drivers/watchdog/sp805_wdt.c                       |   6 +-
 drivers/watchdog/xilinx_tb_wdt.c                   |   6 +-
 include/configs/anbernic-rgxx3-rk3566.h            |  12 +
 include/dm/fdtaddr.h                               |  17 +-
 include/dm/ofnode.h                                |  16 +-
 include/fdtdec.h                                   |  13 +-
 include/regmap.h                                   |   5 +-
 include/syscon.h                                   |  13 -
 139 files changed, 3056 insertions(+), 413 deletions(-)
 create mode 100644 arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3328-nanopi-r2c.dts
 create mode 100644 arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3399-rock-4c-plus.dts
 rename arch/arm/dts/{rk3399-rock-pi-4b-u-boot.dtsi => rk3399-rock-pi-4a-u-boot.dtsi} (100%)
 delete mode 100644 arch/arm/dts/rk3399-rock-pi-4b.dts
 create mode 100644 arch/arm/dts/rk3399-t-opp.dtsi
 create mode 100644 arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3566-anbernic-rgxx3.dts
 create mode 100644 arch/arm/dts/rk3566-anbernic-rgxx3.dtsi
 create mode 100644 board/anbernic/rgxx3_rk3566/Kconfig
 create mode 100644 board/anbernic/rgxx3_rk3566/MAINTAINERS
 create mode 100644 board/anbernic/rgxx3_rk3566/Makefile
 create mode 100644 board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c
 create mode 100644 configs/anbernic-rgxx3_defconfig
 create mode 100644 configs/nanopi-r2c-rk3328_defconfig
 create mode 100644 configs/rock-4c-plus-rk3399_defconfig
 create mode 100644 doc/board/anbernic/index.rst
 create mode 100644 doc/board/anbernic/rgxx3.rst
 create mode 100644 include/configs/anbernic-rgxx3-rk3566.h


More information about the U-Boot mailing list