From patchwork Fri Apr 26 15:49:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 277 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id BA0133F089 for ; Fri, 26 Apr 2019 17:51:29 +0200 (CEST) Received: by mail-pg1-f198.google.com with SMTP id 33sf2301058pgv.17 for ; Fri, 26 Apr 2019 08:51:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556293888; cv=pass; d=google.com; s=arc-20160816; b=DLcK4mUFOwTiNek/SH2sENDmBcMflhNY+mLUZ0vEpsWt3Ut6a9TF5l7pUKm8Cn2XY6 ISntEYX0T5S/cnTlt5HGYEkcrbNu9fhWVtd8iMvsX2jcqQ3JM+FvIvs+pWKOhx9/oC9W P7XfxD5Ndyhs4cuc5LyxmP4vlm0srs3uLKVyPl/yDiwlPHSZJfR+vhZuSyJVH92+EQLp 6WqwauL7/utOtqUwpiAKIoKBc/z2+ydWvQPLvTgbZgA7YhtcJnWpAi2L6NUE/gGz55rC wa4CAPiaCP7+hWqBYNYv23DL/vU8dlp4v9ijY49TyEy/kj6j1jkU27IB49C5fWkBxLQT u9pg== 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=IBeiWea4kV8FPprab0Mv2deNCclvV7Lk0qDUoOMMyrM=; b=lXVojQgiaM7HQFpoe7O/2WZs/P3i/vVxi7bztgB2wnDsmKFKaOC/k+KpAvMGy0E0Sv uTfx6XAoEEbwKUGiNOPGNMHD7uknLiPspKaoi71T76rLpsy4hulzt9uSRF22Us9UEtDv Q5JCPt1bb489oyKSPqi4kSdjG2hgQdfu0UceAJvhpK6wfScBGxhnK8UI6GGraPtl9Ri0 FjSf8wUmZJnMe9My6dbff3fH1iXs9lrT5zLAZBxMYEdS0X4GvWdkRkhhLt2EaQcet0eb LPRw2kHifMm57hbcsi8uD60ATCpntCuJy6WH5Sq554+bxDQSWbEm7+Se3X1biqSYASmB fZxA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ksr+CTci; 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=IBeiWea4kV8FPprab0Mv2deNCclvV7Lk0qDUoOMMyrM=; b=gLcrJkyJFkUUijMg0mOS8bOPeZI+60v/8HTkxvI2XcuCAf9mUrS1zvi1Hkwgbt1/j3 O3ieZhvILGLGX8TZT7aFVrXAHpaU9X2mXulK6o/CalUWH5CENWiBK9xGwWF5TjXCNXXk p+RJhG2HXz6h9yvhijKUD6lBJD/YX5eQiod7M= 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=IBeiWea4kV8FPprab0Mv2deNCclvV7Lk0qDUoOMMyrM=; b=h3C1qiIpHt/yo2FUh2QjFk+LS+qTMkXlIMeR3w+NAUCYPIm1H9rXtysSx17lGlg6VK 5hAcva94xPstPg65cNLhLfDydA3MjwRsscK52VSPH7kJnkxNAaW3OV/WERDQIrm7+rpb 2ffPBqKbV7ZEpxYfXB2DZXpMApZo6uWChwxw6Vhf8iIY6ap2deJNSiGwbFuJ7D8ZndGN bTQbpHlm+3BX9SNgCslJE95/ucoOnlh/F8F34Plbi0gXVzq4yUoJTymklqdTpBB2K7N6 /RpuK725WeL2TA/HTXUP0wVNZfFmAgSzekgq6Obp5wVBjczjd/lKIo7EMJzs4iyQiMDO gHPA== X-Gm-Message-State: APjAAAXKT7rCzPYUhwnmwHVrZERM4kR3DYzMWnOWkI936IaR/mwckuOB gKeHkjyVQbZU18vETuhsfho72e6z X-Google-Smtp-Source: APXvYqxSygDBoED6rbeeOfXckW5wKuqNvs/OpRAVVg69SpEG1up3DJWvwBieeeN/XF4NmdKKRJnDYQ== X-Received: by 2002:a17:902:6f17:: with SMTP id w23mr26333007plk.29.1556293888559; Fri, 26 Apr 2019 08:51:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:e316:: with SMTP id g22ls570067pfh.2.gmail; Fri, 26 Apr 2019 08:51:28 -0700 (PDT) X-Received: by 2002:a63:2c06:: with SMTP id s6mr44515242pgs.245.1556293888142; Fri, 26 Apr 2019 08:51:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556293888; cv=none; d=google.com; s=arc-20160816; b=vxx5aG7b5Oa7JvozCpPrOn0mBQLwv1cEMBokqr+yoL+Buo8p91xv9vUJQbxNf2LFro aMcD97CMSLk9bLEXlx5ErtFslBhS1g5WSj9N9FFZTx7EsRfcQ81rCiVtMfsfQpMvpRrq cl3wo6sRBLGirk/pgDHBG8oMSiHG1tbiYumfOA1I+nmskxWkaMTVIuRr2qgw78ugZgt3 h8PasUy3f7I08XItmMTcpSwmcosCGyXizfdm3mIFydAAi+F4CZdUayme0eLa5zvuqJr3 RIhezjAP/SYEPvBBEDBd2KwPrflIywjmDtxK+4sLNg6/SKQfmBg6cA0a3sfmKcs7qTes GXXg== 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=ZXFAljlEy7uZEEw89sZcsNEtB/E342lPRBYoTVsd/Qo=; b=AIg3Iegvv+K2OvAPFgt/eLmEN/HNUJe9iByfKYqwCLiL6PDDv7IbFba2l0a3t+8UcL juo2oOX9+Q9wZgfu4BtZ3EpebHyRFqLFKQSHxHKuDC+8Pq0Wx4TKGMMWoUbsEArwqyjX 74jIQsuIm9OZnerAd5vv3cd0gUlU/99B44ZNWt+epbP/yRDokz1/OnWwxWL71bDIjq4N Ec5oXqBxYujTwU1nm5yUb94VVpJi3dZ6802C1i7r0TLUfLyCpYHYLAX50o7Gh9DS7Zcd hACdKe9Rf+I60Te1gN/66xZ8dRjJDepGzXR75wcTqtcaDKnDnbvsY6MIOAKVntYKIduB HdTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ksr+CTci; 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 d4sor29323263pfn.43.2019.04.26.08.51.28 for (Google Transport Security); Fri, 26 Apr 2019 08:51:28 -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:a62:70c6:: with SMTP id l189mr47827011pfc.139.1556293887838; Fri, 26 Apr 2019 08:51:27 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id e4sm12019017pfn.185.2019.04.26.08.51.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 08:51:27 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH v4 09/13] rockchip: rk3399: Add Nanopi M4 board support Date: Fri, 26 Apr 2019 21:19:56 +0530 Message-Id: <20190426154956.29567-10-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190426154956.29567-1-jagan@amarulasolutions.com> References: <20190426154956.29567-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=ksr+CTci; 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 Nanopi M4 board. Specification - Rockchip RK3399 - Dual-Channel 4GB LPDDR3-1866 - SD card slot - eMMC socket - RTL8211E 1Gbps - AP6356S WiFI/BT - HDMI In/Out, DP, MIPI DSI/CSI - USB 3.0 x4 - USB Type C power and data - GPIO1, GPIO2 expansion ports - DC5V/3A Commit details of rk3399-nanopi-m4.dts sync from Linux 5.1-rc2: "arm64: dts: rockchip: Refine nanopi4 differences" (sha1: c62ffaf5026d0b7633e62b2cea8450b5543c349a) Signed-off-by: Jagan Teki Reviewed-by: Kever Yang Reviewed-by: Philipp Tomsich --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi | 7 +++ arch/arm/dts/rk3399-nanopi-m4.dts | 66 +++++++++++++++++++++++ arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 2 + board/rockchip/evb_rk3399/MAINTAINERS | 6 +++ configs/nanopi-m4-rk3399_defconfig | 58 ++++++++++++++++++++ 6 files changed, 140 insertions(+) create mode 100644 arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi-m4.dts create mode 100644 configs/nanopi-m4-rk3399_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 6d55b0caf8..d2ac26b556 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-nanopi-m4.dtb \ rk3399-orangepi.dtb \ rk3399-puma-ddr1333.dtb \ rk3399-puma-ddr1600.dtb \ diff --git a/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi new file mode 100644 index 0000000000..17201bcf41 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-nanopi4-u-boot.dtsi" +#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" diff --git a/arch/arm/dts/rk3399-nanopi-m4.dts b/arch/arm/dts/rk3399-nanopi-m4.dts new file mode 100644 index 0000000000..60358ab8c7 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-m4.dts @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * FriendlyElec NanoPi M4 board device tree source + * + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com) + * + * Copyright (c) 2018 Collabora Ltd. + * Copyright (c) 2019 Arm Ltd. + */ + +/dts-v1/; +#include "rk3399-nanopi4.dtsi" + +/ { + model = "FriendlyElec NanoPi M4"; + compatible = "friendlyarm,nanopi-m4", "rockchip,rk3399"; + + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-name = "vdd_5v"; + regulator-always-on; + regulator-boot-on; + }; + + vcc5v0_core: vcc5v0-core { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_core"; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vdd_5v>; + }; + + vcc5v0_usb1: vcc5v0-usb1 { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_usb1"; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vcc5v0_sys>; + }; + + vcc5v0_usb2: vcc5v0-usb2 { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_usb2"; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&vcc3v3_sys { + vin-supply = <&vcc5v0_core>; +}; + +&u2phy0_host { + phy-supply = <&vcc5v0_usb1>; +}; + +&u2phy1_host { + phy-supply = <&vcc5v0_usb2>; +}; + +&vbus_typec { + regulator-always-on; + vin-supply = <&vdd_5v>; +}; diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi index 20db99c0b8..05708b6f55 100644 --- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright (C) 2019 Jagan Teki */ +#include "rk3399-u-boot.dtsi" + &sdmmc { pinctrl-names = "default"; pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_cd>; diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index 07ee8ce92c..ae43805a6a 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 +NANOPI-M4 +M: Jagan Teki +S: Maintained +F: configs/nanopi-m4-rk3399_defconfig +F: arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi + ORANGEPI-RK3399 M: Jagan Teki S: Maintained diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig new file mode 100644 index 0000000000..be36a28315 --- /dev/null +++ b/configs/nanopi-m4-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-nanopi-m4.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-nanopi-m4" +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