mbox

[U-Boot] Please pull u-boot-rockchip

Message ID CAPnjgZ1=XXoNrpK8wnxj1g7iMzN3=1UcZ4m-UQ26sWfXUCX4sQ@mail.gmail.com
State Changes Requested
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-rockchip.git

Message

Simon Glass Sept. 19, 2016, 3:09 a.m. UTC
Hi Tom,

Here is some more RK3399 support and a few other changes.


The following changes since commit 9a6535e05f17acf03e891266a650cb6029124743:

  Merge branch 'master' of git://git.denx.de/u-boot-uniphier
(2016-09-18 14:05:30 -0400)

are available in the git repository at:

  git://git.denx.de/u-boot-rockchip.git

for you to fetch changes up to 257aec27f4e694a68c9d7569db9e0ebd05b88aa6:

  clk: rk3288: add PWM clock get rate (2016-09-18 21:05:02 -0600)

----------------------------------------------------------------
Kever Yang (14):
      rk3399: syscon: add support for pmugrf
      pinctrl: add driver for rk3399
      config: evb-rk3399: enable pinctrl driver
      rk3399: enable the pwm2/3 pinctrl in board init
      dts: rk3399: add pinctrl for sdmmc
      rk_pwm: use clock framework API to get module clock
      rk_pwm: remove grf setting code from driver
      rk3288: add arch_cpu_init for rk3288
      dts: rk3399-evb: add regulator-fixed for usb host vbus
      board: evb-rk3399: enable usb 2.0 host vbus power on board_init
      config: evb-rk3399: enable fixed regulator
      rk3399: add a empty "sys_proto.h" header file
      clk: rk3399: add pmucru controller support
      clk: rk3288: add PWM clock get rate

MengDongyang (4):
      usb: xhci-rockchip: add rockchip dwc3 controller driver
      rockchip: select DM_USB for rockchip SoC
      config: rk3399: add usb related configs
      dts: rk3399: add dwc3_typec node for rk3399

Xu Ziyuan (2):
      rockchip: use dummy byte only enable OF_PLATDATA
      rockchip: rk3288: skip lowlevel_init process

 arch/arm/Kconfig                                |   1 +
 arch/arm/dts/rk3399-evb.dts                     |  14 ++
 arch/arm/dts/rk3399.dtsi                        |  82 ++++++++++++
 arch/arm/include/asm/arch-rockchip/clock.h      |   1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 321
++++++++++++++++++++++++++++++++++++++++++++
 arch/arm/include/asm/arch-rockchip/sdram.h      |   4 +
 arch/arm/include/asm/arch-rockchip/sys_proto.h  |  10 ++
 arch/arm/mach-rockchip/board.c                  |   4 -
 arch/arm/mach-rockchip/rk3288-board-spl.c       |   4 -
 arch/arm/mach-rockchip/rk3288/Makefile          |   1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c          |  19 +++
 arch/arm/mach-rockchip/rk3399/syscon_rk3399.c   |   1 +
 board/rockchip/evb_rk3399/evb-rk3399.c          |  44 ++++++-
 configs/evb-rk3399_defconfig                    |  11 ++
 drivers/clk/rockchip/clk_rk3288.c               |   2 +
 drivers/clk/rockchip/clk_rk3399.c               | 177 ++++++++++++++++++++++++-
 drivers/pinctrl/Kconfig                         |   9 ++
 drivers/pinctrl/rockchip/Makefile               |   1 +
 drivers/pinctrl/rockchip/pinctrl_rk3399.c       | 439
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/pwm/rk_pwm.c                            |  26 ++--
 drivers/usb/host/Makefile                       |   1 +
 drivers/usb/host/xhci-rockchip.c                | 211
+++++++++++++++++++++++++++++
 include/configs/rk3288_common.h                 |   1 +
 include/configs/rk3399_common.h                 |  13 ++
 include/linux/usb/dwc3.h                        |  14 ++
 25 files changed, 1385 insertions(+), 26 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3399.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/sys_proto.h
 create mode 100644 arch/arm/mach-rockchip/rk3288/rk3288.c
 create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c
 create mode 100644 drivers/usb/host/xhci-rockchip.c

Regards,
Simon

Comments

Tom Rini Sept. 20, 2016, 7:25 p.m. UTC | #1
On Sun, Sep 18, 2016 at 09:09:46PM -0600, Simon Glass wrote:

> Hi Tom,
> 
> Here is some more RK3399 support and a few other changes.
> 
> 
> The following changes since commit 9a6535e05f17acf03e891266a650cb6029124743:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-uniphier
> (2016-09-18 14:05:30 -0400)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-rockchip.git
> 
> for you to fetch changes up to 257aec27f4e694a68c9d7569db9e0ebd05b88aa6:
> 
>   clk: rk3288: add PWM clock get rate (2016-09-18 21:05:02 -0600)
> 

NAK:
   aarch64:  +   evb-rk3399
+(evb-rk3399) Error: You must add new CONFIG options using Kconfig                       +(evb-rk3399) The following new ad-hoc CONFIG options were detected:
+(evb-rk3399) CONFIG_USB_XHCI_ROCKCHIP                                                   +(evb-rk3399) 
+(evb-rk3399) Please add these via Kconfig instead. Find a suitable Kconfig              +(evb-rk3399) file and add a 'config' or 'menuconfig' option.
+(evb-rk3399) make[1]: *** [no_new_adhoc_configs_check] Error 1
Simon Glass Sept. 22, 2016, 2:12 p.m. UTC | #2
Hi Tom,

On 20 September 2016 at 13:25, Tom Rini <trini@konsulko.com> wrote:
> On Sun, Sep 18, 2016 at 09:09:46PM -0600, Simon Glass wrote:
>
>> Hi Tom,
>>
>> Here is some more RK3399 support and a few other changes.
>>
>>
>> The following changes since commit 9a6535e05f17acf03e891266a650cb6029124743:
>>
>>   Merge branch 'master' of git://git.denx.de/u-boot-uniphier
>> (2016-09-18 14:05:30 -0400)
>>
>> are available in the git repository at:
>>
>>   git://git.denx.de/u-boot-rockchip.git
>>
>> for you to fetch changes up to 257aec27f4e694a68c9d7569db9e0ebd05b88aa6:
>>
>>   clk: rk3288: add PWM clock get rate (2016-09-18 21:05:02 -0600)
>>
>
> NAK:
>    aarch64:  +   evb-rk3399
> +(evb-rk3399) Error: You must add new CONFIG options using Kconfig                       +(evb-rk3399) The following new ad-hoc CONFIG options were detected:
> +(evb-rk3399) CONFIG_USB_XHCI_ROCKCHIP                                                   +(evb-rk3399)
> +(evb-rk3399) Please add these via Kconfig instead. Find a suitable Kconfig              +(evb-rk3399) file and add a 'config' or 'menuconfig' option.
> +(evb-rk3399) make[1]: *** [no_new_adhoc_configs_check] Error 1
>

Ha, hoist by my own petard! I should not have rebased before sending
it, although it would have failed in any case. I'm pleased to see this
working.

Kever has sent an updated patch so I will resend this later today.

Regards,
Simon