From patchwork Thu Apr 25 17:34:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 255 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 926983F086 for ; Thu, 25 Apr 2019 19:35:25 +0200 (CEST) Received: by mail-pg1-f197.google.com with SMTP id z12sf199423pgs.4 for ; Thu, 25 Apr 2019 10:35:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556213724; cv=pass; d=google.com; s=arc-20160816; b=dzGp++EqjwVJpQo/I+x/pnOQhwVf1CCShYa/7O4YpJzZlptNFp2fJwWYTHK4+JBoNF gK99mWkuQ2ClVA/D/DZPnWqd2T+XwXixX9nOKa5yxhDtoHaCQFlUuvceoEgwj9cT/6DT zUBPUOIAnnVysTx6QSI85o+dBECE0jZa5e+Bc7NwvQalvRCN4b4wiYv1WCRkxgxn+q0o EQRYqV5Iyu5nJPdPXuC4yzGJZvodJKGcMtCxN7RwT5McBexlElfThDz6hpW1x98jMJPc 9kGhykFzs9IPjVjpYFKm8L4fF1+JqVjeGx8TbmOEQWSShf0bp6kgUVw2lYrcQ4VPkc4W P9HQ== 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=OOdy0kMX8LPpvb7pGaKjfuGKNt7W2jRk9hX+X3mFU8A=; b=rBJrHhTbksvbbQWl28xnRE9SaR2u4rDLYFY6u4FVoZ/LmWGGEltUV1BJd5JaJ1OtFJ 1OhWy+RLIR12TCBS1vgf6SM+eS2jF2cTq/oIFq3+ZQHNFnVq6Cxqe9efHiJQ7kV+HL3W prEm/z3FZUiEAFSxKd1uJW9gOKcKfH1hYKvuy1OhPhhNcHr8ExLwA6VPWW7j3QT0+TdT 5PJBB2TFydq/IaPi1fS2Rvtsmt62QtN4hLlrvADq9dgf4LIrpumqejE9HLevcwdZ+nnZ CkI27897612XTPXqMcGhlc1FdNfLm862vCGoHXcPV4KCwQjxptQdTvn+lrSja7yOOsCa D9Qw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aa8tQ6Ty; 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=OOdy0kMX8LPpvb7pGaKjfuGKNt7W2jRk9hX+X3mFU8A=; b=f+Lf178/zVXiUlhJV2JOiZkA3qOiaR0Q9UWf6d0yTi3a/2PuPqyRnwhi08KunHUv6Q szfqSmXMbH0yxxFs/SqHGLKHb/HOQfBu+/jwLJGpj4J5wWso8JcQmWpe3qhCeN7/0crS RSLpqHZGZVmTgU/a5MvBGxPRkQyOfTZOTKMyM= 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=OOdy0kMX8LPpvb7pGaKjfuGKNt7W2jRk9hX+X3mFU8A=; b=PTZrCRLg4oUbtHjbb0gM9wfwLoKmaA3Sunvr4+F36RSzLvFTsmtGRdmalyiayohgo5 TGowtZFqvW9D46+yKdx/qYn/CHtH27iTsasY5MvIsw/adEZF97dubdEEfgbrO4XWAyne MQOJs7RI0CBft3ROaaz3q+fxSVX7tzUC3KxU/YZquEdMkDnuCSZaoyvQqdcSzm6wnnMU atztBZGa8tejgti4URH9URHdWjxEuWE3yc6T02FExw1kOQWoXwYeL5pAf+zoFwQaxza0 R8XxgH5d+NEC9X/DZsm36yWU29GNDgVxrohSLjlc1Vh4oZZx/iYSX/704DnguTHq3Hqc Cj5A== X-Gm-Message-State: APjAAAVnebij93G3aIKNq3oDYT/PCxX+6cRz187DbJ/EP8oQgTqq5G/y MbtuKZsWx/arsICwFM+g/i877/l8 X-Google-Smtp-Source: APXvYqwpFvw1+0TJ61D+rfpgGnWjgp8DzcAiUSMKBy1tT8tmYBxfL908+EBxZx9u4QVFC0W6XSZ99Q== X-Received: by 2002:a17:902:a01:: with SMTP id 1mr40388961plo.36.1556213724349; Thu, 25 Apr 2019 10:35:24 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a65:63ca:: with SMTP id n10ls5686374pgv.10.gmail; Thu, 25 Apr 2019 10:35:24 -0700 (PDT) X-Received: by 2002:a65:424d:: with SMTP id d13mr38515789pgq.318.1556213723948; Thu, 25 Apr 2019 10:35:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556213723; cv=none; d=google.com; s=arc-20160816; b=atYVPPnpNpmv9RpxzmayzRxxuDKko3EOmO5kwvRYHEn4B7mR+60hZKIvFyOuvTIuYX B8Wjj6B8IJbpMFJwQtvKBEFBFBAw+hKlbkU3wJ7n9VeAomAhclMKQBNks+Hkfy4d+Dzz NCHJTvrG+M/9NSPaEZXWvEgXr/+ln8LfXCTbaGO2/cLXvw9Zym10TIw8wQBgXXSoqDgg Ba9ff1lU8Ca/V6m51fIW1wnBTSpTn02kOi4BJYKhSd/uYs4xm4lW0Fr6fQlW+ceyEgka wAGwRYAj32a5OXMfc/r1NAbli2FJbQgMr0k/yv53M623d+Suu/DCVrkw2Q6QvOx8VgMu bhYg== 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=lyuLvUOc+/xZX7XKjWsEBRoPwWmQiZSo0/tKk1vUqws=; b=o2zgIW93Ammubh6wSk5xLgt0EokBOsh7p45IacqbWIviOM02D4NfSxNRUU4N+A4JQI GDkcurih6mKuEmowGcu5Eo0oRsO3a8rf8VR/WYGXR7mPm1A08ZxNLrC5tYa/hoHtOxup O6dBBkDI7qghJJLp6OzCTzXh07OCpy9oYgo4VDikweW7BAhJ3GZ/DoTCm1YXkFc80iEN fKPGeAuKstaDXOYvbyIsZGryqsFLTUoKr8o7umqFpPLCRUOpEb1g+RNlBzD8KXHMr77K 27vV2g+mmFCMoa/+KnKITcVYJfj0FWBQOWX71YYDZjV+xKq8MBu3WdpXg2GPH0SA4Scn PaSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aa8tQ6Ty; 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 s6sor13252481plq.62.2019.04.25.10.35.23 for (Google Transport Security); Thu, 25 Apr 2019 10:35:23 -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:7085:: with SMTP id z5mr30821229plk.78.1556213723609; Thu, 25 Apr 2019 10:35:23 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id i3sm38265876pgl.57.2019.04.25.10.35.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 10:35:23 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH v3 09/13] rockchip: rk3399: Add Nanopi M4 board support Date: Thu, 25 Apr 2019 23:04:23 +0530 Message-Id: <20190425173427.13445-10-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190425173427.13445-1-jagan@amarulasolutions.com> References: <20190425173427.13445-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=aa8tQ6Ty; 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 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 +++++++++++++++++++++++ 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