Pull request: u-boot-rockchip-20220418

Kever Yang kever.yang at rock-chips.com
Tue Apr 19 11:17:05 CEST 2022


Hi Tom,

Please pull the rockchip updates:
- Add rk3066 SoC support;
- Add rk3066 MK808 board support;
- dts sync from kernel for rk322x, rk3288;
- some other board level config update;

Gitlab ci:
https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/11773

Thanks,
- Kever

The following changes since commit 9859465bfe838bc8264d45e1a1bed847bba74bad:

  Merge tag 'efi-2022-07-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi (2022-04-15 14:29:52 -0400)

are available in the Git repository at:

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

for you to fetch changes up to dcaaefdc0a7b3052e513b0e5dd2b00be4436386b:

  rockchip: video: mipi: add more compatible strings for rk3288/rk3399 (2022-04-18 11:25:13 +0800)

----------------------------------------------------------------
Chris Morgan (2):
      spi: rockchip_sfc: Add missing include for dm/device_compat.h
      rockchip: clk: add clocks to px30_clk_enable

Haolin Li (1):
      mmc: rockchip_sdhci: Correct error checking

Johan Jonker (38):
      rockchip: move ROCKCHIP_STIMER_BASE to Kconfig
      rockchip: spl: change call condition rockchip_stimer_init()
      rockchip: tpl: change call condition rockchip_stimer_init()
      rockchip: tpl: use IS_ENABLED for timer_init() call condition
      rockchip: timer: add OF_PLATDATA support for dw-apb-timer
      rockchip: timer: dw-apb-timer: fix whitespace in U_BOOT_DRIVER structure
      rockchip: mmc: rockchip_dw_mmc: fix ciu clock index
      rockchip: mmc: rockchip_dw_mmc: add rk3066/rk3188 support
      rockchip: serial: restyle the serial_rockchip.c driver
      rockchip: serial: move driver alias to serial_rockchip.c
      rockchip: serial: rename U_BOOT_DRIVER name to rockchip_uart
      rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL
      rockchip: serial: Kconfig: allow ROCKCHIP_SERIAL enabled in TPL
      rockchip: rk3066-power: sync power domain dt-binding header from Linux
      arm: dts: rockchip: fix rk3xxx-u-boot.dtsi
      arm: dts: rockchip: fix include rk3xxx-u-boot.dtsi
      arm: dts: rockchip: add rk3066a.dtsi
      arm: dts: rockchip: add rk3066a-mk808.dts
      rockchip: tools: add rk3066 support to rkcommon.c
      rockchip: rk3066: add core support
      rockchip: rk3066: add Rikomagic MK808 board
      rockchip: rk3066: add mk808_defconfig
      doc: rockchip: restyle rockchip.rst
      doc: rockchip: add px30/rk3326 boards and examples
      doc: rockchip: add rk3066 Rikomagic MK808
      rockchip: rk3228-power: sync power domain dt-binding header from Linux
      rockchip: rk3228-cru: sync the clock dt-binding header from Linux
      arm: dts: rockchip: move all rk322x u-boot specific properties in separate dtsi files
      arm: dts: rockchip: sync rk322x.dtsi from Linux
      arm: dts: rockchip: sync rk3229-evb.dts from Linux
      rockchip: rk3288-power: sync power domain dt-binding header from Linux
      rockchip: rk3288-cru: sync the clock dt-binding header from Linux
      arm: dts: rockchip: move all rk3288 u-boot specific properties in separate dtsi files
      rockchip: fix boot_devices constants
      board: google: veyron: add more DT files to MAINTAINERS
      board: rk3288: add more DT files to MAINTAINERS
      rockchip: video: rk_edp: add more rk3288 edp node options
      rockchip: video: mipi: add more compatible strings for rk3288/rk3399

Paweł Jarosz (4):
      rockchip: rk3066: add grf header file
      rockchip: rk3066: add clock driver for rk3066 soc
      rockchip: rk3066: add rk3066 pinctrl driver
      rockchip: rk3066: add sdram driver

Peter Cai (1):
      adc: rockchip-saradc: add support for getting reference voltage value

Vagrant Cascadian (2):
      rockchip: Enable SCSI in distro bootcmd for rk3399.
      rockchip: Enable AHCI/SCSI/SATA on rockpro64-rk3399.

 arch/arm/dts/Makefile                           |   3 +
 arch/arm/dts/rk3066a-mk808-u-boot.dtsi          |  49 ++
 arch/arm/dts/rk3066a-mk808.dts                  | 216 ++++++
 arch/arm/dts/rk3066a-u-boot.dtsi                |   4 +
 arch/arm/dts/rk3066a.dtsi                       | 879 +++++++++++++++++++++++
 arch/arm/dts/rk3188-u-boot.dtsi                 |   1 +
 arch/arm/dts/rk3188.dtsi                        |   1 -
 arch/arm/dts/rk3229-evb-u-boot.dtsi             |  28 +
 arch/arm/dts/rk3229-evb.dts                     | 223 +++++-
 arch/arm/dts/rk3229.dtsi                        |  52 ++
 arch/arm/dts/rk322x-u-boot.dtsi                 |  56 ++
 arch/arm/dts/rk322x.dtsi                        | 879 ++++++++++++++++++-----
 arch/arm/dts/rk3288-evb-u-boot.dtsi             |  11 +
 arch/arm/dts/rk3288-evb.dts                     |  11 -
 arch/arm/dts/rk3288-firefly-u-boot.dtsi         |  31 +
 arch/arm/dts/rk3288-firefly.dts                 |  17 -
 arch/arm/dts/rk3288-firefly.dtsi                |   3 -
 arch/arm/dts/rk3288-miqi-u-boot.dtsi            |  20 +
 arch/arm/dts/rk3288-miqi.dts                    |  11 -
 arch/arm/dts/rk3288-miqi.dtsi                   |   2 -
 arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi     |  44 ++
 arch/arm/dts/rk3288-phycore-rdk.dts             |  18 -
 arch/arm/dts/rk3288-phycore-som.dtsi            |   6 -
 arch/arm/dts/rk3288-popmetal-u-boot.dtsi        |  11 +
 arch/arm/dts/rk3288-popmetal.dts                |  11 -
 arch/arm/dts/rk3288-rock2-square-u-boot.dtsi    |  30 +
 arch/arm/dts/rk3288-rock2-square.dts            |  18 -
 arch/arm/dts/rk3288-u-boot.dtsi                 |  80 ++-
 arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi    |  14 +
 arch/arm/dts/rk3288-veyron-jerry.dts            |  11 -
 arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi   |  14 +
 arch/arm/dts/rk3288-veyron-mickey.dts           |  11 -
 arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi   |  14 +
 arch/arm/dts/rk3288-veyron-minnie.dts           |  11 -
 arch/arm/dts/rk3288-veyron-u-boot.dtsi          |  61 ++
 arch/arm/dts/rk3288-veyron.dtsi                 |  39 --
 arch/arm/dts/rk3288.dtsi                        |  51 +-
 arch/arm/dts/rk3xxx-u-boot.dtsi                 |   8 +-
 arch/arm/include/asm/arch-rk3066/boot0.h        |   8 +
 arch/arm/include/asm/arch-rk3066/gpio.h         |   8 +
 arch/arm/include/asm/arch-rk3066/timer.h        |   6 +
 arch/arm/include/asm/arch-rockchip/cru_rk3066.h | 157 +++++
 arch/arm/include/asm/arch-rockchip/grf_rk3066.h | 210 ++++++
 arch/arm/mach-rockchip/Kconfig                  |  33 +
 arch/arm/mach-rockchip/Makefile                 |   1 +
 arch/arm/mach-rockchip/px30/Kconfig             |   3 +
 arch/arm/mach-rockchip/rk3036/Kconfig           |   3 +
 arch/arm/mach-rockchip/rk3066/Kconfig           |  39 ++
 arch/arm/mach-rockchip/rk3066/Makefile          |   5 +
 arch/arm/mach-rockchip/rk3066/clk_rk3066.c      |  33 +
 arch/arm/mach-rockchip/rk3066/rk3066.c          |  49 ++
 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c   |  55 ++
 arch/arm/mach-rockchip/rk3128/Kconfig           |   3 +
 arch/arm/mach-rockchip/rk3188/rk3188.c          |   4 +-
 arch/arm/mach-rockchip/rk322x/Kconfig           |   3 +
 arch/arm/mach-rockchip/rk322x/rk322x.c          |   4 +-
 arch/arm/mach-rockchip/rk3288/Kconfig           |   3 +
 arch/arm/mach-rockchip/rk3288/rk3288.c          |   4 +-
 arch/arm/mach-rockchip/rk3308/Kconfig           |  10 +-
 arch/arm/mach-rockchip/rk3328/Kconfig           |   3 +
 arch/arm/mach-rockchip/rk3328/rk3328.c          |   4 +-
 arch/arm/mach-rockchip/rk3368/Kconfig           |   3 +
 arch/arm/mach-rockchip/rk3368/rk3368.c          |   4 +-
 arch/arm/mach-rockchip/rk3399/Kconfig           |   3 +
 arch/arm/mach-rockchip/rk3568/Kconfig           |   3 +
 arch/arm/mach-rockchip/spl.c                    |   8 +-
 arch/arm/mach-rockchip/tpl.c                    |   9 +-
 board/chipspark/popmetal_rk3288/MAINTAINERS     |   2 +
 board/google/veyron/MAINTAINERS                 |  17 +
 board/mqmaker/miqi_rk3288/MAINTAINERS           |   2 +
 board/phytec/phycore_rk3288/MAINTAINERS         |   3 +
 board/radxa/rock2/MAINTAINERS                   |   3 +
 board/rikomagic/mk808/Kconfig                   |  15 +
 board/rikomagic/mk808/MAINTAINERS               |   6 +
 board/rikomagic/mk808/Makefile                  |   3 +
 board/rikomagic/mk808/mk808.c                   |   3 +
 board/rockchip/evb_rk3229/MAINTAINERS           |   2 +
 board/rockchip/evb_rk3288/MAINTAINERS           |   3 +
 board/rockchip/tinker_rk3288/MAINTAINERS        |   5 +
 configs/mk808_defconfig                         | 102 +++
 configs/rock_defconfig                          |   1 +
 configs/rockpro64-rk3399_defconfig              |   7 +
 doc/board/rockchip/rockchip.rst                 | 262 +++++--
 drivers/adc/rockchip-saradc.c                   |  21 +
 drivers/clk/rockchip/Makefile                   |   1 +
 drivers/clk/rockchip/clk_px30.c                 |   3 +
 drivers/clk/rockchip/clk_rk3066.c               | 717 +++++++++++++++++++
 drivers/mmc/rockchip_dw_mmc.c                   |   7 +-
 drivers/mmc/rockchip_sdhci.c                    |   2 +-
 drivers/pinctrl/rockchip/Makefile               |   1 +
 drivers/pinctrl/rockchip/pinctrl-rk3066.c       | 112 +++
 drivers/ram/rockchip/Makefile                   |   1 +
 drivers/ram/rockchip/sdram_rk3066.c             | 892 ++++++++++++++++++++++++
 drivers/serial/Kconfig                          |   5 +-
 drivers/serial/Makefile                         |   2 -
 drivers/serial/ns16550.c                        |   2 -
 drivers/serial/serial_rockchip.c                |  46 +-
 drivers/spi/rockchip_sfc.c                      |   1 +
 drivers/timer/dw-apb-timer.c                    |  52 +-
 drivers/video/rockchip/rk3288_mipi.c            |   1 +
 drivers/video/rockchip/rk3399_mipi.c            |   1 +
 drivers/video/rockchip/rk_edp.c                 |   8 +-
 include/configs/mk808.h                         |   9 +
 include/configs/px30_common.h                   |   1 -
 include/configs/rk3036_common.h                 |   1 -
 include/configs/rk3066_common.h                 |  47 ++
 include/configs/rk3128_common.h                 |   1 -
 include/configs/rk322x_common.h                 |   1 -
 include/configs/rk3288_common.h                 |   1 -
 include/configs/rk3308_common.h                 |   1 -
 include/configs/rk3328_common.h                 |   1 -
 include/configs/rk3368_common.h                 |   1 -
 include/configs/rk3399_common.h                 |   1 -
 include/configs/rk3568_common.h                 |   1 -
 include/configs/rockchip-common.h               |   7 +
 include/dt-bindings/clock/rk3228-cru.h          |  54 +-
 include/dt-bindings/clock/rk3288-cru.h          |  13 +-
 include/dt-bindings/power-domain/rk3288.h       |  11 -
 include/dt-bindings/power/rk3066-power.h        |  22 +
 include/dt-bindings/power/rk3228-power.h        |  21 +
 include/dt-bindings/power/rk3288-power.h        |  32 +
 tools/rkcommon.c                                |   1 +
 122 files changed, 5570 insertions(+), 595 deletions(-)
 create mode 100644 arch/arm/dts/rk3066a-mk808-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3066a-mk808.dts
 create mode 100644 arch/arm/dts/rk3066a-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3066a.dtsi
 create mode 100644 arch/arm/dts/rk3229-evb-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3229.dtsi
 create mode 100644 arch/arm/dts/rk322x-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-rock2-square-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi
 create mode 100644 arch/arm/include/asm/arch-rk3066/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3066/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk3066/timer.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3066.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3066.h
 create mode 100644 arch/arm/mach-rockchip/rk3066/Kconfig
 create mode 100644 arch/arm/mach-rockchip/rk3066/Makefile
 create mode 100644 arch/arm/mach-rockchip/rk3066/clk_rk3066.c
 create mode 100644 arch/arm/mach-rockchip/rk3066/rk3066.c
 create mode 100644 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
 create mode 100644 board/rikomagic/mk808/Kconfig
 create mode 100644 board/rikomagic/mk808/MAINTAINERS
 create mode 100644 board/rikomagic/mk808/Makefile
 create mode 100644 board/rikomagic/mk808/mk808.c
 create mode 100644 configs/mk808_defconfig
 create mode 100644 drivers/clk/rockchip/clk_rk3066.c
 create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3066.c
 create mode 100644 drivers/ram/rockchip/sdram_rk3066.c
 create mode 100644 include/configs/mk808.h
 create mode 100644 include/configs/rk3066_common.h
 delete mode 100644 include/dt-bindings/power-domain/rk3288.h
 create mode 100644 include/dt-bindings/power/rk3066-power.h
 create mode 100644 include/dt-bindings/power/rk3228-power.h
 create mode 100644 include/dt-bindings/power/rk3288-power.h


More information about the U-Boot mailing list