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

Simon Glass
2017-02-23T16:42:57Z

Hi Tom,

This includes support for two SoCs that have been in the works for a while:
rk3188 from Heiko St?bner and and SPL for rk3399 from Kever Yang. For the
former there are a few more patches to come but I'll apply them in a few
days once I've had time to test. In addition this includes rk3328 also from
Kever which is based on the rk3399 work. I've decided to bring this in also
as the impact is minimal.

There are a few bugs in mainline affecting rockchip which I'd like to fix
for the release also. But I want to take a bit more time to really
understand the problem before applying anything. Hopefully I will have
those early next week. I'm sending this pull request now as I feel
uncomfortable having so many pending patches.

The following changes since commit b24cf8540a85a9bf97975aadd6a7542f166c78a3:

video: mxsfb: Fix reset hang when videomode variable is not present
(2017-02-22 21:47:59 +0100)

are available in the git repository at:

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

for you to fetch changes up to 984fe3b08c8fcc61253965c88f882411ad8c78ec:

rockchip: rk3288: add defconfig for evb-rk3328 (2017-02-23 09:17:59 -0700)

----------------------------------------------------------------
Eddie Cai (1):
rockchip: tinker: configs: use correct mmc instance as boot target
device

Heiko St?bner (18):
dm: allow limiting pre-reloc markings to spl or tpl
rockchip: clk: rk3288: limit gpll and cpll init to SPL build
rockchip: rk3288: sdram: use constants in ddrconf table
rockchip: rk3288: sdram: style fixes from rk3188 sdram review
rockchip: Move bootrom helper compilation to a hidden option
rockchip: Move bootrom-related declarations to a header
rockchip: mkimage: Allow encoding of loader code in spl images
rockchip: mkimage: Add support rk3188 serial
rockchip: serial: Adapt rockchip of-platdata driver for rk3188
rockchip: rk3188: Add header files for PMU and GRF
rockchip: rk3188: Add pinctrl driver
rockchip: rk3188: Add sysreset driver
rockchip: rk3188: Add rk3066/rk3188 clock bindings
rockchip: rk3188: Add clock driver
rockchip: rk3188: Add core devicetree files
rockchip: rk3188: Add core support
rockchip: rk3188: Add sdram driver
rockchip: rk3188: Add main, spl and tpl boards

Jacob Chen (1):
rockchip: firefly: configs: remove config_spl_of_platdata

Kever Yang (16):
rockchip: arm64: rk3399: move grf register definitions to grf_rk3399.h
rockchip: clk: rk3399: update driver for spl
rockchip: sdhci: rk3399: update driver to support of-platdata
rockchip: pinctrl: rk3399: add the of-platdata support
rockchip: arm64: rk3399: syscon addition for rk3399
rockchip: arm64: rk3399: add ddr controller driver
rockchip: dts: rk3399: update for spl require driver
rockchip: arm64: rk3399: add SPL support
rockchip: config: rk3399: enable SPL config for evb-rk3399
rockchip: rk3328: add device tree file
rockchip: rk3328: add soc basic support
rockchip: rk3328: add clock driver
rockchip: rk3328: add pinctrl driver
rockchip: rk3328: add sysreset driver
rockchip: rk3328: add evb-rk3328 support
rockchip: rk3288: add defconfig for evb-rk3328

arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3188.dtsi | 601
++++++++++++++
arch/arm/dts/rk3328-evb.dts | 45 +
arch/arm/dts/rk3328.dtsi | 1477
+++++++++++++++++++++++++++++++++
arch/arm/dts/rk3399-evb.dts | 2 +
arch/arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi | 1536
+++++++++++++++++++++++++++++++++++
arch/arm/dts/rk3399.dtsi | 44 +
arch/arm/dts/rk3xxx.dtsi | 417 ++++++++++
arch/arm/include/asm/arch-rockchip/bootrom.h | 22 +
arch/arm/include/asm/arch-rockchip/clock.h | 9 +
arch/arm/include/asm/arch-rockchip/cru_rk3188.h | 191 +++++
arch/arm/include/asm/arch-rockchip/cru_rk3328.h | 70 ++
arch/arm/include/asm/arch-rockchip/cru_rk3399.h | 5 +
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h | 25 +
arch/arm/include/asm/arch-rockchip/ddr_rk3288.h | 8 +
arch/arm/include/asm/arch-rockchip/grf_rk3188.h | 589
++++++++++++++
arch/arm/include/asm/arch-rockchip/grf_rk3328.h | 134 +++
arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 118 +++
arch/arm/include/asm/arch-rockchip/pmu_rk3188.h | 36 +
arch/arm/include/asm/arch-rockchip/sdram_rk3399.h | 119 +++
arch/arm/mach-rockchip/Kconfig | 34 +
arch/arm/mach-rockchip/Makefile | 16 +-
arch/arm/mach-rockchip/rk3036-board-spl.c | 3 +-
arch/arm/mach-rockchip/rk3188-board-spl.c | 218 +++++
arch/arm/mach-rockchip/rk3188-board-tpl.c | 86 ++
arch/arm/mach-rockchip/rk3188-board.c | 71 ++
arch/arm/mach-rockchip/rk3188/Kconfig | 24 +
arch/arm/mach-rockchip/rk3188/Makefile | 11 +
arch/arm/mach-rockchip/rk3188/clk_rk3188.c | 33 +
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c | 995
+++++++++++++++++++++++
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 55 ++
arch/arm/mach-rockchip/rk3288-board-spl.c | 3 +-
arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 59 +-
arch/arm/mach-rockchip/rk3328/Kconfig | 23 +
arch/arm/mach-rockchip/rk3328/Makefile | 9 +
arch/arm/mach-rockchip/rk3328/clk_rk3328.c | 31 +
arch/arm/mach-rockchip/rk3328/rk3328.c | 39 +
arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 20 +
arch/arm/mach-rockchip/rk3399-board-spl.c | 158 ++++
arch/arm/mach-rockchip/rk3399/Makefile | 1 +
arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 21 +
arch/arm/mach-rockchip/rk3399/rk3399.c | 1 +
arch/arm/mach-rockchip/rk3399/sdram_rk3399.c | 1321
++++++++++++++++++++++++++++++
arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 40 +
board/rockchip/evb_rk3328/Kconfig | 15 +
board/rockchip/evb_rk3328/MAINTAINERS | 6 +
board/rockchip/evb_rk3328/Makefile | 7 +
board/rockchip/evb_rk3328/README | 70 ++
board/rockchip/evb_rk3328/evb-rk3328.c | 40 +
configs/evb-rk3328_defconfig | 36 +
configs/evb-rk3399_defconfig | 19 +-
configs/firefly-rk3288_defconfig | 1 -
doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt | 42 +
doc/driver-model/README.txt | 4 +
drivers/clk/at91/pmc.c | 3 +-
drivers/clk/rockchip/Makefile | 2 +
drivers/clk/rockchip/clk_rk3188.c | 527 ++++++++++++
drivers/clk/rockchip/clk_rk3288.c | 2 +
drivers/clk/rockchip/clk_rk3328.c | 581 +++++++++++++
drivers/clk/rockchip/clk_rk3399.c | 91 ++-
drivers/core/root.c | 2 +-
drivers/core/util.c | 25 +
drivers/mmc/rockchip_sdhci.c | 17 +-
drivers/pinctrl/Kconfig | 18 +
drivers/pinctrl/pinctrl-uclass.c | 3 +-
drivers/pinctrl/rockchip/Makefile | 2 +
drivers/pinctrl/rockchip/pinctrl_rk3188.c | 611
++++++++++++++
drivers/pinctrl/rockchip/pinctrl_rk3328.c | 419 ++++++++++
drivers/pinctrl/rockchip/pinctrl_rk3399.c | 111 +--
drivers/serial/serial_rockchip.c | 19 +-
drivers/sysreset/Makefile | 2 +
drivers/sysreset/sysreset_rk3188.c | 47 ++
drivers/sysreset/sysreset_rk3328.c | 45 +
include/configs/evb_rk3328.h | 26 +
include/configs/rk3188_common.h | 121 +++
include/configs/rk3328_common.h | 65 ++
include/configs/rk3399_common.h | 11 +
include/configs/tinker_rk3288.h | 2 +-
include/dm/util.h | 26 +
include/dt-bindings/clock/rk3066a-cru.h | 32 +
include/dt-bindings/clock/rk3188-cru-common.h | 256 ++++++
include/dt-bindings/clock/rk3188-cru.h | 48 ++
include/dt-bindings/clock/rk3328-cru.h | 394 +++++++++
include/dt-bindings/clock/rk3399-cru.h | 16 +-
include/dt-bindings/pinctrl/rockchip.h | 2 +
scripts/Makefile.spl | 7 +-
tools/dtoc/dtoc.py | 2 +
tools/rkcommon.c | 34 +-
tools/rkcommon.h | 22 +
tools/rkimage.c | 3 +
tools/rksd.c | 4 +
tools/rkspi.c | 4 +
92 files changed, 12395 insertions(+), 168 deletions(-)
create mode 100644 arch/arm/dts/rk3188.dtsi
create mode 100644 arch/arm/dts/rk3328-evb.dts
create mode 100644 arch/arm/dts/rk3328.dtsi
create mode 100644 arch/arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi
create mode 100644 arch/arm/dts/rk3xxx.dtsi
create mode 100644 arch/arm/include/asm/arch-rockchip/bootrom.h
create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3188.h
create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3328.h
create mode 100644 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3188.h
create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3328.h
create mode 100644 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
create mode 100644 arch/arm/mach-rockchip/rk3188-board-spl.c
create mode 100644 arch/arm/mach-rockchip/rk3188-board-tpl.c
create mode 100644 arch/arm/mach-rockchip/rk3188-board.c
create mode 100644 arch/arm/mach-rockchip/rk3188/Kconfig
create mode 100644 arch/arm/mach-rockchip/rk3188/Makefile
create mode 100644 arch/arm/mach-rockchip/rk3188/clk_rk3188.c
create mode 100644 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c
create mode 100644 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
create mode 100644 arch/arm/mach-rockchip/rk3328/Kconfig
create mode 100644 arch/arm/mach-rockchip/rk3328/Makefile
create mode 100644 arch/arm/mach-rockchip/rk3328/clk_rk3328.c
create mode 100644 arch/arm/mach-rockchip/rk3328/rk3328.c
create mode 100644 arch/arm/mach-rockchip/rk3328/syscon_rk3328.c
create mode 100644 arch/arm/mach-rockchip/rk3399-board-spl.c
create mode 100644 arch/arm/mach-rockchip/rk3399/sdram_rk3399.c
create mode 100644 board/rockchip/evb_rk3328/Kconfig
create mode 100644 board/rockchip/evb_rk3328/MAINTAINERS
create mode 100644 board/rockchip/evb_rk3328/Makefile
create mode 100644 board/rockchip/evb_rk3328/README
create mode 100644 board/rockchip/evb_rk3328/evb-rk3328.c
create mode 100644 configs/evb-rk3328_defconfig
create mode 100644 doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt
create mode 100644 drivers/clk/rockchip/clk_rk3188.c
create mode 100644 drivers/clk/rockchip/clk_rk3328.c
create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c
create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3328.c
create mode 100644 drivers/sysreset/sysreset_rk3188.c
create mode 100644 drivers/sysreset/sysreset_rk3328.c
create mode 100644 include/configs/evb_rk3328.h
create mode 100644 include/configs/rk3188_common.h
create mode 100644 include/configs/rk3328_common.h
create mode 100644 include/dt-bindings/clock/rk3066a-cru.h
create mode 100644 include/dt-bindings/clock/rk3188-cru-common.h
create mode 100644 include/dt-bindings/clock/rk3188-cru.h
create mode 100644 include/dt-bindings/clock/rk3328-cru.h

Regards,
Simon