Merge branch 'next-dev' into thunder-boot

rockchip: dts: rk3308-evb: enable crypto

Change-Id: I9cb50f7520973ffbd83cbada5555ca2aa4ec54c0
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>

Merge branch 'next-dev' into thunder-boot

dts: rk3308: add sdmmc node to support sdmmc

Change-Id: Iebf8b4c800ceaea95530c553955e727e2d76345f
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>

rockchip: rk3308-evb: Add usb host vbus regulator

RK3308 EVB use GPIO0_C5 control 5V power supply for
usb host.

Change-Id: Iafdffc7aa5114eb4909b083e2e2a98088d792b14
Signed-off-by: Andy Yan <andy.ya

rockchip: rk3308-evb: Add usb host vbus regulator

RK3308 EVB use GPIO0_C5 control 5V power supply for
usb host.

Change-Id: Iafdffc7aa5114eb4909b083e2e2a98088d792b14
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>

show more ...

ARM: dts: rk3308-evb: Add mac node support at dts level for rk3308b

Note: the default status of mac is disabled.

Change-Id: I2f3cebb03f19f16c2553579e69e8312943d7ed75
Signed-off-by: David Wu <david.

ARM: dts: rk3308-evb: Add mac node support at dts level for rk3308b

Note: the default status of mac is disabled.

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

show more ...

rockchip: rk3308: rename rk3308-evb-u-boot.dtsi to rk3308-u-boot.dtsi

follow other platforms name style, like: rkxx-u-boot.dtsi

Change-Id: Ic05c37bf49daad1c531c07f7d82abde4a485e432
Signed-off-by: J

rockchip: rk3308: rename rk3308-evb-u-boot.dtsi to rk3308-u-boot.dtsi

follow other platforms name style, like: rkxx-u-boot.dtsi

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

show more ...

rockchip: dts: rk3308: support using U-Boot usb otg

If kernel dtb is enabled but not load correctly, we
could still use U-Boot usb otg to enter rockusb mode.

Change-Id: If304fa157a7a720be7db054d3fa

rockchip: dts: rk3308: support using U-Boot usb otg

If kernel dtb is enabled but not load correctly, we
could still use U-Boot usb otg to enter rockusb mode.

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

show more ...

rockchip: dts: rk3308: 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: Id20c365729ca249171b3b8d131365e

rockchip: dts: rk3308: 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: Id20c365729ca249171b3b8d131365ed5db4fa212
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

show more ...

arm: dts: rk3308-evb: remove 'mmc-hs200-1_8v' property

Change-Id: I015b542e751db29278af8f9a485894aef8ccf9d5
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>

arm: dts: rockchip: update display node default status

if you want to enable display at uboot you need to set
the following node status to okay:

1. display_subsystem
2. route_rgb
3. vop
4. rgb
5. b

arm: dts: rockchip: update display node default status

if you want to enable display at uboot you need to set
the following node status to okay:

1. display_subsystem
2. route_rgb
3. vop
4. rgb
5. backlight
6. pwm1[depend on your hardware]
7. panel[update timing and init cmd]

Change-Id: I18b8857d49350ee870522599c9986d749b51bca0
Signed-off-by: Sandy Huang <hjc@rock-chips.com>

show more ...

arm: dts: rockchip: add display demo for rk3308 evb

Change-Id: Ie1edd2bdc10a11fbce264b6508d69bcfe567cc44
Signed-off-by: Sandy Huang <hjc@rock-chips.com>

arm: dts: rk3308: set u-boot,dm-pre-reloc for uart2

We use dt-spl.dtb for serial_init when CONFIG_USING_KERNEL_DTB
is enabled, so set the debug console uart2 on RK3308 EVB
as u-boot,dm-pre-reloc to

arm: dts: rk3308: set u-boot,dm-pre-reloc for uart2

We use dt-spl.dtb for serial_init when CONFIG_USING_KERNEL_DTB
is enabled, so set the debug console uart2 on RK3308 EVB
as u-boot,dm-pre-reloc to make sure it will builtin dt-spl.dtb.

Also move it from board dts to board-u-boot.dtsi, as it's u-boot
specific.

Change-Id: I088f7e20bb91cd3f1337b099dfccdb76fccabf1c
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>

show more ...

arm: dts: rockchip: Add recovery key support for rk3308-evb

According to the hardware, the recovery key is conected to
the saradc channel0.

Change-Id: I9a1c2c49567da612b627f54ef84fbbf9be739b95
Sign

arm: dts: rockchip: Add recovery key support for rk3308-evb

According to the hardware, the recovery key is conected to
the saradc channel0.

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

show more ...

arm: dts: rockchip: enable pwm regulator for rk3308 evb

RK3308 EVB uses pwm0 modulates the arm core voltage, so
enable pwm regulator here.

Change-Id: I8e2b88b4d947fe40835952eb2278cecbf64d293e
Signe

arm: dts: rockchip: enable pwm regulator for rk3308 evb

RK3308 EVB uses pwm0 modulates the arm core voltage, so
enable pwm regulator here.

Change-Id: I8e2b88b4d947fe40835952eb2278cecbf64d293e
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>

show more ...

arm: rockchip: rk3308: add DT of usb controller and enable usb

Add DT of DWC2 EHCI and OHCI controller and enable them.

Change-Id: Iedeeebe33f5f3e5616a43fb376e264cc2c46e40e
Signed-off-by: Meng Dong

arm: rockchip: rk3308: add DT of usb controller and enable usb

Add DT of DWC2 EHCI and OHCI controller and enable them.

Change-Id: Iedeeebe33f5f3e5616a43fb376e264cc2c46e40e
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>

show more ...

arm: rockchip: rk3308: add core dtsi

Sync these files from Linux kernel.

Change-Id: I33432a84090d4f96ba932f30a3b4f0101c5a889d
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>