From patchwork Tue Apr 16 10:56:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 222 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C973E3F0A0 for ; Tue, 16 Apr 2019 12:57:35 +0200 (CEST) Received: by mail-pg1-f200.google.com with SMTP id 132sf12287565pgc.18 for ; Tue, 16 Apr 2019 03:57:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1555412254; cv=pass; d=google.com; s=arc-20160816; b=s/qbG8zVnW03Oi+R5/SdZJ2Azfx7DetPVbjiui4isY42CJhHJTHEUq7MDexqw8w+A5 rUvZ1azx7Q8NaGljhegSH38ZlPlHjzWAoigMZ8mCeN8g+lQFg27gSmWLA02O1+eEA3qw XRaXNrnQnWQxWu541hQoYKcvuWnn67rC0z5oPIG9KCxgyK78/kzNoj8lAkRVcXDwKRyZ cjAsN0SYIFb92i8738Lvn2j3Eirs0Lpp59HTImYtGSihTM103BIE/Qj3xcG/UEWsDmJv 095EjpQhJsoXqE1pHBUAkRz8fsnRoR0UFBrEHE+z28TEmf5JtY5VWHXYk3nHs4JAhuVo OG0g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=lJaCPrx9QZ8WMp9WvXSR1bSe2QR2MgBDEgMCwhbWnsM=; b=vs7gAgoA4HNYNsx0I3jgccfqW82ytBx9fN88b30jVLIPhNk+pSEm6XGU/jjhg5zkMZ La28XOTYGMQWx/TUss8Ok3uWzj3ehOozunDnA4KFyyqwjWgWyyH/9yf84aqx8uBnCt8q a4LWfnzPXxm6MGnb0bfqwHnom90j54puJ7o/5s9EIUicPUYH61zWhfOBvNcAMYw4HFrv EGwRpsf4yG0bR7VGZ2V/bsiGNI6kmOQCXL2mus+q54c8QsWcgLe/PtsBmt4KourPoglR 4KaIw9EsYLwJGxjkqj1+bBEd/Lt4arXHo3VhVnjbSwCet6qskLLQQcCyoJrkV7GdBVYL KQ1Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TFMIl9vX; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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 :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=lJaCPrx9QZ8WMp9WvXSR1bSe2QR2MgBDEgMCwhbWnsM=; b=QGybIQp4r+WYZuU34ec0wBXioIgEybdVLS4of+dKhAxboDUQ+rEhl6CLfImh+37co0 xEd29/pvlB5k/U5i6mtZqxep/yyVzO15xsX9Ke6Ecam4OOu3nyjQyy4beZB4w6BGxuN7 smE3WZ3Aj6ipgQU4BNUUNwlxyl+5OYXAPohHE= 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:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=lJaCPrx9QZ8WMp9WvXSR1bSe2QR2MgBDEgMCwhbWnsM=; b=lbMlNhfbrh01d7FLfBvVuh5OMQZOZyqCc3gKIxn/QxB3w6ZYeFFIKzyqXFdp1MypQ/ b/1mOh0kaStjI2QENZuyva0f3g0oL+5XnpOb9/TOP+e+Df5Pq7NNaSb7F6Ur5CAD2jYC KldttUUYC8g8yeHe3TtUT6B2ufe0YqVrKKtCijTrrQoaQJso5Ua2AXbbYu2lBY9cYn+i j8FJUyi9yspYnhtLd5acSTEfch77qY2Fshtv1y/J/ma8lnEVP+IXyTGbj2/trmalbifE 25gQ9sb/sBtqolh9VrbTwzUolvwcM8kCpZa8DcUzh17WOX2v3TnhoIZHFHig1pYZR3Y8 gE9w== X-Gm-Message-State: APjAAAUmjF1yjBx3UKxRzs9rp6mTQaduz+MAW/UzWEKKjz1mVC6zG6EE jIglLPHqgJU9R1VoHhcSHr2lWSYQ X-Google-Smtp-Source: APXvYqzQy/CctoHKDZAj0msCYXcCRK0I3Ndhp4slCB/GLOYnj5Q8m364AD05m0uenjxABHhTQk6gPQ== X-Received: by 2002:a17:902:10e:: with SMTP id 14mr1540387plb.56.1555412254610; Tue, 16 Apr 2019 03:57:34 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:868e:: with SMTP id d14ls5752486pfo.2.gmail; Tue, 16 Apr 2019 03:57:34 -0700 (PDT) X-Received: by 2002:a62:e80f:: with SMTP id c15mr81563042pfi.93.1555412254229; Tue, 16 Apr 2019 03:57:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555412254; cv=none; d=google.com; s=arc-20160816; b=r6UtjwN8J3VFynWpSEwUN1MV9ZCAcWzpvv3+U7YA5NnACPqtOxQEEgBACyue/tVUcQ 2uwTBlx19gSvk3QoHQH16rQ76V9fLLa/gCioIzXz5DwWOaN7SYFkdP2tYexR3AkGVJRJ W4tskqcypFBVu5Sxy/tL5Vr9gD9TBFktQbSpCgZJtIfaW3pv7QKWZI56LuyS6Ue3hded DggJmON4xGc3hgafxMkDqo9VG3eFJjfJ5eqfXzyJPAP7A3LeAgcY3SflsBgSfXLsyUOI t1rLkLu1Lf9p8TPK1PklHy16dftxtIViI9TmI4uhKlDyxu0f73pcKO5EfwbHpoSQPUTI SNjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=u/a+38M+R6+6JFyZ0nIsOjeCjmjnLuUfLS+Q8PHx5mg=; b=PeEgY75dbW/Q12j+OxCSSii1nF5Ijy94eZ0AN/2kMZxVjE+hW8OM58PGqGAjvAIXES 1hW4rtEbQHyHfCav0nnTQY89Tg2A4B3FtgW5aDeOOSdeltGTwbL4G+cEHpOnOg1kiPWh UN7xTkJslwFxF5rWO0U5Db6rHIr8dVsrvLdByUbrx/dtHJ16LHP7UVJfHxuE607DapQ+ xAc7SSacqwAFhHna9H678VNzYBl2Gyny60cFy5kP+eZ0zY42rjK9v06Osogsfdy12a6+ KDBq6DoLmGSZCvOUl1tfSK0BBzc3L5viPTWPIqAOGNdg2UEWp4ytAGcBzVhGYRiDAtPS e43Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TFMIl9vX; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j13sor56208799pgq.53.2019.04.16.03.57.34 for (Google Transport Security); Tue, 16 Apr 2019 03:57:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:6a42:: with SMTP id f63mr74574969pgc.207.1555412253892; Tue, 16 Apr 2019 03:57:33 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id x24sm70368953pfn.128.2019.04.16.03.57.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 03:57:33 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH v2 11/14] rockchip: rk3399: Add Nanopc T4 board support Date: Tue, 16 Apr 2019 16:26:44 +0530 Message-Id: <20190416105647.18437-12-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190416105647.18437-1-jagan@amarulasolutions.com> References: <20190416105647.18437-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TFMIl9vX; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add initial support for Nanopc T4 board. Specification - Rockchip RK3399 - Dual-Channel 4GB LPDDR3-1866 - SD card slot - 16GB eMMC - RTL8211E 1Gbps - AP6356S WiFI/BT - 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 Commit details of rk3399-nanopc-t4.dts sync from Linux 5.1-rc2: "arm64: dts: rockchip: Add NanoPC-T4 IR receiver" (sha1: 95658e21b1707ad7844f873db2fdaa295109a5a3) Signed-off-by: Jagan Teki --- Note: Hardware on the way, since it shared same DDR with Nanopi M4 I'm confident it will boot. arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi | 7 ++ arch/arm/dts/rk3399-nanopc-t4.dts | 91 +++++++++++++++++++++++ board/rockchip/evb_rk3399/MAINTAINERS | 6 ++ configs/nanopc-t4-rk3399_defconfig | 58 +++++++++++++++ 5 files changed, 163 insertions(+) create mode 100644 arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopc-t4.dts create mode 100644 configs/nanopc-t4-rk3399_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index d2ac26b556..e048565bb6 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -87,6 +87,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3399-evb.dtb \ rk3399-firefly.dtb \ rk3399-gru-bob.dtb \ + rk3399-nanopc-t4.dtb \ rk3399-nanopi-m4.dtb \ rk3399-orangepi.dtb \ rk3399-puma-ddr1333.dtb \ diff --git a/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi new file mode 100644 index 0000000000..1173d496ec --- /dev/null +++ b/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-u-boot.dtsi" +#include "rk3399-sdram-lpddr3-4GB-1866.dtsi" diff --git a/arch/arm/dts/rk3399-nanopc-t4.dts b/arch/arm/dts/rk3399-nanopc-t4.dts new file mode 100644 index 0000000000..84433cf02b --- /dev/null +++ b/arch/arm/dts/rk3399-nanopc-t4.dts @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * FriendlyElec NanoPC-T4 board device tree source + * + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com) + * + * Copyright (c) 2018 Collabora Ltd. + */ + +/dts-v1/; +#include "rk3399-nanopi4.dtsi" + +/ { + model = "FriendlyElec NanoPC-T4"; + compatible = "friendlyarm,nanopc-t4", "rockchip,rk3399"; + + vcc12v0_sys: vcc12v0-sys { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <12000000>; + regulator-min-microvolt = <12000000>; + regulator-name = "vcc12v0_sys"; + }; + + vcc5v0_host0: vcc5v0-host0 { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-name = "vcc5v0_host0"; + vin-supply = <&vcc5v0_sys>; + }; + + adc-keys { + compatible = "adc-keys"; + io-channels = <&saradc 1>; + io-channel-names = "buttons"; + keyup-threshold-microvolt = <1800000>; + poll-interval = <100>; + + recovery { + label = "Recovery"; + linux,code = ; + press-threshold-microvolt = <18000>; + }; + }; + + ir-receiver { + compatible = "gpio-ir-receiver"; + gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&ir_rx>; + }; +}; + +&pinctrl { + ir { + ir_rx: ir-rx { + /* external pullup to VCC3V3_SYS, despite being 1.8V :/ */ + rockchip,pins = <0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>; + }; + }; +}; + +&sdhci { + mmc-hs400-1_8v; + mmc-hs400-enhanced-strobe; +}; + +&u2phy0_host { + phy-supply = <&vcc5v0_host0>; +}; + +&u2phy1_host { + phy-supply = <&vcc5v0_host0>; +}; + +&vcc5v0_sys { + vin-supply = <&vcc12v0_sys>; +}; + +&vcc3v3_sys { + vin-supply = <&vcc12v0_sys>; +}; + +&vbus_typec { + enable-active-high; + gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; + vin-supply = <&vcc5v0_sys>; +}; diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index ae43805a6a..5917abb9c1 100644 --- a/board/rockchip/evb_rk3399/MAINTAINERS +++ b/board/rockchip/evb_rk3399/MAINTAINERS @@ -6,6 +6,12 @@ F: include/configs/evb_rk3399.h F: configs/evb-rk3399_defconfig F: configs/firefly-rk3399_defconfig +NANOPC-T4 +M: Jagan Teki +S: Maintained +F: configs/nanopic-t4-rk3399_defconfig +F: arch/arm/dts/rk3399-nanopic-t4-u-boot.dtsi + NANOPI-M4 M: Jagan Teki S: Maintained diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig new file mode 100644 index 0000000000..7ba4f85485 --- /dev/null +++ b/configs/nanopc-t4-rk3399_defconfig @@ -0,0 +1,58 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_ROCKCHIP_RK3399=y +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000 +CONFIG_DEBUG_UART_BASE=0xFF1A0000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_STACK_R_ADDR=0x80000 +CONFIG_DEBUG_UART=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopc-t4.dtb" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TIME=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopc-t4" +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_ASIX88179=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_USE_TINY_PRINTF=y +CONFIG_ERRNO_STR=y