Tom,

Here’s a PR for a few changes available on the rockchip-tree for integration into master. While these are mainly bug-fixes, the plan is to have another PR either just-in-time for rc1 or slightly after with some larger series that still need review and discussion.

Thanks, Philipp.

The following changes since commit 81cf7c8d45935a295991fe2cd1df286f0f47511f:

Merge git://git.denx.de/u-boot-ubi (2018-03-25 12:02:13 -0400)

are available in the git repository at:

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

for you to fetch changes up to 6837c58666165b7b040bf5a5b9dfebc8354f5883:

rockchip: sdhci: support 8bit bus-width (2018-03-28 23:47:08 +0200)

---------------------------------------------------------------- Alexander Kochetkov (3): rockchip: pinctrl: rk3036: Move the iomux definitions into pinctrl-driver rockchip: pinctrl: rk3188: Move the iomux definitions into pinctrl-driver rockchip: clk: rk3188: update dpll settings to make EMAC work

Heinrich Schuchardt (4): driver: ram: rockchip: rk3399: missing counter increment usb: rockchip: remove duplicate assignement. video: rk3399_mipi: correct error checking video: rk3288_mipi: check in rk_mipi_ofdata_to_platdata

Mark Kettenis (1): rockchip: rk3399: set fdtfile

Philipp Tomsich (5): rockchip: pinctrl: rk3399: fix GPIO2B1 and GPIO2B2 shift value rockchip: pinctrl: rk3399: add support for I2C[123467] rockchip: defconfig: puma-rk3399: enable DMA for SDHCI controller rockchip: mmc: update MAINTAINERS rockchip: sdhci: support 8bit bus-width

Punit Agrawal (2): video: rk3399_mipi: Combine NULL check into IS_ERR_OR_NULL() video: rk3288_mipi: Combine NULL check into IS_ERR_OR_NULL()

MAINTAINERS | 2 + arch/arm/include/asm/arch-rockchip/grf_rk3036.h | 409 --------------------------------------------------------------------------------------------------------- arch/arm/include/asm/arch-rockchip/grf_rk3188.h | 380 -------------------------------------------------------------------------------------------------- arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 34 ++++++++- configs/puma-rk3399_defconfig | 1 + drivers/clk/rockchip/clk_rk3188.c | 2 +- drivers/mmc/rockchip_sdhci.c | 8 +++ drivers/pinctrl/rockchip/pinctrl_rk3036.c | 410 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/pinctrl/rockchip/pinctrl_rk3188.c | 380 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/pinctrl/rockchip/pinctrl_rk3399.c | 61 ++++++++++++++-- drivers/ram/rockchip/sdram_rk3399.c | 1 + drivers/usb/gadget/f_rockusb.c | 1 - drivers/video/rockchip/rk3288_mipi.c | 2 +- drivers/video/rockchip/rk3399_mipi.c | 2 +- include/configs/rk3399_common.h | 1 + 15 files changed, 893 insertions(+), 801 deletions(-)