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

Simon Glass
2017-06-08T12:53:32Z

Hi Tom,

Here is additional rk3368 and rk3399 support, rv1108 support,
refactoring HDMI video (brought in from Anatolij's tree to resolve
conflicts), some mkimage fixes and a few other things.

New boards supported are:

aarch64: sheep-rk3368 evb-px5 geekbox
arm: evb-rv1108

The following changes since commit 24796d27be0d0f403ed6ad7e3022b33e36ac08b5:

Merge git://git.denx.de/u-boot-ubi (2017-06-06 07:13:39 -0400)

are available in the git repository at:

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

for you to fetch changes up to 6c53d680c6b57bb9617a93cd1e92c242ae0aab21:

rockchip: board: puma_rk3399: enable BMP_16BPP, BMP_24BPP and
BMP_32BPP (2017-06-07 21:30:50 -0600)

----------------------------------------------------------------
Andreas Färber (2):
rockchip: rk3368: Add core start-up code for RK3368
rockchip: rk3368: Add initial support for RK3368 based GeekBox

Andy Yan (10):
rockchip: rk3368: Add clock driver
rockchip: rk3368: Add pinctrl driver
rockchip: rk3368: Add sysreset driver
rockchip: rk3368: add Sheep board
rockchip: rk3368: Add PX5 Evaluation board
rockchip: mkimage: Add support for RV1108
rockchip: pinctrl: Add rv1108 pinctrl driver
rockchip: clk: Add rv1108 clock driver
rockchip: Add core Soc start-up code for rv1108
rockchip: Add basic support for evb-rv1108 board

Heiko Stübner (2):
defconfig: firefly-rk3399: fix pinctrl config option
power: rk808: fix ldo register offset

Kever Yang (10):
rockchip; rk3399: disable SRAM security region
rockchip: rk8xx: allocate priv structure for driver
rockchip: rk3036: clean mask definition for cru reg
rockchip: clock: rk3036: some fix according TRM
rockchip: rk3036: clean mask definition for grf reg
rockchip: pinctrl: move rk3328 grf reg definition in header file
rockchip: pinctrl: rk3328: do not set io routing
MAINTAINERS: git-mailrc: update maintainer for Rockchip
MAINTAINERS: rockchip: add board/rockchip as maintained entry
rockchip: evb-rk3328: update board maintainer

Klaus Goger (2):
rockchip: board: puma_rk3399: derive ethaddr from cpuid
rockchip: dts: rk3399-puma: set spl-payload-offset

Mark Kettenis (1):
regulator: pwm: Fix handling of missing init voltage

Meng Dongyang (5):
configs: rk3328: add support for usb and config ehci and ohci driver
rockchip: dts: rk3328: add ehci and ohci node and enable host0 port
configs: rk3328: config xhci controller
rockchip: dts: rk3328: support and enable xhci
rockchip: usb: host: xhci-rockchip: add support for rk3328

Philipp Tomsich (35):
rockchip: efuse: add (misc) driver for RK3399 non-secure efuse block
rockchip: board: puma_rk3399: add support for serial# and cpuid#
via efuses
rockchip: defconfig: puma-rk3399: enable RK3399 efuse driver
rockchip: board: puma_rk3399: build FIT image via u-boot.itb
rockchip: mkimage: add support for verify_header/print_header
rockchip: mkimage: force 2KB alignment for init_size
rockchip: mkimage: set init_boot_size to avoid confusing the boot ROM
rockchip: arm64: rk3399: revise timeout-handling for DRAM PHY lock
rockchip: arm64: rk3399: support DDR3-1866 (i.e. 933MHz clock)
rockchip: dts: rk3399-puma: Add DDR3-1866 timings
rockchip: dts: rk3399-puma: make the debug serial dm-pre-reloc
rockchip: dts: rk3399-puma: release reset of on-module USB3 hub
via vbus-gpio
rockchip: defconfig: puma-rk3399: enable RK808 support
rockchip: defconfig: puma-rk3399: enable CONFIG_PHY_MICREL_KSZ9031
rockchip: defconfig: puma-rk3399: enable I2C
rockchip: defconfig: puma-rk3399: do not filter clock-names for SPL
rockchip: rk3328: don't implement usb_gadget_handle_interrupts twice
rockchip: video: rk_hdmi: fix implicit definition warnings
rockchip: defconfig: puma-rk3399: update defconfig with video-support
usb: dwc2-otg: make regs_otg (in platdata) a uintptr_t
rockchip: dts: rk3399: enable HDMI output in the DTS
rockchip: dts: rk3399-puma: sync DTS with Linux tree
rockchip: dts: rk3399-puma: refactor and rename (default) DDR3-1600 DTS
rockchip: dts: rk3399-puma: add DTS for the DDR3-1333 timing
rockchip: dts: rk3399-puma: add DTS for the DDR3-1866 timing
rockchip: defconfig: puma-rk3399: enable SPL_BOARD_INIT
rockchip: video: Kconfig: reformat help for VIDEO_ROCKCHIP
rockchip: video: Kconfig: set MAX_XRES and MAX_YRES via Kconfig
rockchip: video: refactor rk_vop and split RK3288-specific code off
rockchip: video: rk3399: enable HDMI output (from the rk_vop)
for the RK3399
rockchip: video: add mpixelclock settings from Linux driver
rockchip: video: split RK3288-specific part off from rk_hdmi
rockchip: video: rk3399: add HDMI TX support on the RK3399
rockchip: video: rk_vop: add grf field
rockchip: board: puma_rk3399: enable BMP_16BPP, BMP_24BPP and BMP_32BPP

Romain Perier (1):
rockchip: rk3288: grf: Fix shift for RK3288_TXCLK_DLY_ENA_GMAC_ENABLE

MAINTAINERS | 1 +
arch/arm/dts/Makefile | 8 +-
arch/arm/dts/rk3328-evb.dts | 13 +
arch/arm/dts/rk3328.dtsi | 25 +
arch/arm/dts/rk3368-geekbox.dts | 319 +++++
arch/arm/dts/rk3368-px5-evb.dts | 319 +++++
arch/arm/dts/rk3368-sheep.dts | 283 ++++
arch/arm/dts/rk3368.dtsi | 1090 +++++++++++++++
arch/arm/dts/rk3399-puma-ddr1333.dts | 11 +
arch/arm/dts/rk3399-puma-ddr1600.dts | 11 +
arch/arm/dts/rk3399-puma-ddr1866.dts | 11 +
arch/arm/dts/rk3399-puma.dts | 192 ---
arch/arm/dts/rk3399-puma.dtsi | 642 +++++++++
arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi | 1537 +++++++++++++++++++++
arch/arm/dts/rk3399.dtsi | 39 +
arch/arm/dts/rv1108-evb.dts | 54 +
arch/arm/dts/rv1108.dtsi | 479 +++++++
arch/arm/include/asm/arch-rockchip/cru_rk3036.h | 76 +-
arch/arm/include/asm/arch-rockchip/cru_rk3368.h | 124 ++
arch/arm/include/asm/arch-rockchip/cru_rv1108.h | 111 ++
arch/arm/include/asm/arch-rockchip/grf_rk3036.h | 133 +-
arch/arm/include/asm/arch-rockchip/grf_rk3288.h | 2 +-
arch/arm/include/asm/arch-rockchip/grf_rk3328.h | 114 ++
arch/arm/include/asm/arch-rockchip/grf_rk3368.h | 440 ++++++
arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 3 +
arch/arm/include/asm/arch-rockchip/grf_rv1108.h | 509 +++++++
arch/arm/include/asm/arch-rockchip/periph.h | 1 +
arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +
arch/arm/mach-rockchip/Kconfig | 21 +
arch/arm/mach-rockchip/Makefile | 2 +
arch/arm/mach-rockchip/rk3368/Kconfig | 32 +
arch/arm/mach-rockchip/rk3368/Makefile | 8 +
arch/arm/mach-rockchip/rk3368/clk_rk3368.c | 32 +
arch/arm/mach-rockchip/rk3368/rk3368.c | 86 ++
arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 24 +
arch/arm/mach-rockchip/rk3399-board-spl.c | 8 +-
arch/arm/mach-rockchip/rk3399/sdram_rk3399.c | 19 +-
arch/arm/mach-rockchip/rv1108/Kconfig | 28 +
arch/arm/mach-rockchip/rv1108/Makefile | 11 +
arch/arm/mach-rockchip/rv1108/clk_rv1108.c | 32 +
arch/arm/mach-rockchip/rv1108/rv1108.c | 15 +
arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 21 +
board/geekbuying/geekbox/Kconfig | 15 +
board/geekbuying/geekbox/MAINTAINERS | 6 +
board/geekbuying/geekbox/Makefile | 7 +
board/geekbuying/geekbox/README | 1 +
board/geekbuying/geekbox/geekbox.c | 28 +
board/rockchip/evb_px5/Kconfig | 15 +
board/rockchip/evb_px5/MAINTAINERS | 6 +
board/rockchip/evb_px5/Makefile | 7 +
board/rockchip/evb_px5/README | 1 +
board/rockchip/evb_px5/evb-px5.c | 51 +
board/rockchip/evb_rk3328/MAINTAINERS | 2 +-
board/rockchip/evb_rk3328/evb-rk3328.c | 5 -
board/rockchip/evb_rv1108/Kconfig | 15 +
board/rockchip/evb_rv1108/MAINTAINERS | 6 +
board/rockchip/evb_rv1108/Makefile | 7 +
board/rockchip/evb_rv1108/README | 47 +
board/rockchip/evb_rv1108/evb_rv1108.c | 52 +
board/rockchip/sheep_rk3368/Kconfig | 15 +
board/rockchip/sheep_rk3368/MAINTAINERS | 6 +
board/rockchip/sheep_rk3368/Makefile | 7 +
board/rockchip/sheep_rk3368/README | 44 +
board/rockchip/sheep_rk3368/sheep_rk3368.c | 37 +
board/theobroma-systems/puma_rk3399/README | 5 +-
board/theobroma-systems/puma_rk3399/puma-rk3399.c | 118 ++
configs/evb-px5_defconfig | 30 +
configs/evb-rk3328_defconfig | 11 +
configs/evb-rv1108_defconfig | 40 +
configs/firefly-rk3399_defconfig | 2 +-
configs/geekbox_defconfig | 22 +
configs/puma-rk3399_defconfig | 25 +-
configs/sheep-rk3368_defconfig | 28 +
doc/git-mailrc | 2 +-
drivers/clk/rockchip/Makefile | 2 +
drivers/clk/rockchip/clk_rk3036.c | 93 +-
drivers/clk/rockchip/clk_rk3368.c | 291 ++++
drivers/clk/rockchip/clk_rv1108.c | 223 +++
drivers/misc/Kconfig | 13 +
drivers/misc/Makefile | 1 +
drivers/misc/rockchip-efuse.c | 161 +++
drivers/pinctrl/Kconfig | 20 +
drivers/pinctrl/rockchip/Makefile | 2 +
drivers/pinctrl/rockchip/pinctrl_rk3036.c | 44 +-
drivers/pinctrl/rockchip/pinctrl_rk3328.c | 228 +--
drivers/pinctrl/rockchip/pinctrl_rk3368.c | 149 ++
drivers/pinctrl/rockchip/pinctrl_rv1108.c | 184 +++
drivers/power/pmic/rk8xx.c | 1 +
drivers/power/regulator/pwm_regulator.c | 8 +-
drivers/power/regulator/rk8xx.c | 4 +-
drivers/sysreset/Makefile | 2 +
drivers/sysreset/sysreset_rk3368.c | 62 +
drivers/sysreset/sysreset_rv1108.c | 46 +
drivers/usb/host/xhci-rockchip.c | 31 +-
drivers/video/rockchip/Kconfig | 29 +-
drivers/video/rockchip/Makefile | 6 +-
drivers/video/rockchip/rk3288_hdmi.c | 116 ++
drivers/video/rockchip/rk3288_vop.c | 95 ++
drivers/video/rockchip/rk3399_hdmi.c | 81 ++
drivers/video/rockchip/rk3399_vop.c | 105 ++
drivers/video/rockchip/rk_hdmi.c | 115 +-
drivers/video/rockchip/rk_hdmi.h | 32 +
drivers/video/rockchip/rk_vop.c | 185 ++-
drivers/video/rockchip/rk_vop.h | 33 +
include/configs/evb_px5.h | 17 +
include/configs/evb_rv1108.h | 26 +
include/configs/geekbox.h | 17 +
include/configs/puma_rk3399.h | 8 +
include/configs/rk3328_common.h | 6 +
include/configs/rk3368_common.h | 49 +
include/configs/rv1108_common.h | 33 +
include/configs/sheep_rk3368.h | 21 +
include/dt-bindings/clock/rk3368-cru.h | 384 +++++
include/dt-bindings/clock/rv1108-cru.h | 269 ++++
include/usb/dwc2_udc.h | 2 +-
tools/rkcommon.c | 131 +-
tools/rkcommon.h | 20 +
tools/rksd.c | 35 +-
tools/rkspi.c | 23 +-
119 files changed, 10141 insertions(+), 822 deletions(-)
create mode 100644 arch/arm/dts/rk3368-geekbox.dts
create mode 100644 arch/arm/dts/rk3368-px5-evb.dts
create mode 100644 arch/arm/dts/rk3368-sheep.dts
create mode 100644 arch/arm/dts/rk3368.dtsi
create mode 100644 arch/arm/dts/rk3399-puma-ddr1333.dts
create mode 100644 arch/arm/dts/rk3399-puma-ddr1600.dts
create mode 100644 arch/arm/dts/rk3399-puma-ddr1866.dts
delete mode 100644 arch/arm/dts/rk3399-puma.dts
create mode 100644 arch/arm/dts/rk3399-puma.dtsi
create mode 100644 arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi
create mode 100644 arch/arm/dts/rv1108-evb.dts
create mode 100644 arch/arm/dts/rv1108.dtsi
create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3368.h
create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rv1108.h
create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3368.h
create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rv1108.h
create mode 100644 arch/arm/mach-rockchip/rk3368/Kconfig
create mode 100644 arch/arm/mach-rockchip/rk3368/Makefile
create mode 100644 arch/arm/mach-rockchip/rk3368/clk_rk3368.c
create mode 100644 arch/arm/mach-rockchip/rk3368/rk3368.c
create mode 100644 arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
create mode 100644 arch/arm/mach-rockchip/rv1108/Kconfig
create mode 100644 arch/arm/mach-rockchip/rv1108/Makefile
create mode 100644 arch/arm/mach-rockchip/rv1108/clk_rv1108.c
create mode 100644 arch/arm/mach-rockchip/rv1108/rv1108.c
create mode 100644 arch/arm/mach-rockchip/rv1108/syscon_rv1108.c
create mode 100644 board/geekbuying/geekbox/Kconfig
create mode 100644 board/geekbuying/geekbox/MAINTAINERS
create mode 100644 board/geekbuying/geekbox/Makefile
create mode 100644 board/geekbuying/geekbox/README
create mode 100644 board/geekbuying/geekbox/geekbox.c
create mode 100644 board/rockchip/evb_px5/Kconfig
create mode 100644 board/rockchip/evb_px5/MAINTAINERS
create mode 100644 board/rockchip/evb_px5/Makefile
create mode 100644 board/rockchip/evb_px5/README
create mode 100644 board/rockchip/evb_px5/evb-px5.c
create mode 100644 board/rockchip/evb_rv1108/Kconfig
create mode 100644 board/rockchip/evb_rv1108/MAINTAINERS
create mode 100644 board/rockchip/evb_rv1108/Makefile
create mode 100644 board/rockchip/evb_rv1108/README
create mode 100644 board/rockchip/evb_rv1108/evb_rv1108.c
create mode 100644 board/rockchip/sheep_rk3368/Kconfig
create mode 100644 board/rockchip/sheep_rk3368/MAINTAINERS
create mode 100644 board/rockchip/sheep_rk3368/Makefile
create mode 100644 board/rockchip/sheep_rk3368/README
create mode 100644 board/rockchip/sheep_rk3368/sheep_rk3368.c
create mode 100644 configs/evb-px5_defconfig
create mode 100644 configs/evb-rv1108_defconfig
create mode 100644 configs/geekbox_defconfig
create mode 100644 configs/sheep-rk3368_defconfig
create mode 100644 drivers/clk/rockchip/clk_rk3368.c
create mode 100644 drivers/clk/rockchip/clk_rv1108.c
create mode 100644 drivers/misc/rockchip-efuse.c
create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3368.c
create mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.c
create mode 100644 drivers/sysreset/sysreset_rk3368.c
create mode 100644 drivers/sysreset/sysreset_rv1108.c
create mode 100644 drivers/video/rockchip/rk3288_hdmi.c
create mode 100644 drivers/video/rockchip/rk3288_vop.c
create mode 100644 drivers/video/rockchip/rk3399_hdmi.c
create mode 100644 drivers/video/rockchip/rk3399_vop.c
create mode 100644 drivers/video/rockchip/rk_hdmi.h
create mode 100644 drivers/video/rockchip/rk_vop.h
create mode 100644 include/configs/evb_px5.h
create mode 100644 include/configs/evb_rv1108.h
create mode 100644 include/configs/geekbox.h
create mode 100644 include/configs/rk3368_common.h
create mode 100644 include/configs/rv1108_common.h
create mode 100644 include/configs/sheep_rk3368.h
create mode 100644 include/dt-bindings/clock/rk3368-cru.h
create mode 100644 include/dt-bindings/clock/rv1108-cru.h

Regards,
Simon