On Sat, Nov 9, 2019 at 12:41 AM Vasily Khoruzhick anarsoul@gmail.com wrote:
rockpro64 needs to setup I/O domains in order for USB to work in u-boot. Since we currently don't have a driver to do that, split it into its own board file and initialize I/O domains here.
Please discard this patch, I forgot to git add one file. Will send v2 shortly.
Signed-off-by: Vasily Khoruzhick anarsoul@gmail.com
arch/arm/mach-rockchip/rk3399/Kconfig | 20 +++++++ board/pine64/rockpro64_rk3399/Kconfig | 15 +++++ board/pine64/rockpro64_rk3399/MAINTAINERS | 8 +++ board/pine64/rockpro64_rk3399/Makefile | 7 +++ .../rockpro64_rk3399/rockpro64-rk3399.c | 55 +++++++++++++++++++ board/rockchip/evb_rk3399/MAINTAINERS | 7 --- configs/rockpro64-rk3399_defconfig | 1 + 7 files changed, 106 insertions(+), 7 deletions(-) create mode 100644 board/pine64/rockpro64_rk3399/Kconfig create mode 100644 board/pine64/rockpro64_rk3399/MAINTAINERS create mode 100644 board/pine64/rockpro64_rk3399/Makefile create mode 100644 board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index 6660d05349..db67440c11 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -62,6 +62,25 @@ config TARGET_CHROMEBOOK_BOB display. It includes a Chrome OS EC (Cortex-M3) to provide access to the keyboard and battery functions.
+config TARGET_ROCKPRO64_RK3399
bool "Pine64 Rockpro64 board"helpRockro64 is SBC produced by Pine64. Key features:* Rockchip RK3399* 2/4GB Dual-Channel LPDDR3* SD card slot* eMMC socket* 128Mb SPI Flash* Gigabit ethernet* PCIe 4X slot* WiFI/BT module socket* HDMI In/Out, DP, MIPI DSI/CSI, eDP* USB 3.0, 2.0* USB Type C power and data* GPIO expansion ports* DC 12V/2Aendchoice
config ROCKCHIP_BOOT_MODE_REG @@ -95,5 +114,6 @@ source "board/rockchip/evb_rk3399/Kconfig" source "board/theobroma-systems/puma_rk3399/Kconfig" source "board/vamrs/rock960_rk3399/Kconfig" source "board/google/gru/Kconfig" +source "board/pine64/rockpro64_rk3399/Kconfig"
endif diff --git a/board/pine64/rockpro64_rk3399/Kconfig b/board/pine64/rockpro64_rk3399/Kconfig new file mode 100644 index 0000000000..3353f1fd09 --- /dev/null +++ b/board/pine64/rockpro64_rk3399/Kconfig @@ -0,0 +1,15 @@ +if TARGET_ROCKPRO64_RK3399
+config SYS_BOARD
default "rockpro64_rk3399"+config SYS_VENDOR
default "pine64"+config SYS_CONFIG_NAME
default "rockpro64_rk3399"+config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y+endif diff --git a/board/pine64/rockpro64_rk3399/MAINTAINERS b/board/pine64/rockpro64_rk3399/MAINTAINERS new file mode 100644 index 0000000000..303db144aa --- /dev/null +++ b/board/pine64/rockpro64_rk3399/MAINTAINERS @@ -0,0 +1,8 @@ +ROCKPRO64 +M: Akash Gajjar akash@openedev.com +M: Jagan Teki jagan@amarulasolutions.com +S: Maintained +F: board/pine64/rockpro64_rk3399 +F: include/configs/rockpro64_rk3399.h +F: arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +F: configs/rockpro64-rk3399_defconfig diff --git a/board/pine64/rockpro64_rk3399/Makefile b/board/pine64/rockpro64_rk3399/Makefile new file mode 100644 index 0000000000..b015c47e6f --- /dev/null +++ b/board/pine64/rockpro64_rk3399/Makefile @@ -0,0 +1,7 @@ +# +# (C) Copyright 2019 Vasily Khoruzhick +# +# SPDX-License-Identifier: GPL-2.0+ +#
+obj-y += rockpro64-rk3399.o diff --git a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c new file mode 100644 index 0000000000..3f60235771 --- /dev/null +++ b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- (C) Copyright 2019 Vasily Khoruzhick anarsoul@gmail.com
- */
+#include <common.h> +#include <dm.h> +#include <syscon.h> +#include <asm/io.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3399.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/misc.h>
+#define GRF_IO_VSEL_BT565_SHIFT 0 +#define PMUGRF_CON0_VSEL_SHIFT 8
+#ifdef CONFIG_MISC_INIT_R +static void setup_iodomain(void) +{
struct rk3399_grf_regs *grf =syscon_get_first_range(ROCKCHIP_SYSCON_GRF);struct rk3399_pmugrf_regs *pmugrf =syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);/* BT565 is in 1.8v domain */rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT);/* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL */rk_setreg(&pmugrf->soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT);+}
+int misc_init_r(void) +{
const u32 cpuid_offset = 0x7;const u32 cpuid_length = 0x10;u8 cpuid[cpuid_length];int ret;setup_iodomain();ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid);if (ret)return ret;ret = rockchip_cpuid_set(cpuid, cpuid_length);if (ret)return ret;ret = rockchip_setup_macaddr();return ret;+}
+#endif diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index f8299d9460..5e1b2cf80f 100644 --- a/board/rockchip/evb_rk3399/MAINTAINERS +++ b/board/rockchip/evb_rk3399/MAINTAINERS @@ -61,10 +61,3 @@ M: Jagan Teki jagan@amarulasolutions.com S: Maintained F: configs/rock-pi-4-rk3399_defconfig F: arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
-ROCKPRO64 -M: Akash Gajjar akash@openedev.com -M: Jagan Teki jagan@amarulasolutions.com -S: Maintained -F: configs/rockpro64-rk3399_defconfig -F: arch/arm/dts/rk3399-rockpro64-u-boot.dtsi diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index 22b8bc503b..06504b2a6e 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_ROCKCHIP_RK3399=y +CONFIG_TARGET_ROCKPRO64_RK3399=y CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL_STACK_R_ADDR=0x80000 -- 2.23.0