Pull request: u-boot-rockchip-20200722

Hi Tom,
Please pull the rockchip updates/fixes: - New rk3326 board: Hardkernel Odroid Go2; - Update board config and dts for RockPI 4/N8/N10; - Update led boot on support for roc-rk3399-pc; - Enable SPI Flash suppor for rk3328 rock64 board; - Update rockchip pcie phy to use generic framework;
Gitlab ci: https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/4150
Thanks, - Kever
The following changes since commit 1c4b5038afcc7cdb1064713f65571da05aa0de0e:
Merge branch '2020-07-17-misc-fixes' (2020-07-17 16:08:54 -0400)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200722
for you to fetch changes up to 8bedcf0ef9404f7f04da79783ba1ab8be7185cc2:
rockchip: rock-p-n8/n10: Disable RAM_ROCKCHIP_DEBUG (2020-07-22 20:55:13 +0800)
---------------------------------------------------------------- Alex Bee (1): rockchip: sdram: fix dram_init_banksize
Heiko Stuebner (3): rockchip: px30: sync the main rk3326 dtsi from mainline rockchip: px30: sync Odroid Go Advance devicetree from Linux rockchip: board: add Hardkernel Odroid Go2 board
Jagan Teki (30): rockchip: rockpro64: Enable USB3.0 Host rockchip: rock-pi-4: Enable USB3 Host rockchip: rock-pi-4: Enable PCI/NVME rockchip: rock-pi-4: Enable USB Gadget rockchip: rock-pi-4: Enable HDMI output rockchip: roc-rk3399-pc: Enable USB Gadget rockchip: roc-rk3399-pc: Update ENV offset, size ram: rk3399: Drop debug stride in driver ram: rk3399: Mark existing prints via RAM_ROCKCHIP_DEBUG rockchip: roc-rk3399-pc: Disable RAM_ROCKCHIP_DEBUG phy: Add Rockchip PCIe PHY driver pci: rockchip: Switch to generic-phy pci: rockchip: Drop legacy PHY driver arm64: dts: rockchip: Add ROCKPi 4A/4B support arm64: dts: rockchip: Add Radxa ROCK Pi 4C support rockchip: Add rk3288 SoC detection helper rockchip: rk3288: Add OF board setup rockchip: rk3399: Add weak led_setup() rockchip: roc-rk3399-pc: Add custom led_setup() rockchip: Don't clear the reset status reg rockchip: Separate the reset cause from display cpuinfo rockchip: roc-rk3399-pc: Set LED only during POR and pwr_key=y ARM: dts: rockchip: Sync ROCKPi N8/N10 dts(i) from Linux ARM: dts: rockchip: Add usb host0 ohci node for rk3288 ARM: dts: rockchip: Add USB for RockPI N8/N10 arm: dts: rockchip: Add HDMI out for RockPI N8/N10 arm64: dts: rockchip: Add PCIe for RockPI N10 rockchip: rock-pi-n10: Enable PCI/NVME arm64: dts: rockchip: Add u-boot, spl-boot-order for ROCKPi N10 rockchip: rock-p-n8/n10: Disable RAM_ROCKCHIP_DEBUG
Johannes Krottmayer (5): drivers: clk: rockchip: clk_rk3328: Add SPI support drivers: spi: rk_spi: Add support for RK3328 ARM: dts: rk3328: Add SPI support ARM: dts: rk3328-rock64: Add SPI Flash support rockchip: rock64-rk3328_defconfig: Add SPI Flash support
Kever Yang (4): rockchip: ram: fix debug funcfion define when RAM_ROCKCHIP_DEBUG not set rockchip: rk3399: Add default env to support compressed kernel Image rockchip: firefly-rk3399: enable CONFIG_USB_DWC3 rockchip: tpl: Remove board_early_init_f()
Suniel Mahesh (4): arm: dts: rockchip: Sync rk3288 dtsi from linux rockchip: rock-pi-n10: Enable on board devices rockchip: evb_rk3288: Add console settings rockchip: rock-pi-n8: Enable on board devices
arch/arm/dts/Makefile | 7 +- arch/arm/dts/rk3288-rock-pi-n8.dts | 2 +- arch/arm/dts/rk3288-vmarc-som.dtsi | 132 ++-- arch/arm/dts/rk3288.dtsi | 17 +- arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 72 +++ arch/arm/dts/rk3326-odroid-go2.dts | 716 +++++++++++++++++++++ arch/arm/dts/rk3326.dtsi | 15 + arch/arm/dts/rk3328-rock64-u-boot.dtsi | 6 + arch/arm/dts/rk3328-u-boot.dtsi | 5 + ...{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 26 - arch/arm/dts/rk3399-rock-pi-4a.dts | 13 + arch/arm/dts/rk3399-rock-pi-4b-u-boot.dtsi | 6 + arch/arm/dts/rk3399-rock-pi-4b.dts | 42 ++ arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 6 + arch/arm/dts/rk3399-rock-pi-4c.dts | 51 ++ arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 6 + arch/arm/dts/rk3399pro-rock-pi-n10.dts | 6 +- arch/arm/dts/rk3399pro-vmarc-som.dtsi | 201 ++++-- arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi | 95 ++- arch/arm/include/asm/arch-rockchip/cpu_rk3288.h | 49 ++ arch/arm/include/asm/arch-rockchip/cru.h | 3 +- arch/arm/include/asm/arch-rockchip/sdram_common.h | 15 - arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/Makefile | 5 +- arch/arm/mach-rockchip/cpu-info.c | 26 +- arch/arm/mach-rockchip/px30/Kconfig | 4 + arch/arm/mach-rockchip/rk3288/rk3288.c | 30 + arch/arm/mach-rockchip/rk3399/rk3399.c | 6 + arch/arm/mach-rockchip/sdram.c | 6 +- arch/arm/mach-rockchip/tpl.c | 7 - board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 48 +- board/hardkernel/odroid_go2/Kconfig | 15 + board/hardkernel/odroid_go2/MAINTAINERS | 6 + board/hardkernel/odroid_go2/Makefile | 7 + board/hardkernel/odroid_go2/go2.c | 4 + board/rockchip/evb_rk3399/MAINTAINERS | 2 + configs/firefly-rk3399_defconfig | 4 +- configs/odroid-go2_defconfig | 119 ++++ configs/roc-pc-mezzanine-rk3399_defconfig | 14 +- configs/roc-pc-rk3399_defconfig | 14 +- configs/rock-pi-4-rk3399_defconfig | 20 +- configs/rock-pi-4c-rk3399_defconfig | 74 +++ configs/rock-pi-n10-rk3399pro_defconfig | 25 + configs/rock-pi-n8-rk3288_defconfig | 17 + configs/rock64-rk3328_defconfig | 2 + configs/rockpro64-rk3399_defconfig | 4 + drivers/clk/rockchip/clk_rk3328.c | 31 + drivers/pci/Kconfig | 1 + drivers/pci/Makefile | 2 +- drivers/pci/pcie_rockchip.c | 95 ++- drivers/pci/pcie_rockchip.h | 141 ---- drivers/pci/pcie_rockchip_phy.c | 205 ------ drivers/phy/rockchip/Kconfig | 7 + drivers/phy/rockchip/Makefile | 1 + drivers/phy/rockchip/phy-rockchip-pcie.c | 271 ++++++++ drivers/ram/rockchip/sdram_common.c | 13 + drivers/ram/rockchip/sdram_rk3399.c | 37 +- drivers/spi/rk_spi.c | 2 + include/configs/evb_rk3288.h | 6 +- include/configs/odroid_go2.h | 17 + include/configs/rk3399_common.h | 4 +- 61 files changed, 2177 insertions(+), 607 deletions(-) create mode 100644 arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi create mode 100644 arch/arm/dts/rk3326-odroid-go2.dts create mode 100644 arch/arm/dts/rk3326.dtsi rename arch/arm/dts/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (95%) create mode 100644 arch/arm/dts/rk3399-rock-pi-4a.dts create mode 100644 arch/arm/dts/rk3399-rock-pi-4b-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-rock-pi-4b.dts create mode 100644 arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-rock-pi-4c.dts create mode 100644 arch/arm/include/asm/arch-rockchip/cpu_rk3288.h create mode 100644 board/hardkernel/odroid_go2/Kconfig create mode 100644 board/hardkernel/odroid_go2/MAINTAINERS create mode 100644 board/hardkernel/odroid_go2/Makefile create mode 100644 board/hardkernel/odroid_go2/go2.c create mode 100644 configs/odroid-go2_defconfig create mode 100644 configs/rock-pi-4c-rk3399_defconfig delete mode 100644 drivers/pci/pcie_rockchip.h delete mode 100644 drivers/pci/pcie_rockchip_phy.c create mode 100644 drivers/phy/rockchip/phy-rockchip-pcie.c create mode 100644 include/configs/odroid_go2.h

On Wed, Jul 22, 2020 at 09:06:19PM +0800, Kever Yang wrote:
Hi Tom,
Please pull the rockchip updates/fixes:
- New rk3326 board: Hardkernel Odroid Go2;
- Update board config and dts for RockPI 4/N8/N10;
- Update led boot on support for roc-rk3399-pc;
- Enable SPI Flash suppor for rk3328 rock64 board;
- Update rockchip pcie phy to use generic framework;
Gitlab ci: https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/4150
Thanks,
- Kever
The following changes since commit 1c4b5038afcc7cdb1064713f65571da05aa0de0e:
Merge branch '2020-07-17-misc-fixes' (2020-07-17 16:08:54 -0400)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200722
for you to fetch changes up to 8bedcf0ef9404f7f04da79783ba1ab8be7185cc2:
rockchip: rock-p-n8/n10: Disable RAM_ROCKCHIP_DEBUG (2020-07-22 20:55:13 +0800)
Applied to u-boot/master, thanks!
participants (2)
-
Kever Yang
-
Tom Rini