Tom,

Here’s the changes to the rockchip tree for this iteration (and I expect us to generate a few bug-fixes in the stabilisation phase), just in time for rc1.

The key change in in this merge window is improved support for the GMAC across the various Rockchip SOCs and moving the clock-selection from obscure per-chip functions to the clock-framework (and extending the device-model to process the assigned-clocks attributes).

The device-model change makes the set_parent()-op optional (i.e. if it is not there, then the assigned-clock-parents will not be evaluated), but may trigger failures for boards that have “assigned-clock-rates” attributes and return an error when trying to set the referenced clocks.

The associate travis-run (before the rebase) is https://travis-ci.org/ptomsich/u-boot-rockchip/builds/333500078

Regards, Philipp.

The following changes since commit 1a7f6d4597646662022f3e67ceaaeff7a23459e5:

Merge git://git.denx.de/u-boot-uniphier (2018-01-27 21:55:04 -0500)

are available in the git repository at:

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

for you to fetch changes up to 0289e291a5140b9e97ff3b1a12819ba0d5015887:

spl: atf: pass NULL for bl32_ep pc (2018-01-28 17:12:39 +0100)

---------------------------------------------------------------- David Wu (20): rockchip: dts: rk3399-evb: Change the tx/rx delay value for transmission quality rockchip: configs: Enable CONFIG_NET_RANDOM_ETHADDR for rk3288-evb rockchip: grf_rv1108.h: Fix the grf offsets rockchip: pinctrl: rv1108: Move the iomux definitions into pinctrl-driver net: gmac_rockchip: Add support for the RV1108 GMAC rockchip: pinctrl: rk3328: Move the iomux definitions into pinctrl-driver rockchip: pinctrl: Add rk3328 gmac pinctrl support clk: rockchip: Add rk3328 gamc clock support net: gmac_rockchip: Add rk3328 gmac support rockchip: configs: Enable GMAC configs for evb-rk3328 rockchip: dts: rk3328: Add gmac2io support rockchip: dts: rk3328-evb: Enable gmac2io for rk3328-evb rockchip: pinctrl: rk322x: Move the iomux definitions into pinctrl-driver rockchip: pinctrl: Add rk322x gmac pinctrl support clk: rockchip: Add rk322x gamc clock support net: gmac_rockchip: Add support for the RK3228 GMAC config: evb-rk3229: Enable rk gmac configs ARM: dts: rk3288: Remove unused LCDC clock assigned clk: rockchip: clk_rk3288: Implement "assign-clock-parent" and "assign-clock-rate" clk: rockchip: clk_rk3368: Implement "assign-clock-parent"

Eddie Cai (1): rockchip: rk3036: enable rockusb support on rk3036 based device

Kever Yang (2): rockchip: dts: rk3128: update pwm-cell for pwm0 spl: atf: pass NULL for bl32_ep pc

Philipp Tomsich (6): clk: add clk_set_parent() clk: refactor clk_get_by_index() into clk_get_by_indexed_prop() rockchip: clk: rk3399: implement set_parent() operation clk: implement clk_set_defaults() rockchip: clk: rk3399: accept all assigned-clocks from the 'cru'-node rockchip: clk: guard set_parent implementations against OF_PLATDATA

arch/arm/dts/rk3128.dtsi | 8 +- arch/arm/dts/rk3288.dtsi | 7 +- arch/arm/dts/rk3328-evb.dts | 30 ++++++ arch/arm/dts/rk3328.dtsi | 19 ++++ arch/arm/dts/rk3399-evb.dts | 4 +- arch/arm/include/asm/arch-rockchip/cru_rk3368.h | 7 ++ arch/arm/include/asm/arch-rockchip/grf_rk322x.h | 455 ----------------------------------------------------------------------------------------- arch/arm/include/asm/arch-rockchip/grf_rk3328.h | 114 ----------------------- arch/arm/include/asm/arch-rockchip/grf_rv1108.h | 405 +------------------------------------------------------------------------------ arch/arm/mach-rockchip/Kconfig | 2 + arch/arm/mach-rockchip/rk322x-board-spl.c | 22 ++++- arch/arm/mach-rockchip/rk322x-board.c | 18 ++++ board/rockchip/evb_rv1108/evb_rv1108.c | 17 ++++ common/spl/spl_atf.c | 3 +- configs/evb-rk3229_defconfig | 5 + configs/evb-rk3288_defconfig | 1 + configs/evb-rk3328_defconfig | 5 + drivers/clk/clk-uclass.c | 140 +++++++++++++++++++++++++++- drivers/clk/rockchip/clk_rk322x.c | 107 +++++++++++++++++++++ drivers/clk/rockchip/clk_rk3288.c | 108 ++++++++++++++++++++-- drivers/clk/rockchip/clk_rk3328.c | 178 +++++++++++++++++++++++++++++++++++ drivers/clk/rockchip/clk_rk3368.c | 93 +++++++++++++++++-- drivers/clk/rockchip/clk_rk3399.c | 94 ++++++++++++++++++- drivers/core/device.c | 6 ++ drivers/net/gmac_rockchip.c | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- drivers/pinctrl/rockchip/pinctrl_rk322x.c | 601 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/pinctrl/rockchip/pinctrl_rk3328.c | 388 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/pinctrl/rockchip/pinctrl_rv1108.c | 399 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/clk-uclass.h | 8 ++ include/clk.h | 28 ++++++ include/dt-bindings/clock/rk3288-cru.h | 1 + include/dt-bindings/clock/rk3328-cru.h | 6 +- 32 files changed, 2554 insertions(+), 1010 deletions(-)