mbox

Please pull u-boot-rockchip (take 2)

Message ID CAPnjgZ1JT1zF02z8ABu0k-dJa6Z1ghE4Da0v=cwSUzDSfAGreg@mail.gmail.com
State New
Headers show

Pull-request

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

Message

Simon Glass Nov. 26, 2016, 2:02 a.m. UTC
Hi Tom,

I fixed up the checking of voltage and current to correct the test
failure. Sorry for not spotting this correctly.


The following changes since commit 543bd27353d2c5679057fe09aa2d02259687ff32:

  MAINTAINERS: SUNXI: Update maintainership (2016-11-22 09:07:26 -0500)

are available in the git repository at:

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

for you to fetch changes up to 6b388f0bed0e3d021128b4fc3c41da4572984e3b:

  rockchip: configs: correct partitions 'boot' size (2016-11-25 17:59:32 -0700)

----------------------------------------------------------------
Andreas Färber (2):
      arm: dts: Fix Rockchip sort order
      arm: rockchip: Fix typo in ROCKCHIP_RK3288 help

Jacob Chen (1):
      rockchip: configs: correct partitions 'boot' size

Keerthy (3):
      power: regulator: Introduce regulator_set_value_force function
      power: regulator: Add limits checking while setting voltage
      power: regulator: Add limits checking while setting current

Kever Yang (5):
      evb-rk3399: deduced the dram node size when space reserved
      config: evb-rk3399: enable PWM_ROCKCHIP
      config: rk3036: enable configs for USB HOST
      config: rk3036: enable fix regulator
      dts: arm: rk3036: add usb vbus node

Simon Glass (21):
      rockchip: video: Correct HDMI data source selection
      rockchip: video: Correct VOP clock selection
      rockchip: Allow jerry to use of-platdata
      stdio: Correct code style nits
      stdio: Correct numbering logic in stdio_probe_device()
      spi: Add of-platdata support to SPI and SPI flash
      rockchip: spi: Add support for of-platdata
      rockchip: spi: Honour the deactivation delay
      spi: Add a debug() on bind failure
      video: Use cache-alignment in video_sync()
      video: Track whether a display is in use
      rockchip: video: Check for device in use
      rockchip: Move jerry to use of-platdata
      rockchip: Rename jerry files to veyron
      rockchip: veyron: Add a note about the SDRAM voltage
      rockchip: Move jerry SDRAM settings into its own .dts file
      rockchip: clk: Support setting ACLK
      rockchip: veyron: Adjust ARM clock after relocation
      rockchip: video: Avoid using u8 in the HDMI driver
      rockchip: Add support for veyron-mickey (Chromebit)
      rockchip: Add support for veyron-minnie (ASUS Chromebook Flip)

 arch/arm/dts/Makefile                                      |   6 +-
 arch/arm/dts/rk3036-sdk.dts                                |  37 +++-
 arch/arm/dts/rk3288-veyron-chromebook.dtsi                 |   2 +
 arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} |  16 +-
 arch/arm/dts/rk3288-veyron-mickey.dts                      | 277
++++++++++++++++++++++++
 arch/arm/dts/rk3288-veyron-minnie.dts                      | 301
++++++++++++++++++++++++++
 arch/arm/dts/rk3288-veyron.dtsi                            |   8 -
 arch/arm/mach-rockchip/Kconfig                             |   2 +-
 arch/arm/mach-rockchip/rk3288-board-spl.c                  |   4 +
 arch/arm/mach-rockchip/rk3288-board.c                      |  44 ++++
 arch/arm/mach-rockchip/rk3288/Kconfig                      |  21 +-
 board/google/chromebook_jerry/Kconfig                      |  15 --
 board/google/chromebook_jerry/MAINTAINERS                  |   6 -
 board/google/chromebook_jerry/jerry.c                      |   7 -
 board/google/veyron/Kconfig                                |  47 ++++
 board/google/veyron/MAINTAINERS                            |  20 ++
 board/google/{chromebook_jerry => veyron}/Makefile         |   2 +-
 board/google/veyron/veyron.c                               |  13 ++
 board/rockchip/evb_rk3399/evb-rk3399.c                     |   2 +-
 cmd/regulator.c                                            |   5 +-
 common/stdio.c                                             |   9 +-
 configs/chromebit_mickey_defconfig                         |  84 +++++++
 configs/chromebook_jerry_defconfig                         |  10 +-
 configs/chromebook_minnie_defconfig                        |  82 +++++++
 configs/evb-rk3399_defconfig                               |   1 +
 configs/kylin-rk3036_defconfig                             |   4 +
 drivers/clk/rockchip/clk_rk3288.c                          |   7 +
 drivers/mtd/spi/spi_flash.c                                |   2 +-
 drivers/power/regulator/regulator-uclass.c                 |  28 +++
 drivers/spi/rk_spi.c                                       |  44 +++-
 drivers/spi/spi-uclass.c                                   |  18 +-
 drivers/video/display-uclass.c                             |  18 +-
 drivers/video/rockchip/rk_hdmi.c                           |  33 +--
 drivers/video/rockchip/rk_vop.c                            |  16 +-
 drivers/video/video-uclass.c                               |   3 +-
 include/configs/rk3036_common.h                            |   7 +
 include/configs/rockchip-common.h                          |   2 +-
 include/configs/{chromebook_jerry.h => veyron.h}           |   0
 include/display.h                                          |  10 +
 include/power/regulator.h                                  |  10 +
 40 files changed, 1133 insertions(+), 90 deletions(-)
 rename arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} (92%)
 create mode 100644 arch/arm/dts/rk3288-veyron-mickey.dts
 create mode 100644 arch/arm/dts/rk3288-veyron-minnie.dts
 delete mode 100644 board/google/chromebook_jerry/Kconfig
 delete mode 100644 board/google/chromebook_jerry/MAINTAINERS
 delete mode 100644 board/google/chromebook_jerry/jerry.c
 create mode 100644 board/google/veyron/Kconfig
 create mode 100644 board/google/veyron/MAINTAINERS
 rename board/google/{chromebook_jerry => veyron}/Makefile (81%)
 create mode 100644 board/google/veyron/veyron.c
 create mode 100644 configs/chromebit_mickey_defconfig
 create mode 100644 configs/chromebook_minnie_defconfig
 rename include/configs/{chromebook_jerry.h => veyron.h} (100%)

Regards,
Simon

Comments

Tom Rini Nov. 26, 2016, 8:47 p.m. UTC | #1
On Fri, Nov 25, 2016 at 07:02:54PM -0700, Simon Glass wrote:

> Hi Tom,

> 

> I fixed up the checking of voltage and current to correct the test

> failure. Sorry for not spotting this correctly.

> 

> 

> The following changes since commit 543bd27353d2c5679057fe09aa2d02259687ff32:

> 

>   MAINTAINERS: SUNXI: Update maintainership (2016-11-22 09:07:26 -0500)

> 

> are available in the git repository at:

> 

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

> 

> for you to fetch changes up to 6b388f0bed0e3d021128b4fc3c41da4572984e3b:

> 

>   rockchip: configs: correct partitions 'boot' size (2016-11-25 17:59:32 -0700)

> 


Applied to u-boot/master, thanks!

-- 
Tom
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot