mbox series

Pull request: u-boot-rockchip-20200522

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

Pull-request

https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200522

Message

Kever Yang May 22, 2020, 1:02 p.m. UTC 
Hi Tom,

Please pull the rockchip updates/fixes:
- Fix rk3288 chromebook veyron support;
- Add pcie driver support for rk3399;
- other fixes for rk3399 boards

Gitlab ci:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/3355

Thanks,
- Kever

The following changes since commit 2fa581ba910368d0f7f995fb906d6c5e4218b594:

  Merge git://git.denx.de/u-boot-sh (2020-05-21 08:26:40 -0400)

are available in the Git repository at:

  https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200522

for you to fetch changes up to 33863f744d513f5c16a254870e7b3cef8580bbc9:

  rockchip: rk3328: rock64 - fix gen3 SPL hang (2020-05-22 20:53:20 +0800)

----------------------------------------------------------------
Andrius Štikonas (1):
      rockpro64: Enable HDMI output on rockpro64 board

Deepak Das (1):
      rockchip: rk3399: enable spl-fifo-mode for sdmmc

Heiko Stuebner (1):
      board: puma: use dtb given on the commandline instead of using u-boot.dtb

Heinrich Schuchardt (1):
      tools: value checks in rkcommon_check_params()

Jagan Teki (6):
      clk: rk3399: Add enable/disable clks
      clk: rk3399: Enable/Disable the PCIEPHY clk
      pci: Add Rockchip PCIe controller driver
      pci: Add Rockchip PCIe PHY controller driver
      rockchip: Enable PCIe/M.2 on rk3399 board w/ M.2
      rockchip: Enable PCIe/M.2 on rock960 board

Kurt Miller (1):
      rockchip: rk3328: rock64 - fix gen3 SPL hang

Urja Rannikko (4):
      rockchip: spl: veyron speedy boots from SPI
      rockchip: veyron: move board_early_init_f to _r (after reloc)
      rockchip: spl-boot-order: do not attempt to access fdt if OF_PLATDATA
      defconfig: veyron: no need for CONFIG_SPL_PINCTRL_FULL

 arch/arm/dts/rk3328-rock64-u-boot.dtsi             |  21 +
 arch/arm/dts/rk3399-u-boot.dtsi                    |   4 +
 arch/arm/mach-rockchip/spl-boot-order.c            |   6 +
 arch/arm/mach-rockchip/spl.c                       |   3 +-
 board/google/veyron/veyron.c                       |   2 +-
 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh |   2 +-
 board/vamrs/rock960_rk3399/rock960-rk3399.c        |  24 +
 configs/chromebit_mickey_defconfig                 |   4 +-
 configs/chromebook_jerry_defconfig                 |   5 +-
 configs/chromebook_minnie_defconfig                |   4 +-
 configs/chromebook_speedy_defconfig                |   3 +-
 configs/nanopc-t4-rk3399_defconfig                 |   4 +
 configs/roc-pc-mezzanine-rk3399_defconfig          |   4 +
 configs/rock64-rk3328_defconfig                    |   7 +-
 configs/rock960-rk3399_defconfig                   |   5 +
 configs/rockpro64-rk3399_defconfig                 |   7 +
 drivers/clk/rockchip/clk_rk3399.c                  | 154 +++++++
 drivers/pci/Kconfig                                |   8 +
 drivers/pci/Makefile                               |   1 +
 drivers/pci/pcie_rockchip.c                        | 491 +++++++++++++++++++++
 drivers/pci/pcie_rockchip.h                        | 142 ++++++
 drivers/pci/pcie_rockchip_phy.c                    | 205 +++++++++
 include/configs/rockpro64_rk3399.h                 |   5 +
 tools/rkcommon.c                                   |  14 +-
 24 files changed, 1106 insertions(+), 19 deletions(-)
 create mode 100644 drivers/pci/pcie_rockchip.c
 create mode 100644 drivers/pci/pcie_rockchip.h
 create mode 100644 drivers/pci/pcie_rockchip_phy.c

Comments

Peter Robinson May 22, 2020, 1:16 p.m. UTC | #1 
Hi Kever,

Is there a reason the Pinebook Pro support not in this PR?

Peter

> Please pull the rockchip updates/fixes:
> - Fix rk3288 chromebook veyron support;
> - Add pcie driver support for rk3399;
> - other fixes for rk3399 boards
>
> Gitlab ci:
> https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/3355
>
> Thanks,
> - Kever
>
> The following changes since commit 2fa581ba910368d0f7f995fb906d6c5e4218b594:
>
>   Merge git://git.denx.de/u-boot-sh (2020-05-21 08:26:40 -0400)
>
> are available in the Git repository at:
>
>   https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200522
>
> for you to fetch changes up to 33863f744d513f5c16a254870e7b3cef8580bbc9:
>
>   rockchip: rk3328: rock64 - fix gen3 SPL hang (2020-05-22 20:53:20 +0800)
>
> ----------------------------------------------------------------
> Andrius Štikonas (1):
>       rockpro64: Enable HDMI output on rockpro64 board
>
> Deepak Das (1):
>       rockchip: rk3399: enable spl-fifo-mode for sdmmc
>
> Heiko Stuebner (1):
>       board: puma: use dtb given on the commandline instead of using u-boot.dtb
>
> Heinrich Schuchardt (1):
>       tools: value checks in rkcommon_check_params()
>
> Jagan Teki (6):
>       clk: rk3399: Add enable/disable clks
>       clk: rk3399: Enable/Disable the PCIEPHY clk
>       pci: Add Rockchip PCIe controller driver
>       pci: Add Rockchip PCIe PHY controller driver
>       rockchip: Enable PCIe/M.2 on rk3399 board w/ M.2
>       rockchip: Enable PCIe/M.2 on rock960 board
>
> Kurt Miller (1):
>       rockchip: rk3328: rock64 - fix gen3 SPL hang
>
> Urja Rannikko (4):
>       rockchip: spl: veyron speedy boots from SPI
>       rockchip: veyron: move board_early_init_f to _r (after reloc)
>       rockchip: spl-boot-order: do not attempt to access fdt if OF_PLATDATA
>       defconfig: veyron: no need for CONFIG_SPL_PINCTRL_FULL
>
>  arch/arm/dts/rk3328-rock64-u-boot.dtsi             |  21 +
>  arch/arm/dts/rk3399-u-boot.dtsi                    |   4 +
>  arch/arm/mach-rockchip/spl-boot-order.c            |   6 +
>  arch/arm/mach-rockchip/spl.c                       |   3 +-
>  board/google/veyron/veyron.c                       |   2 +-
>  board/theobroma-systems/puma_rk3399/fit_spl_atf.sh |   2 +-
>  board/vamrs/rock960_rk3399/rock960-rk3399.c        |  24 +
>  configs/chromebit_mickey_defconfig                 |   4 +-
>  configs/chromebook_jerry_defconfig                 |   5 +-
>  configs/chromebook_minnie_defconfig                |   4 +-
>  configs/chromebook_speedy_defconfig                |   3 +-
>  configs/nanopc-t4-rk3399_defconfig                 |   4 +
>  configs/roc-pc-mezzanine-rk3399_defconfig          |   4 +
>  configs/rock64-rk3328_defconfig                    |   7 +-
>  configs/rock960-rk3399_defconfig                   |   5 +
>  configs/rockpro64-rk3399_defconfig                 |   7 +
>  drivers/clk/rockchip/clk_rk3399.c                  | 154 +++++++
>  drivers/pci/Kconfig                                |   8 +
>  drivers/pci/Makefile                               |   1 +
>  drivers/pci/pcie_rockchip.c                        | 491 +++++++++++++++++++++
>  drivers/pci/pcie_rockchip.h                        | 142 ++++++
>  drivers/pci/pcie_rockchip_phy.c                    | 205 +++++++++
>  include/configs/rockpro64_rk3399.h                 |   5 +
>  tools/rkcommon.c                                   |  14 +-
>  24 files changed, 1106 insertions(+), 19 deletions(-)
>  create mode 100644 drivers/pci/pcie_rockchip.c
>  create mode 100644 drivers/pci/pcie_rockchip.h
>  create mode 100644 drivers/pci/pcie_rockchip_phy.c
>
>
Tom Rini May 22, 2020, 8:40 p.m. UTC | #2 
On Fri, May 22, 2020 at 09:02:16PM +0800, Kever Yang wrote:

> Hi Tom,
> 
> Please pull the rockchip updates/fixes:
> - Fix rk3288 chromebook veyron support;
> - Add pcie driver support for rk3399;
> - other fixes for rk3399 boards
> 
> Gitlab ci:
> https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/3355
> 
> Thanks,
> - Kever
> 
> The following changes since commit 2fa581ba910368d0f7f995fb906d6c5e4218b594:
> 
>   Merge git://git.denx.de/u-boot-sh (2020-05-21 08:26:40 -0400)
> 
> are available in the Git repository at:
> 
>   https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200522
> 
> for you to fetch changes up to 33863f744d513f5c16a254870e7b3cef8580bbc9:
> 
>   rockchip: rk3328: rock64 - fix gen3 SPL hang (2020-05-22 20:53:20 +0800)
> 

Applied to u-boot/master, thanks!
Kever Yang May 24, 2020, 1:16 p.m. UTC | #3 
Hi Peter,

     I just check the patch, I didn't merge the patch because it's 
delegate to Anatolij Gustschin
and not on my list.
     It would be better to split patches not at the same module or not 
for the same SoC into
different patch sets.
     I will try to merge the patch for my next PR, resend may needed if 
conflict happen.

Thanks,
- Kever
On 2020/5/22 下午9:16, Peter Robinson wrote:
> Hi Kever,
>
> Is there a reason the Pinebook Pro support not in this PR?
>
> Peter
>
>> Please pull the rockchip updates/fixes:
>> - Fix rk3288 chromebook veyron support;
>> - Add pcie driver support for rk3399;
>> - other fixes for rk3399 boards
>>
>> Gitlab ci:
>> https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/3355
>>
>> Thanks,
>> - Kever
>>
>> The following changes since commit 2fa581ba910368d0f7f995fb906d6c5e4218b594:
>>
>>    Merge git://git.denx.de/u-boot-sh (2020-05-21 08:26:40 -0400)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200522
>>
>> for you to fetch changes up to 33863f744d513f5c16a254870e7b3cef8580bbc9:
>>
>>    rockchip: rk3328: rock64 - fix gen3 SPL hang (2020-05-22 20:53:20 +0800)
>>
>> ----------------------------------------------------------------
>> Andrius Štikonas (1):
>>        rockpro64: Enable HDMI output on rockpro64 board
>>
>> Deepak Das (1):
>>        rockchip: rk3399: enable spl-fifo-mode for sdmmc
>>
>> Heiko Stuebner (1):
>>        board: puma: use dtb given on the commandline instead of using u-boot.dtb
>>
>> Heinrich Schuchardt (1):
>>        tools: value checks in rkcommon_check_params()
>>
>> Jagan Teki (6):
>>        clk: rk3399: Add enable/disable clks
>>        clk: rk3399: Enable/Disable the PCIEPHY clk
>>        pci: Add Rockchip PCIe controller driver
>>        pci: Add Rockchip PCIe PHY controller driver
>>        rockchip: Enable PCIe/M.2 on rk3399 board w/ M.2
>>        rockchip: Enable PCIe/M.2 on rock960 board
>>
>> Kurt Miller (1):
>>        rockchip: rk3328: rock64 - fix gen3 SPL hang
>>
>> Urja Rannikko (4):
>>        rockchip: spl: veyron speedy boots from SPI
>>        rockchip: veyron: move board_early_init_f to _r (after reloc)
>>        rockchip: spl-boot-order: do not attempt to access fdt if OF_PLATDATA
>>        defconfig: veyron: no need for CONFIG_SPL_PINCTRL_FULL
>>
>>   arch/arm/dts/rk3328-rock64-u-boot.dtsi             |  21 +
>>   arch/arm/dts/rk3399-u-boot.dtsi                    |   4 +
>>   arch/arm/mach-rockchip/spl-boot-order.c            |   6 +
>>   arch/arm/mach-rockchip/spl.c                       |   3 +-
>>   board/google/veyron/veyron.c                       |   2 +-
>>   board/theobroma-systems/puma_rk3399/fit_spl_atf.sh |   2 +-
>>   board/vamrs/rock960_rk3399/rock960-rk3399.c        |  24 +
>>   configs/chromebit_mickey_defconfig                 |   4 +-
>>   configs/chromebook_jerry_defconfig                 |   5 +-
>>   configs/chromebook_minnie_defconfig                |   4 +-
>>   configs/chromebook_speedy_defconfig                |   3 +-
>>   configs/nanopc-t4-rk3399_defconfig                 |   4 +
>>   configs/roc-pc-mezzanine-rk3399_defconfig          |   4 +
>>   configs/rock64-rk3328_defconfig                    |   7 +-
>>   configs/rock960-rk3399_defconfig                   |   5 +
>>   configs/rockpro64-rk3399_defconfig                 |   7 +
>>   drivers/clk/rockchip/clk_rk3399.c                  | 154 +++++++
>>   drivers/pci/Kconfig                                |   8 +
>>   drivers/pci/Makefile                               |   1 +
>>   drivers/pci/pcie_rockchip.c                        | 491 +++++++++++++++++++++
>>   drivers/pci/pcie_rockchip.h                        | 142 ++++++
>>   drivers/pci/pcie_rockchip_phy.c                    | 205 +++++++++
>>   include/configs/rockpro64_rk3399.h                 |   5 +
>>   tools/rkcommon.c                                   |  14 +-
>>   24 files changed, 1106 insertions(+), 19 deletions(-)
>>   create mode 100644 drivers/pci/pcie_rockchip.c
>>   create mode 100644 drivers/pci/pcie_rockchip.h
>>   create mode 100644 drivers/pci/pcie_rockchip_phy.c
>>
>>
>