From patchwork Tue Apr 16 10:56:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 221 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 BB0E13F0A0 for ; Tue, 16 Apr 2019 12:57:32 +0200 (CEST) Received: by mail-pg1-f198.google.com with SMTP id x2sf12305892pge.16 for ; Tue, 16 Apr 2019 03:57:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1555412251; cv=pass; d=google.com; s=arc-20160816; b=f/CEnRYG5hnlsPR4JrzRztJpsRsCqZ/eYoquOF45uzT3VtfWenzYKHR8RE4mLDUDbx O1hUufXkw4Lk26pmMoXEYkJlwI0daEwqhj+pJ793IpBR8UtI0MqmyBiFg0W/clNVj7Nf DCmxbtmwKoQWLDuxckfHIAlxP4YOhKVU7C2rYH0mrmfS3xUCza/iFYeTinKOpr6o4nx/ xtpQ/Kld71QuoPdpMPH6/8MhVEmcLXj1STG1B7ekNE2fB1a/EvusZRhuZfQAySXnyzbG bQ7Wj3W3RGXO1Xl+86knIur0W6CQWRZh43jiC+sT3cdCEkBeLmOF6AqblNT0YJMhVj+W XJPw== 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=L9lZPnZD7PoNF3+76G0qEG5S2P/gGooErxw/Rx9563M=; b=a2xHMhp01bODVmyNZ5HZ1H/8ZiFEeF+rzIWc5ZpZK79bFI+3tF0QXDEcyKPbwElMJM ZXRH2mCjXkKElEG62w2q2phPVTsRcIgeg9p45rZ+7kehHxweYOx0CiMgjOoeJuZ5pWbW +KgE7RZMqbw8dWAIahxY7rw3m3qlntoN6GMa4bNaLWy+eVfnGEMweD8yQJ41P5Qq2L8a 1mP4PzmX590jr7JwkDzipnpRtJJKa8QWc9SGTQJPXg5M6n/iLfCkAw89AO8mynF4TeDE n/LvUI9Zyw4gm6ZPdbDyAdGUHX0YA4z8ox4+EXjU59+i5fJP0qCvpZc+fBb9WUwM09uE 1wPw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=gRdshZnk; 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=L9lZPnZD7PoNF3+76G0qEG5S2P/gGooErxw/Rx9563M=; b=Gsjs4YWhzdzg8xXXdlf0wkAoPwl1WXfotuRvM6kmCoDWFiBUo7y/v38LQGCgJhoSuI bHHwPAFzhPFhSeyGY8xHL6ahbTn/Ymr/ldxhDj44r92uT0yOIdFNptsZkHYivGzZuWXu QEflOGabf9XsHnIN24XGS9FY9o+1LiOgzHNSw= 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=L9lZPnZD7PoNF3+76G0qEG5S2P/gGooErxw/Rx9563M=; b=N7IUTKh8226IAWMbl0fOP7mFT8e5UP0JI5lH6Lm4tihBZXER6pZGwENkilb4CXEL2w 5ZUPR9LLVjnjX4aOt9eRJKYGOMXplCH0VSJRKltdyFg0dFaBuPYoG7q0deBla6S4cF2y gpBgMNtL1NsQ/9/yQLioAU6VNaWbZRojmwUqyKh4V8gobaLEFpgoEADLlNC4MMsqJbG9 buh6YGbuCVVQaGOJaKe1v2GogY6kjSwYdN2emG0kTaqnj2eWotTAFC8suECvXx3YMrBe 5IL3vivOwMgFVw23Po1vDtlHcbHhlKzuEPzaLZ7rsBK2jWPOlEKXWpZBA3n5HLYHz87c DG2A== X-Gm-Message-State: APjAAAWwZbwXvUjcVoCfrRwGrQG3CSwNssL0/fAOyO6+qmd/jd3NWXIU WIhefiq76SBqjk92i4IPZuSZKXY2 X-Google-Smtp-Source: APXvYqy+gzyHW4ixdk/0f7ZPXubRLpKld4r8qXy/kE3bAHcrb/Ea0w0+9Z/KEv6nkkz7RXBsf1FQdg== X-Received: by 2002:a63:f14f:: with SMTP id o15mr1636352pgk.67.1555412251560; Tue, 16 Apr 2019 03:57:31 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:9347:: with SMTP id g7ls5760146plp.7.gmail; Tue, 16 Apr 2019 03:57:31 -0700 (PDT) X-Received: by 2002:a17:902:8483:: with SMTP id c3mr64913182plo.19.1555412251165; Tue, 16 Apr 2019 03:57:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555412251; cv=none; d=google.com; s=arc-20160816; b=wLY2QXnhwR6vOKW9HHT1K80S46UvA5EXGjOTY55wTGFGYEtRQxFDAs2JAftFUc3A6p ZcS9q11zIU1KPA1Gjp6Neh6dCORIxbxJFu85wfdxf2iz+Wsjg/rjKmwfeL/Kgyr1wMVD AHOH7wkbJ1VWqtSNDqYvPoJ/kSWhF+5eQPFGseiIc3K75pgNA0FuBgFNKIX/CCyvTT+s IS+CCRAXt3LB/XnFSWAa67cCagW99/E/XQHiq0Bf3Ee5a+UtLsjiqFiV4yAnP6Jc85ol FUX5/WbLyt/6inCNgLio1kFkVc4xnsXx+kRzvsi3jefjHb59ZYyAw64pen8DkMPznxgl dzhQ== 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=lK92erQvGaI4z6mNfvoMPlBV4h+9rWdIbOclt1lHh3U=; b=t0kXE3xYdE98yIBk12GIs9Qx5mkW2a0t8R+Zb59/58CE0QUM347NGu8Nu0WbB2sUZW TFACupIOeo955XgY6MtTHZwTEsWi0F4qRX0Ocn8fhryxfjn4lU82yxtyz46tYusL9Rw3 zXXY0GFQdiJD6vJMUC/ivecBWzNqATG6KipV2wAPHl7te92QUOxTQV4DS6pZ6OpST3mm pkduymfmOl5MFqUfL3C1rkJn1C+rXI4D8sWWEAkgxiDEq05hWdXiTRUbGB9uY5cfFoGf zG8GAu1jdHN+bAA9GAVdGNMcogVljPb49zbtR7L8giM+/K4I8d/sa8IQj6GHmO0WF30R nBpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=gRdshZnk; 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 cj12sor68123519plb.70.2019.04.16.03.57.31 for (Google Transport Security); Tue, 16 Apr 2019 03:57:31 -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:a17:902:ec0c:: with SMTP id cy12mr59626915plb.291.1555412250858; Tue, 16 Apr 2019 03:57:30 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id x24sm70368953pfn.128.2019.04.16.03.57.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 03:57:30 -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 10/14] rockchip: rk3399: Add Nanopi M4 board support Date: Tue, 16 Apr 2019 16:26:43 +0530 Message-Id: <20190416105647.18437-11-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=gRdshZnk; 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: Paul Kocialkowski --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi | 7 +++ arch/arm/dts/rk3399-nanopi-m4.dts | 66 +++++++++++++++++++++++ board/rockchip/evb_rk3399/MAINTAINERS | 6 +++ configs/nanopi-m4-rk3399_defconfig | 58 ++++++++++++++++++++ 5 files changed, 138 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..1173d496ec --- /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-u-boot.dtsi" +#include "rk3399-sdram-lpddr3-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/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