Merge branch 'next-dev' into thunder-boot

Change-Id: I22ac688008080eac49169d752a94b66668f890fc

Conflicts:
drivers/phy/Kconfig
drivers/phy/Makefile

ARM: dts: rockchip: amend dwc3 nodes to keep in line with kernel

We have changed to use dwc3 generic driver for Rockchip SoCs,
so let amend dts to fix it and keep in line with Linux Kernel.

Change-

ARM: dts: rockchip: amend dwc3 nodes to keep in line with kernel

We have changed to use dwc3 generic driver for Rockchip SoCs,
so let amend dts to fix it and keep in line with Linux Kernel.

Change-Id: Iddf114d6a36f9651fd9b222b25ac7c9040629e22
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

show more ...

rockchip: dts: rk3399: add and enable crypto node

Change-Id: I63866f6f63e331e7c2722399f9a1621c55a7590a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

rockchip: dts: rk3399-evb: rename key node

Use different name for the volume up key node, dm framework
can't support the same device node since kernel dtb is enabled.

Change-Id: Ia99c9b8fd46fea6394

rockchip: dts: rk3399-evb: rename key node

Use different name for the volume up key node, dm framework
can't support the same device node since kernel dtb is enabled.

Change-Id: Ia99c9b8fd46fea63949f9d06072c0ebec0e76a46
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

show more ...

rockchip: dts: rk3399: add rk3399pro evb board recovery key

Change-Id: I5fe5a5532e7a6d47209ac38774497575b9c3072a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

rockchip: dts: rk3399: move dm-pre-reloc nodes to *-u-boot.dtsi

it makes users easy to override their kernel dts when
CONFIG_USING_KERNEL_DTB is disabled.

Change-Id: Ifd6cab36dc03da767b7bb768a872e4

rockchip: dts: rk3399: move dm-pre-reloc nodes to *-u-boot.dtsi

it makes users easy to override their kernel dts when
CONFIG_USING_KERNEL_DTB is disabled.

Change-Id: Ifd6cab36dc03da767b7bb768a872e43264bed532
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

show more ...

rockchip: dts: rk3399-evb: fix the vcc5v0_host regulator

The vcc5v0_host regulator is used for USB Host Vbus control
on rk3399-evb. Set both the "regulator-min-microvolt" and
"regulator-max-microvol

rockchip: dts: rk3399-evb: fix the vcc5v0_host regulator

The vcc5v0_host regulator is used for USB Host Vbus control
on rk3399-evb. Set both the "regulator-min-microvolt" and
"regulator-max-microvolt" to 5000000 for the vcc5v0_host,
and enable it when boot.

Change-Id: Ia77e99b1b2dfa9876d7c5739f683952a8fc44c09
Signed-off-by: William Wu <william.wu@rock-chips.com>

show more ...

rockchip: dts: update rk3399 drm display node

This has been test in rk3399-execavator board with edp panel.

Change-Id: I6ad5176c305883a037f6571623b5f6f754a8f6c1
Signed-off-by: Kever Yang <kever.yan

rockchip: dts: update rk3399 drm display node

This has been test in rk3399-execavator board with edp panel.

Change-Id: I6ad5176c305883a037f6571623b5f6f754a8f6c1
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: dts: rk3399 use -u-boot.dtsi for rk3399

Move u-boot config into rk3399-u-boot.dtsi

Change-Id: Ia3cb1ecc379c62f2e071947e308e29038bfffbea
Signed-off-by: Kever Yang <kever.yang@rock-chips.co

rockchip: dts: rk3399 use -u-boot.dtsi for rk3399

Move u-boot config into rk3399-u-boot.dtsi

Change-Id: Ia3cb1ecc379c62f2e071947e308e29038bfffbea
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: dts: rk3399: disable pmic/vop in pre-reloc

We do not enable pmic and vop in pre-reloc, so we don't use
then in SPL and pre-reloc stage in U-Boot with kernel dtb enabled.

Change-Id: I33890

rockchip: dts: rk3399: disable pmic/vop in pre-reloc

We do not enable pmic and vop in pre-reloc, so we don't use
then in SPL and pre-reloc stage in U-Boot with kernel dtb enabled.

Change-Id: I3389069c117996864d2d030bfc5443e91f02314e
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: dts: rk3399-evb: Change the tx/rx delay value for transmission quality

Give the mac controller the correct tx-delay and rx-delay value
for the rgmii mode transmission. If they are not matc

rockchip: dts: rk3399-evb: Change the tx/rx delay value for transmission quality

Give the mac controller the correct tx-delay and rx-delay value
for the rgmii mode transmission. If they are not matched, there
would be Ethernet packets lost, the net feature may not work.

Change-Id: I4ff6bd47fe75ff6b480de45df2e0e4e611e3950d
Signed-off-by: David Wu <david.wu@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

show more ...

rockchip: rk3399-evb: add boot order for SPL

add boot order for rk3399 evb/excavator/sapphire borad.

Change-Id: I97c17a96e2a79fc3cc2b97f1a2b23bfb4e35c6a4
Signed-off-by: Kever Yang <kever.yang@rock-

rockchip: rk3399-evb: add boot order for SPL

add boot order for rk3399 evb/excavator/sapphire borad.

Change-Id: I97c17a96e2a79fc3cc2b97f1a2b23bfb4e35c6a4
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: dts: Enable SARADC for rk3399-evb

Enable the SARADC for download key pressed detect.

Change-Id: Ia74bafb3c1e92570bc385102288831b934e53598
Signed-off-by: David Wu <david.wu@rock-chips.com>

rockchip: dts: Enable SARADC for rk3399-evb

Enable the SARADC for download key pressed detect.

Change-Id: Ia74bafb3c1e92570bc385102288831b934e53598
Signed-off-by: David Wu <david.wu@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
(cherry picked from commit 3b4cab15acd83aa468e809a300797253d8f66818)

show more ...

Merge branch 'master' of git://git.denx.de/u-boot-rockchip

rockchip: dts: rk3399-evb: remove redundant gmac node

There are two same gmac node, remove one.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Rev

rockchip: dts: rk3399-evb: remove redundant gmac node

There are two same gmac node, remove one.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

show more ...

Merge branch 'master' of git://git.denx.de/u-boot-rockchip

rockchip: dts: rk3399: control vbus of typec by fixed regulator

Add fixed regulator for the port of typec0 and typec1 to control vbus
instead of gpio.

Signed-off-by: Meng Dongyang <daniel.meng@rock

rockchip: dts: rk3399: control vbus of typec by fixed regulator

Add fixed regulator for the port of typec0 and typec1 to control vbus
instead of gpio.

Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

show more ...

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

This adds a new firefly-rk3399 board, MIPI support for rk3399 and
rk3288, rk818 pmic support, mkimage improvements for rockchip and a few
other things.

rockchip: dts: Add mipi dsi support for rk3399

Add dts config for mipi display, include vop, mipi controller, panel, backlight
. And Enable rk808 for lcd_3v3 in another patch.

Signed-off-by: Eric G

rockchip: dts: Add mipi dsi support for rk3399

Add dts config for mipi display, include vop, mipi controller, panel, backlight
. And Enable rk808 for lcd_3v3 in another patch.

Signed-off-by: Eric Gao <eric.gao@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

show more ...

rockchip: dts: evb-rk3399: add gmac support

Enable gmac for evb-rk3399.

Change-Id: I85e35667e08e22e38577e63eb0e65731fc9c69b6
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

rockchip: dts: evb-rk3399: correct pwm3 polarity

The pwm3 on evb-rk3399 is used for pwm regulator, need to invert
the polarity to make it work correctly.

Signed-off-by: Kever Yang <kever.yang@rock-

rockchip: dts: evb-rk3399: correct pwm3 polarity

The pwm3 on evb-rk3399 is used for pwm regulator, need to invert
the polarity to make it work correctly.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>

show more ...

Merge branch 'master' of git://git.denx.de/u-boot

Signed-off-by: Stefano Babic <sbabic@denx.de>

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

rockchip: pmic: Enable RK808 for rk3399 evb

For using mipi display, we need to enable lcd3v3
which supplied by rk808,so enable rk808 first.

Signed-off-by: Eric Gao <eric.gao@rock-chips.com>
Acked-b

rockchip: pmic: Enable RK808 for rk3399 evb

For using mipi display, we need to enable lcd3v3
which supplied by rk808,so enable rk808 first.

Signed-off-by: Eric Gao <eric.gao@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>

show more ...

dts: rk3399: move rockchip, vbus-gpio properties into board-specific files

The (shared) rk3399.dtsi had defined the 'rockchip,vbus-gpio'
properties for each USB 3.0 controller.

As the GPIO usage wi

dts: rk3399: move rockchip, vbus-gpio properties into board-specific files

The (shared) rk3399.dtsi had defined the 'rockchip,vbus-gpio'
properties for each USB 3.0 controller.

As the GPIO usage will vary (e.g. one of those GPIOs shuts down one of
the regulators on the RK3399-Q7) between boards, we move this from the
shared dtsi into the device tree file for the EVB board which these
GPIO definitions match.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Simon Glass <sjg@chromium.org>

show more ...