From patchwork Sun Nov 10 12:57:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 1192566 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="r3AcXqBh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 479vF33Cl4z9sP6 for ; Sun, 10 Nov 2019 23:57:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 278B4C21DD7; Sun, 10 Nov 2019 12:57:45 +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=RCVD_IN_MSPIKE_H2, 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 50887C21C4A; Sun, 10 Nov 2019 12:57:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EB186C21C4A; Sun, 10 Nov 2019 12:57:42 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 9CDF5C21C2C for ; Sun, 10 Nov 2019 12:57:42 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id c17so10592480wmk.2 for ; Sun, 10 Nov 2019 04:57:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=9qnHAt4+O/pbqIMO+u3LikdZzcF9gWu4QDHoUa/L8Lw=; b=r3AcXqBhBlpFkZJ1J28E7FKb3UIy7RhCsgNuZHsXmuO0HYWG3+PIxpjBQv+XeViOQA nXfCCuanLPQoIUnDRMreWy2LUEREvO0ZsXl9zt2YOTDfdrow/fhSeH+FMD1+D2fz+x0l ou9PHNtfYPEZ0Pxw9++dQaO6WwNhCzfFwRUZ4= 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; bh=9qnHAt4+O/pbqIMO+u3LikdZzcF9gWu4QDHoUa/L8Lw=; b=Kf/tRhRlNpZzNeMwDCXM5nqXFsHXiHWecX/KgxkoXVy9Hkj4ZGNUPgfBuoe/IhwSbA 3Hk4DEG+G0pstV1AEnwdYC5vYSHMKc7rhwIdSnc6Mg+Fnnb+biAMc2GuSff4DiRy3KGm 9S6r8oy/pXytPf7dVcixaK1PsxdQnBv14aWBEbSf+HhaSjPb3pjkyXtqCyObUVmIARqF pxJffEqSstx5VMP2T5n+wEQ5zvwhwlb8qslsHNp6ksU8xZmbtURlEhLvQ5IjsZ9akDbx p8zQK8gLqRAjstI/U2ZC7SpVzE/LM/HrxllNSts/l3zB5jQAN+jzz0iS37qjfqI/CZTk ANSw== X-Gm-Message-State: APjAAAULRB04VxBlXZYPXFeBEtEDs9wafmZsaP+oeIMpYK+hI6xOjLvm WtUQUxmUbShipXzQSFeUJQ0hFw== X-Google-Smtp-Source: APXvYqxI3W32nqV4KNtHBCriL3S98Q4d2tIbV6xJQomCs2ekFRUWzW/YCwy4utbkMvF0mtB5VzYMXA== X-Received: by 2002:a1c:a4c5:: with SMTP id n188mr16009049wme.30.1573390661784; Sun, 10 Nov 2019 04:57:41 -0800 (PST) Received: from localhost.localdomain ([2a02:8308:25c0:a400:f525:cccd:1e6a:6e09]) by smtp.gmail.com with ESMTPSA id f140sm16730245wme.21.2019.11.10.04.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2019 04:57:40 -0800 (PST) From: Michael Trimarchi To: Kever Yang Date: Sun, 10 Nov 2019 13:57:38 +0100 Message-Id: <20191110125739.20926-1-michael@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 Cc: u-boot@lists.denx.de, David Wu Subject: [U-Boot] [PATCH 1/2] rockchip: dts: tinker: Move u-boot dmc initialization to specific section 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" dmc is used to initialize the memory controller. It's needed by u-boot. Move it in the specific section Signed-off-by: Michael Trimarchi Reviewed-by: Kever Yang --- arch/arm/dts/rk3288-tinker-u-boot.dtsi | 12 ++++++++++++ arch/arm/dts/rk3288-tinker.dts | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi index f7f9d6dc72..732aa4f91f 100644 --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi @@ -5,6 +5,18 @@ #include "rk3288-u-boot.dtsi" +&dmc { + u-boot,dm-pre-reloc; + rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d + 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 + 0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0 + 0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4 + 0x8 0x1f4>; + rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076 + 0x0 0xc3 0x6 0x2>; + rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; +}; + &pinctrl { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts index 94c3afe860..4b8405fd82 100644 --- a/arch/arm/dts/rk3288-tinker.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -15,18 +15,6 @@ }; }; -&dmc { - rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d - 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 - 0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0 - 0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4 - 0x8 0x1f4>; - rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076 - 0x0 0xc3 0x6 0x2>; - rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; -}; - - &pinctrl { usb { host_vbus_drv: host-vbus-drv { From patchwork Sun Nov 10 12:57:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 1192567 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="nwpXgLWM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 479vFJ4f8Hz9sP6 for ; Sun, 10 Nov 2019 23:58:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 55DBAC21CB1; Sun, 10 Nov 2019 12:57:56 +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=RCVD_IN_MSPIKE_H2, 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 D373CC21C4A; Sun, 10 Nov 2019 12:57:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 930EBC21C4A; Sun, 10 Nov 2019 12:57:43 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 473FBC21C2C for ; Sun, 10 Nov 2019 12:57:43 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id f2so11707081wrs.11 for ; Sun, 10 Nov 2019 04:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uuxyFIipyDGCBBPqK6WhoVO5zDgBARgWaNMKWbj/BKI=; b=nwpXgLWMddNIREmo/KrJcqp5sZEb/7fNBZkCnjncS06Hf886/mVsTMG2B708T8XmcE /4lXY5vjWMeIA/NG54s+4YEnAwu+IMUp4JIjmNCC1W2XbM/GT05vxot3RrEi4SOos6lI sxTp+6Hj1CS2d2Pqp4NehVkt7cTV6Y+FChHBM= 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:in-reply-to :references; bh=uuxyFIipyDGCBBPqK6WhoVO5zDgBARgWaNMKWbj/BKI=; b=kusQx9WpQkLRYJ0FblyF/EepVss6/P6OxumkH1pEXT6/7xnIu3eQEDn09VlKGOIhFb 5zoTrHJuf9rf7GJKednGpNtRAMyPLHWe6K02aWrTxrNh06CzuRt5hhxhjAM9BS+nV2Dg BLijELA0mYuBDietqyFa7DI4rnr0/TfmdKXAAbMPijTcauTMcXOZwNUM0POP7ptqhYvg bE68XRPHBAMeLJeiM5mc4EDiO8kgwG394exDGMmVFeGNR6pLW1qBs8qQNe4uuc6JGPsq WgK3jS2gbZ2SG0loUlvXlm1NU1gT+GDqyB+A/QIllX1D+smDaFSOB5z5z56OQCi++cw3 v3wg== X-Gm-Message-State: APjAAAUAu0aSION6oku+9qYZWwbEz8ET4cviFlWBXomvFfu0p6DgNRa8 Q1U2rBzh+cvNNvZ6fkAzpt5R8A== X-Google-Smtp-Source: APXvYqw2bOd+HwkFhoBJ0bYAC2lwmdtTqfUkjgLTN3LYTRRSq8uflbl71KiqQhfUxOBzegbkVvZoXg== X-Received: by 2002:adf:ecca:: with SMTP id s10mr5118993wro.22.1573390662579; Sun, 10 Nov 2019 04:57:42 -0800 (PST) Received: from localhost.localdomain ([2a02:8308:25c0:a400:f525:cccd:1e6a:6e09]) by smtp.gmail.com with ESMTPSA id f140sm16730245wme.21.2019.11.10.04.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2019 04:57:42 -0800 (PST) From: Michael Trimarchi To: Kever Yang Date: Sun, 10 Nov 2019 13:57:39 +0100 Message-Id: <20191110125739.20926-2-michael@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191110125739.20926-1-michael@amarulasolutions.com> References: <20191110125739.20926-1-michael@amarulasolutions.com> Cc: u-boot@lists.denx.de, David Wu Subject: [U-Boot] [PATCH 2/2] rockchip: dts: tinker: Add tinker-s board support 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Support tinker-s board. The board is equivalent of tinker board except of emmc. TODO: - support of usb current burst when the board is powered from pc Signed-off-by: Michael Trimarchi Reviewed-by: Kever Yang --- Changes: v2->v3: drop dmc section v1->v2: Add boot configuration for emmc --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3288-tinker-s-u-boot.dtsi | 34 ++++++++ arch/arm/dts/rk3288-tinker-s.dts | 29 +++++++ configs/tinker-s-rk3288_defconfig | 99 ++++++++++++++++++++++++ include/configs/tinker_rk3288.h | 1 + 5 files changed, 164 insertions(+) create mode 100644 arch/arm/dts/rk3288-tinker-s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3288-tinker-s.dts create mode 100644 configs/tinker-s-rk3288_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 89ab8001ce..7e9d6809ea 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -87,6 +87,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \ rk3288-popmetal.dtb \ rk3288-rock2-square.dtb \ rk3288-tinker.dtb \ + rk3288-tinker-s.dtb \ rk3288-veyron-jerry.dtb \ rk3288-veyron-mickey.dtb \ rk3288-veyron-minnie.dtb \ diff --git a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi new file mode 100644 index 0000000000..a177fca73a --- /dev/null +++ b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Amarula Solutions SRO + */ + +#include "rk3288-u-boot.dtsi" +#include "rk3288-tinker-u-boot.dtsi" + +/ { + chosen { + u-boot,spl-boot-order = \ + "same-as-spl", &sdmmc, &emmc; + }; +}; + +&emmc { + u-boot,dm-spl; +}; + +&emmc_clk { + u-boot,dm-spl; +}; + +&emmc_cmd { + u-boot,dm-spl; +}; + +&emmc_pwr { + u-boot,dm-spl; +}; + +&emmc_bus8 { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/rk3288-tinker-s.dts b/arch/arm/dts/rk3288-tinker-s.dts new file mode 100644 index 0000000000..cc7ac5f881 --- /dev/null +++ b/arch/arm/dts/rk3288-tinker-s.dts @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. + */ + +/dts-v1/; + +#include "rk3288-tinker.dtsi" + +/ { + model = "Rockchip RK3288 Asus Tinker Board S"; + compatible = "asus,rk3288-tinker-s", "rockchip,rk3288"; + + chosen { + stdout-path = &uart2; + }; +}; + +&emmc { + bus-width = <8>; + cap-mmc-highspeed; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>; + max-frequency = <150000000>; + mmc-hs200-1_8v; + mmc-ddr-1_8v; + status = "okay"; +}; diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig new file mode 100644 index 0000000000..c851a93f31 --- /dev/null +++ b/configs/tinker-s-rk3288_defconfig @@ -0,0 +1,99 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_ROCKCHIP_RK3288=y +CONFIG_TARGET_TINKER_RK3288=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_SPL_SIZE_LIMIT=307200 +CONFIG_SPL_STACK_R_ADDR=0x800000 +CONFIG_DEBUG_UART_BASE=0xff690000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART=y +CONFIG_TPL_SYS_MALLOC_F_LEN=0x4000 +CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000 +CONFIG_SYS_MALLOC_F_LEN=0x4000 +# CONFIG_ANDROID_BOOT_IMAGE is not set +CONFIG_USE_PREBOOT=y +CONFIG_SILENT_CONSOLE=y +CONFIG_CONSOLE_MUX=y +CONFIG_DEFAULT_FDT_FILE="rk3288-tinker-s.dtb" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x300000 +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_BMP=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker-s" +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_REGMAP=y +CONFIG_SPL_REGMAP=y +CONFIG_SYSCON=y +CONFIG_SPL_SYSCON=y +# CONFIG_SPL_SIMPLE_BUS is not set +CONFIG_CLK=y +CONFIG_SPL_CLK=y +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_SPI_FLASH=y +CONFIG_SF_DEFAULT_SPEED=20000000 +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y +CONFIG_SPL_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_SPL_DM_REGULATOR_FIXED=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM=y +CONFIG_SPL_RAM=y +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_DWC2=y +CONFIG_ROCKCHIP_USB2_PHY=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Rockchip" +CONFIG_USB_GADGET_VENDOR_NUM=0x2207 +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_CMD_DHRYSTONE=y +CONFIG_ERRNO_STR=y +CONFIG_DM_VIDEO=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y +CONFIG_CONSOLE_SCROLL_LINES=10 diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h index 5adae68c91..f8a55a2cec 100644 --- a/include/configs/tinker_rk3288.h +++ b/include/configs/tinker_rk3288.h @@ -12,6 +12,7 @@ #undef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(USB, usb, 0) \ func(PXE, pxe, na) \