From patchwork Sat Nov 9 19:24:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 1192494 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z/plBuSs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 479RtK6xvqz9sNT for ; Sun, 10 Nov 2019 06:25:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A3880C21DA1; Sat, 9 Nov 2019 19:25:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C28E0C21C4A; Sat, 9 Nov 2019 19:25:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 167EBC21C4A; Sat, 9 Nov 2019 19:25:07 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id 7252BC21C38 for ; Sat, 9 Nov 2019 19:25:06 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id q22so6355121pgk.2 for ; Sat, 09 Nov 2019 11:25:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=y3itnt8GJFnkzIe9UrBA8lgj9SaTQhtrg/UCclblW5w=; b=Z/plBuSs3pQOm6J5CLcg1OPV3oR7tW4chLa2tigaeOvJZOxAJ3l60UaPB4MEjl4s/9 +/9jAvMRlOfHuiQhWyYkOjWhssBRaHNRgcN09MF18OSEirwtwmuiuS612tHAdkOGDGBw vGa16XuurrI3KqNgg6TfS+iylhqcz0auMawj1GvPrvja0ZEo7SxFtJapPdK1d3VaQMsH 7xT13ZAZlgH8qGTOIuFGEZjQHQo6/PKTDgahZE5P0B2ClnDdGT0Myi8tM+kF9VHbbgAK H7NR7qT26HX0DKIgmBSdvbEW5TN/2Nk04zezzeKUQdSJaS1VHL2nEZgZXTDk4I9/ZCx/ kwYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=y3itnt8GJFnkzIe9UrBA8lgj9SaTQhtrg/UCclblW5w=; b=qT+8SC3CZVBaD+ljR2y9f3QLwiublQzuaozXQhnh1w4j1aqnOy2n1LcuiGa4Zr5WID BrGwTtHK7EYmh/0F5yIIG4VfdrrZj5kXUxUbAtd8DeQq9V6S+Qg4AgdcTUtNDjyBWv9m IViVcjSjo+W2SvkN1SCnhw53FSmBMG0oiLcwHXTSoe0JdhthTXX+wD3uhLNjfE7a+SsD KQif4Lb6EdhEKl07EA85j6pdfVgJk7/s6kEXYyNpWXeRHX6JgXYKSQOyKNFElCcrJc2k lb2b60hcrpfSBGardHuL3k2KIgcDTEOkNnK9JwWXkzzIteYkejS3B9T5LsKheHuHJIa9 kHoA== X-Gm-Message-State: APjAAAWu+Lxgq7Z+slBBBVmSZKHpu1RIzMRKtv5zycsMQ7hzTi7AAfiQ HZNVL9KlcmeRB65EhWu1kxg= X-Google-Smtp-Source: APXvYqxB40drhj6PZlYU7pqis6DbPPDytkaoIgrq+UixeK469TWm27bAO2V8aqp09YnI2/fK+YEhUA== X-Received: by 2002:a63:5f04:: with SMTP id t4mr17108617pgb.73.1573327504618; Sat, 09 Nov 2019 11:25:04 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-213-236.dyn.novuscom.net. [216.71.213.236]) by smtp.gmail.com with ESMTPSA id r68sm10752097pfr.78.2019.11.09.11.25.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 11:25:02 -0800 (PST) From: Vasily Khoruzhick To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Jagan Teki , Manivannan Sadhasivam , u-boot@lists.denx.de Date: Sat, 9 Nov 2019 11:24:50 -0800 Message-Id: <20191109192450.2307135-1-anarsoul@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2] rockchip: rk3399: split rockpro64 out of evb_rk3399 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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. Signed-off-by: Vasily Khoruzhick Reviewed-by: Kever Yang --- v2: add missing include/configs/rockpro64_rk3399.h 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 + include/configs/rockpro64_rk3399.h | 15 +++++ 8 files changed, 121 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 create mode 100644 include/configs/rockpro64_rk3399.h 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" + help + Rockro64 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/2A + endchoice 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 +M: Jagan Teki +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 + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#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 S: Maintained F: configs/rock-pi-4-rk3399_defconfig F: arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi - -ROCKPRO64 -M: Akash Gajjar -M: Jagan Teki -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 8a4542de00..d20b597d91 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 diff --git a/include/configs/rockpro64_rk3399.h b/include/configs/rockpro64_rk3399.h new file mode 100644 index 0000000000..5f52c1e4f6 --- /dev/null +++ b/include/configs/rockpro64_rk3399.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2019 Vasily Khoruzhick + */ + +#ifndef __ROCKPRO64_RK3399_H +#define __ROCKPRO64_RK3399_H + +#include + +#define CONFIG_SYS_MMC_ENV_DEV 0 + +#define SDRAM_BANK_SIZE (2UL << 30) + +#endif