mbox series

Pull request: u-boot-rockchip-20230228

Message ID 20230301002350.3760853-1-kever.yang@rock-chips.com
State Accepted
Delegated to: Tom Rini
Headers show
Series Pull request: u-boot-rockchip-20230228 | expand

Pull-request

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

Message

Kever Yang March 1, 2023, 12:23 a.m. UTC
Hi Tom,

Please pull the updates for rockchip platform:
- Add support for rk3588 soc;
- Add rk3588 Edgeble Neu6 board and Radxa ROCK5B board;
- Add rk3308 Radxa ROCK Pi S board;
- Add rk3568 Radxa ROCK 3 board,
- Add rk3566 Radxa Compute Module 3 board;
- Add support for sdram reg info version 3
- Refactor rockchip OTP/eFuse driver and add more soc support;
- Add external TPL support for binman;

binman support for mkimage ignore missing entry is based on [1];

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

Thanks,
- Kever

[1] https://patchwork.ozlabs.org/project/uboot/patch/20230219220158.4160763-7-jonas@kwiboo.se/


The following changes since commit e8c80ac0f7a13bf0fc016ce324b870c0cff7a2b8:

  Prepare v2023.04-rc3 (2023-02-27 17:18:36 -0500)

are available in the Git repository at:

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

for you to fetch changes up to a6e85a35b50ade7df5f32092c1cc05ade303a22a:

  board: rock5b-rk3588: add memory gaps into kernel's DTB (2023-02-28 18:07:29 +0800)

----------------------------------------------------------------
Akash Gajjar (2):
      arm64: dts: rockchip: rk3568: Add Radxa ROCK 3 Model A board support
      arm64: dts: rockchip: rk3308: Add Radxa ROCK Pi S support

Chris Morgan (7):
      gpio: gpio-rockchip: parse gpio-ranges for bank id
      dts: rockchip: px30: add gpio-ranges property to gpio nodes
      arm64: dts: rockchip: Sync rk356x from Linux main
      rockchip: rk3568: add boot device detection
      rockchip: rk3568: enable automatic power savings
      arm64: dts: rockchip: add gpio-ranges property to gpio nodes
      evb-rk3568: Update MAINTAINERS and documentation

Christian Kohlschütter (1):
      arm: dts: rockchip: rk3399: nanopi-r4s: Provide smbios sysinfo

Christopher Obbard (1):
      include: rk3328: Add default env for compressed kernel images

Eugen Hristev (2):
      board: rockchip: add Radxa ROCK5B Rk3588 board
      board: rock5b-rk3588: add memory gaps into kernel's DTB

Jagan Teki (27):
      board: edgeble: Fix neural-compute-module-2 board name
      rockchip: rk3568: Move DM_RESET in arch kconfig
      dt-bindings: rockchip: Sync rockchip, vop2.h from Linux
      arm64: dts: rockchip: rk3566: Add Radxa Compute Module 3
      arm64: dts: rockchip: rk3566: Add Radxa Compute Module 3 IO
      board: rockchip: Add Radxa Compute Module 3 IO Board
      phy: rockchip: inno-usb2: Add support #address_cells = 2
      drivers: phy: add naneng combphy for rk3568
      arm64: dts: rk356x-u-boot: Drop combphy1 assigned-clocks/rates
      rockchip: rk3568: add rk3568 pinctrl driver
      rockchip: mkimage: Add rk3588 support
      arm: rockchip: Add cru header for rk3588
      arm: rockchip: Add grf header for rk3588
      dt-bindings: clk: Add dt-binding header for RK3588
      clk: rockchip: Add rk3588 clk support
      clk: rockchip: pll: Add pll_rk3588 type for rk3588
      ram: rockchip: Add rk3588 ddr driver support
      dt-bindings: power: Add power-domain header for rk3588
      dt-bindings: reset: add rk3588 reset definitions
      arm: rockchip: Add ioc header for rk3588
      arm64: dts: rockchip: Add base DT for rk3588 SoC
      arm64: dts: rockchip: rk3588: Add Edgeble Neu6 Model A SoM
      arm64: dts: rockchip: rk3588: Add Edgeble Neu6 Model A IO
      arm: rockchip: Add RK3588 arch core support
      ARM: dts: rockchip: Add rk3588-u-boot.dtsi
      ARM: dts: rockchip: rk3588s-u-boot: Add sdmmc node
      board: rockchip: Add Edgeble Neural Compute Module 6

John Keeping (1):
      mmc: rockchip_dw_mmc: fix DDR52 8-bit mode handling

Jonas Karlman (21):
      rockchip: sdram: add basic support for sdram reg info version 3
      rockchip: sdram: add dram bank with usable memory beyond 4GB
      rockchip: dts: rk3328: fix sdram params
      binman: Add support for a rockchip-tpl entry
      rockchip: Use an external TPL binary on RK3568
      Revert "board: rockchip: Fix binman_init failure on EVB-RK3568"
      rockchip: mkimage: Update init size limit for RK3328
      rockchip: mkimage: Update init size limit for RK3568
      binman: Mark mkimage entry missing when its subnodes is missing
      rockchip: otp: Refactor to use driver data and ops
      rockchip: otp: Add support for RK3568
      rockchip: otp: Add support for RK3588
      rockchip: otp: Add dump_otp debug command
      rockchip: efuse: Refactor to use driver data and ops
      rockchip: efuse: Add support for RK3288 and more
      rockchip: efuse: Add support for RK3328
      rockchip: efuse: Add support for RK3128
      rockchip: efuse: Add support for RK3036
      rockchip: misc: Set eth1addr mac address
      rockchip: rk3568: Read cpuid from otp
      rockchip: rk3588: Read cpuid from otp

Manoj Sai (3):
      phy: rockchip-inno-usb2: Add USB2 PHY for rk3568
      rockchip: rk3568: Select DM_REGULATOR_FIXED
      rk3566: radxa-cm3: Enable USB2.0, USB3.0 support

Quentin Schulz (1):
      rockchip: ringneck: fix SDRAM init fail

Vasily Khoruzhick (1):
      clk: rockchip: rk3568: add more supported clk rates for sdmmc and emmc

 Makefile                                           |    1 +
 arch/arm/dts/Makefile                              |    8 +-
 arch/arm/dts/px30.dtsi                             |    4 +
 arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi          |   17 +
 arch/arm/dts/rk3308-rock-pi-s.dts                  |  228 ++
 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi            |   10 +
 arch/arm/dts/rk3328-sdram-ddr4-666.dtsi            |   10 +
 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi         |   10 +
 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi          |   10 +
 arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi         |   22 +
 arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi       |   18 +
 arch/arm/dts/rk3566-radxa-cm3-io.dts               |  272 ++
 arch/arm/dts/rk3566-radxa-cm3.dtsi                 |  425 +++
 arch/arm/dts/rk3568-evb.dts                        |  615 +++-
 arch/arm/dts/rk3568-rock-3a-u-boot.dtsi            |   24 +
 arch/arm/dts/rk3568-rock-3a.dts                    |  609 ++++
 arch/arm/dts/rk3568.dtsi                           |  122 +
 arch/arm/dts/rk356x-u-boot.dtsi                    |   17 +
 arch/arm/dts/rk356x.dtsi                           |  187 +-
 arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi   |   24 +
 arch/arm/dts/rk3588-edgeble-neu6a-io.dts           |   27 +
 arch/arm/dts/rk3588-edgeble-neu6a.dtsi             |   32 +
 arch/arm/dts/rk3588-pinctrl.dtsi                   |  516 +++
 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi            |   22 +
 arch/arm/dts/rk3588-rock-5b.dts                    |   44 +
 arch/arm/dts/rk3588-u-boot.dtsi                    |    7 +
 arch/arm/dts/rk3588.dtsi                           |   58 +
 arch/arm/dts/rk3588s-pinctrl.dtsi                  | 3403 ++++++++++++++++++++
 arch/arm/dts/rk3588s-u-boot.dtsi                   |   71 +
 arch/arm/dts/rk3588s.dtsi                          | 1703 ++++++++++
 arch/arm/dts/rockchip-u-boot.dtsi                  |   10 +-
 arch/arm/include/asm/arch-rk3588/boot0.h           |   11 +
 arch/arm/include/asm/arch-rk3588/gpio.h            |   11 +
 arch/arm/include/asm/arch-rockchip/clock.h         |   24 +
 arch/arm/include/asm/arch-rockchip/cru_rk3588.h    |  451 +++
 arch/arm/include/asm/arch-rockchip/grf_rk3588.h    |   35 +
 arch/arm/include/asm/arch-rockchip/ioc_rk3588.h    |  101 +
 arch/arm/include/asm/arch-rockchip/sdram.h         |   28 +-
 arch/arm/mach-rockchip/Kconfig                     |   34 +
 arch/arm/mach-rockchip/Makefile                    |    1 +
 arch/arm/mach-rockchip/board.c                     |    2 +-
 arch/arm/mach-rockchip/misc.c                      |    6 +-
 arch/arm/mach-rockchip/rk3568/rk3568.c             |   31 +
 arch/arm/mach-rockchip/rk3588/Kconfig              |   56 +
 arch/arm/mach-rockchip/rk3588/Makefile             |    9 +
 arch/arm/mach-rockchip/rk3588/clk_rk3588.c         |   32 +
 arch/arm/mach-rockchip/rk3588/rk3588.c             |  157 +
 arch/arm/mach-rockchip/rk3588/syscon_rk3588.c      |   32 +
 arch/arm/mach-rockchip/sdram.c                     |   21 +-
 board/edgeble/neural-compute-module-2/MAINTAINERS  |    2 +-
 board/edgeble/neural-compute-module-6/Kconfig      |   15 +
 board/edgeble/neural-compute-module-6/MAINTAINERS  |    6 +
 board/edgeble/neural-compute-module-6/Makefile     |    7 +
 board/edgeble/neural-compute-module-6/neu6.c       |    4 +
 board/radxa/rock5b-rk3588/Kconfig                  |   15 +
 board/radxa/rock5b-rk3588/MAINTAINERS              |    6 +
 board/radxa/rock5b-rk3588/Makefile                 |    6 +
 board/radxa/rock5b-rk3588/rock5b-rk3588.c          |   39 +
 board/rockchip/evb_rk3308/MAINTAINERS              |    7 +
 board/rockchip/evb_rk3568/MAINTAINERS              |   14 +
 configs/evb-rk3568_defconfig                       |    1 -
 configs/nanopi-r4s-rk3399_defconfig                |    6 +
 configs/neu6a-io-rk3588_defconfig                  |   67 +
 configs/radxa-cm3-io-rk3566_defconfig              |   77 +
 configs/ringneck-px30_defconfig                    |    1 +
 configs/rock-3a-rk3568_defconfig                   |   74 +
 configs/rock-pi-s-rk3308_defconfig                 |   89 +
 configs/rock5b-rk3588_defconfig                    |   72 +
 doc/board/rockchip/rockchip.rst                    |   18 +
 drivers/clk/rockchip/Makefile                      |    1 +
 drivers/clk/rockchip/clk_pll.c                     |  267 +-
 drivers/clk/rockchip/clk_rk3568.c                  |    3 +
 drivers/clk/rockchip/clk_rk3588.c                  | 1996 ++++++++++++
 drivers/gpio/rk_gpio.c                             |   20 +-
 drivers/misc/Kconfig                               |    4 -
 drivers/misc/rockchip-efuse.c                      |  333 +-
 drivers/misc/rockchip-otp.c                        |  230 +-
 drivers/mmc/rockchip_dw_mmc.c                      |    8 +
 drivers/phy/rockchip/Kconfig                       |    7 +
 drivers/phy/rockchip/Makefile                      |    1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c      |   65 +-
 drivers/phy/rockchip/phy-rockchip-naneng-combphy.c |  441 +++
 drivers/pinctrl/rockchip/Makefile                  |    1 +
 drivers/pinctrl/rockchip/pinctrl-rk3568.c          |  362 +++
 drivers/ram/rockchip/Makefile                      |    1 +
 drivers/ram/rockchip/sdram_rk3588.c                |   57 +
 include/configs/neural-compute-module-6.h          |   15 +
 include/configs/rk3328_common.h                    |    4 +-
 include/configs/rk3568_common.h                    |    2 +
 include/configs/rk3588_common.h                    |   32 +
 include/configs/rock5b-rk3588.h                    |   15 +
 include/configs/rockchip-common.h                  |    4 +
 include/dt-bindings/clock/rockchip,rk3588-cru.h    |  766 +++++
 include/dt-bindings/power/rk3588-power.h           |   69 +
 include/dt-bindings/reset/rockchip,rk3588-cru.h    |  754 +++++
 include/dt-bindings/soc/rockchip,vop2.h            |   14 +
 tools/binman/entries.rst                           |   14 +
 tools/binman/etype/mkimage.py                      |   24 +-
 tools/binman/etype/rockchip_tpl.py                 |   20 +
 tools/binman/ftest.py                              |   18 +
 tools/binman/missing-blob-help                     |    5 +
 tools/binman/test/277_rockchip_tpl.dts             |   16 +
 tools/binman/test/278_mkimage_missing_multiple.dts |   19 +
 tools/rkcommon.c                                   |    5 +-
 104 files changed, 15524 insertions(+), 163 deletions(-)
 create mode 100644 arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3308-rock-pi-s.dts
 create mode 100644 arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3566-radxa-cm3-io.dts
 create mode 100644 arch/arm/dts/rk3566-radxa-cm3.dtsi
 create mode 100644 arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3568-rock-3a.dts
 create mode 100644 arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3588-edgeble-neu6a-io.dts
 create mode 100644 arch/arm/dts/rk3588-edgeble-neu6a.dtsi
 create mode 100644 arch/arm/dts/rk3588-pinctrl.dtsi
 create mode 100644 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3588-rock-5b.dts
 create mode 100644 arch/arm/dts/rk3588-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3588.dtsi
 create mode 100644 arch/arm/dts/rk3588s-pinctrl.dtsi
 create mode 100644 arch/arm/dts/rk3588s-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3588s.dtsi
 create mode 100644 arch/arm/include/asm/arch-rk3588/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3588/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3588.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3588.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/ioc_rk3588.h
 create mode 100644 arch/arm/mach-rockchip/rk3588/Kconfig
 create mode 100644 arch/arm/mach-rockchip/rk3588/Makefile
 create mode 100644 arch/arm/mach-rockchip/rk3588/clk_rk3588.c
 create mode 100644 arch/arm/mach-rockchip/rk3588/rk3588.c
 create mode 100644 arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
 create mode 100644 board/edgeble/neural-compute-module-6/Kconfig
 create mode 100644 board/edgeble/neural-compute-module-6/MAINTAINERS
 create mode 100644 board/edgeble/neural-compute-module-6/Makefile
 create mode 100644 board/edgeble/neural-compute-module-6/neu6.c
 create mode 100644 board/radxa/rock5b-rk3588/Kconfig
 create mode 100644 board/radxa/rock5b-rk3588/MAINTAINERS
 create mode 100644 board/radxa/rock5b-rk3588/Makefile
 create mode 100644 board/radxa/rock5b-rk3588/rock5b-rk3588.c
 create mode 100644 configs/neu6a-io-rk3588_defconfig
 create mode 100644 configs/radxa-cm3-io-rk3566_defconfig
 create mode 100644 configs/rock-3a-rk3568_defconfig
 create mode 100644 configs/rock-pi-s-rk3308_defconfig
 create mode 100644 configs/rock5b-rk3588_defconfig
 create mode 100644 drivers/clk/rockchip/clk_rk3588.c
 create mode 100644 drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
 create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3568.c
 create mode 100644 drivers/ram/rockchip/sdram_rk3588.c
 create mode 100644 include/configs/neural-compute-module-6.h
 create mode 100644 include/configs/rk3588_common.h
 create mode 100644 include/configs/rock5b-rk3588.h
 create mode 100644 include/dt-bindings/clock/rockchip,rk3588-cru.h
 create mode 100644 include/dt-bindings/power/rk3588-power.h
 create mode 100644 include/dt-bindings/reset/rockchip,rk3588-cru.h
 create mode 100644 include/dt-bindings/soc/rockchip,vop2.h
 create mode 100644 tools/binman/etype/rockchip_tpl.py
 create mode 100644 tools/binman/test/277_rockchip_tpl.dts
 create mode 100644 tools/binman/test/278_mkimage_missing_multiple.dts

Comments

Tom Rini March 1, 2023, 2:54 p.m. UTC | #1
On Wed, Mar 01, 2023 at 08:23:50AM +0800, Kever Yang wrote:

> Hi Tom,
> 
> Please pull the updates for rockchip platform:
> - Add support for rk3588 soc;
> - Add rk3588 Edgeble Neu6 board and Radxa ROCK5B board;
> - Add rk3308 Radxa ROCK Pi S board;
> - Add rk3568 Radxa ROCK 3 board,
> - Add rk3566 Radxa Compute Module 3 board;
> - Add support for sdram reg info version 3
> - Refactor rockchip OTP/eFuse driver and add more soc support;
> - Add external TPL support for binman;
> 
> binman support for mkimage ignore missing entry is based on [1];
> 
> CI:
> https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/15403
> 
> Thanks,
> - Kever
> 
> [1] https://patchwork.ozlabs.org/project/uboot/patch/20230219220158.4160763-7-jonas@kwiboo.se/
> 
> 
> The following changes since commit e8c80ac0f7a13bf0fc016ce324b870c0cff7a2b8:
> 
>   Prepare v2023.04-rc3 (2023-02-27 17:18:36 -0500)
> 
> are available in the Git repository at:
> 
>   https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20230228
> 
> for you to fetch changes up to a6e85a35b50ade7df5f32092c1cc05ade303a22a:
> 
>   board: rock5b-rk3588: add memory gaps into kernel's DTB (2023-02-28 18:07:29 +0800)
> 

As I have been waiting for this, as it resolves some fairly important
fixes, I've taken this to master for the next release. But looking
forward, lets please try and get these bigger PRs done by -rc1 or -rc2
at the latest.  Thanks!
Kever Yang March 2, 2023, 1:49 a.m. UTC | #2
Hi Tom,

On 2023/3/1 22:54, Tom Rini wrote:
> On Wed, Mar 01, 2023 at 08:23:50AM +0800, Kever Yang wrote:
>
>> Hi Tom,
>>
>> Please pull the updates for rockchip platform:
>> - Add support for rk3588 soc;
>> - Add rk3588 Edgeble Neu6 board and Radxa ROCK5B board;
>> - Add rk3308 Radxa ROCK Pi S board;
>> - Add rk3568 Radxa ROCK 3 board,
>> - Add rk3566 Radxa Compute Module 3 board;
>> - Add support for sdram reg info version 3
>> - Refactor rockchip OTP/eFuse driver and add more soc support;
>> - Add external TPL support for binman;
>>
>> binman support for mkimage ignore missing entry is based on [1];
>>
>> CI:
>> https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/15403
>>
>> Thanks,
>> - Kever
>>
>> [1] https://patchwork.ozlabs.org/project/uboot/patch/20230219220158.4160763-7-jonas@kwiboo.se/
>>
>>
>> The following changes since commit e8c80ac0f7a13bf0fc016ce324b870c0cff7a2b8:
>>
>>    Prepare v2023.04-rc3 (2023-02-27 17:18:36 -0500)
>>
>> are available in the Git repository at:
>>
>>    https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20230228
>>
>> for you to fetch changes up to a6e85a35b50ade7df5f32092c1cc05ade303a22a:
>>
>>    board: rock5b-rk3588: add memory gaps into kernel's DTB (2023-02-28 18:07:29 +0800)
>>
> As I have been waiting for this, as it resolves some fairly important
> fixes, I've taken this to master for the next release. But looking
> forward, lets please try and get these bigger PRs done by -rc1 or -rc2
> at the latest.  Thanks!

Got it, thanks.

This is a bit late because I do wait for the binman support external TPL 
patch ready, and also fix some

other CI build errors.

Thanks,

- Kever

>