From patchwork Fri Apr 26 15:49:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 268 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 E1A523F089 for ; Fri, 26 Apr 2019 17:50:51 +0200 (CEST) Received: by mail-pg1-f197.google.com with SMTP id u191sf2339599pgc.0 for ; Fri, 26 Apr 2019 08:50:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556293850; cv=pass; d=google.com; s=arc-20160816; b=CAy1V+En640+0Cr6136kfXhD8XRY1girG7Rb8kZrFoQeg4kE9RbZAWyGpSloK1wY0Q k/E8Wze/Ln+gSZnahnT34ErhA2AIgwxOG8A7hDYnUg6Y/U4B3AiWw9iAEjawP8XcEDNH yRBlgYQF6996po+c+vU0p3fB22yH7LswekFkIorSRAZHmQmp/4jSnom+nIMeAlRGowgr wZ5P6iYypv8+3Seh1HGPAIeatc726xZYWDvpeLojXv+4f2TzzL04eWRcoFMZjXdv4lEM C2+CW+FJM+SYJ80OLImnE72X6YE6yG8Br6kUz3vi5+gUUOXF2TTsipZMMJsn+LhKl9Ps puSw== 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=UiV8Dbeo/lwLW6JUjb7buul12W58doGX53QwgUo8K84=; b=m2PUYOoVD0amVuJvV/qwjbjt0WzfWdqRRONdZ5hkp9v3ZOe6srt5ddvATa0ldEK+99 QzSS2gAMQaXrISWYDsIICzIjEg4S6EIY67B6BI7L3GnX29P0rCiHUc9DuzhHffo2MOUe KzqyHOaU6Pl1p0ntnIlqiSVRWeBCLUH6iNTIGourVvHr+hKX9/sEdZOE6Go/sxJ8diQX bx9/xF0APlJFtG7MIQaC1GlU7/ZT2ERL67L3tWhqd1DrtLfBawU5T6YCNDzJGo6CK+zi 1i7Khi3Llstwv9wVK33MPFw3gVsfw6PGXoL7lFI0fAFg/z7GZiEZixUG9F0UCEro5gtT idpA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=gkZ2PT3F; 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=UiV8Dbeo/lwLW6JUjb7buul12W58doGX53QwgUo8K84=; b=nDRA7CCP2ZWujxP+vkNSr1/umYlIrtBj3VosGX5hLcCBIGJm7DhaXGK2ycO55N2Acm svqCO1xtCqVbLdlt66yedQJpmJbDyhvnOogPF3Knh1D5J7w2nL486NktljRCJ8QNtYyj LCpknKcCITh59Dq6ehEWlT2OrNVagNHvOMEMs= 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=UiV8Dbeo/lwLW6JUjb7buul12W58doGX53QwgUo8K84=; b=Sp76o1uR1iKusoW2m2lMgIdq3jE4Wos+uJPhpHZmMRNSohMY0PIq3QZwbxKU/29mfb mDBoxRBf47TT9dbJ8WG0xtEF+TcHWehKdO8o4inA62lnZgFC19G64iik4TsXNb1CQUHb wBAQ2LQq9LwPYK567tTWtBImEN0SKsyRVM5WFzRenAoVgMCUZJokonB9ByZX9GmyJLsJ nOSa+pMDx0kZnrR5LR0AfXa6uJF3OKpX/l3OUF8MNlxncYWR8QXRSo5LATbt2wAEWya2 hRG6aBwVkpu1pPk36cJM/PjFL3TTgXjGPm0/m/Sc5FhYLxIS6hcAfY4dWVZcXqdHNhCs MwrA== X-Gm-Message-State: APjAAAWiWzDzB5K5ZUWsRUiLv0HIR7uolsaE7psp+RE13AYRO1aKvB9y QpbOpnKj69UHxeb7I7rbaBzT9pCr X-Google-Smtp-Source: APXvYqxZFKpPH1jg+0WUEJkCA+yKEX9UF+AqMzlvqE/Vyf9RPwwhuGQSbgKXhEnh+FS1+ubwHIRoDA== X-Received: by 2002:a17:902:3324:: with SMTP id a33mr47014628plc.186.1556293850249; Fri, 26 Apr 2019 08:50:50 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a65:63ca:: with SMTP id n10ls6468334pgv.10.gmail; Fri, 26 Apr 2019 08:50:50 -0700 (PDT) X-Received: by 2002:a63:dd10:: with SMTP id t16mr44535354pgg.446.1556293849873; Fri, 26 Apr 2019 08:50:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556293849; cv=none; d=google.com; s=arc-20160816; b=Ja82wyB8+FAa9APZNc9hWOwTIyeDqTDJ6CLnJ0Gq1xLpA2MrpSm5IpGKnmx9pJmU9M 5wKzSp4oEoEgTtfPuleh8bXYKoJRsg2yAQQ66tto/054M00BpI5HoqULAqDhXxsKMZFn SVYwWsGeZ1++AhHTbWowmzbqt4JdsGMPp3oYOZ4H+jnFCZdpJrvRDS8vVOdNirHVAOcI fMXo/TEEF777Awt9zePPs3y/dM5qMdGvXF2a1oyDGv2uoKMrtskYSFmOl71XJcqaOEkT xEXOXsvpdgR4js0hKQZ3eYlRzNPYeFQUqMMsbFB5fOAyIRsEI3mHwQ0j7vZf3s8Eqw4n lK+w== 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=O3bG+INuCjmpEYs1ECoxq1L4ykkDt1tFGXrxUMr+vmM=; b=09Dk4WDMnYuQwNpc+4v08dJ4zrHx/vmptAR94LdJYUsDGYfQOgdJSyBF/QZG6aGSg8 4vyZoBGuHVtaLMg5f5JwWlWj+DqPD03bs4E07gGfnvCtxghjwq6EzzApDIWVjacEDs+P oHsQGdqYIh/wS9uZCGbUf+FR0yJT6GvmTpbTALEHYWRjOZ1uizHFwbpndUywIYhyKPl7 0UQHPcAx5HHc+l0heNyefqOTZBhwQuL7OAq9yIo25x7As2o2UB4rEmWTwNReE0elmtmy ObTLyhg/BNpOUe0FwE1lNOSO4JTyU4dvSuFjV7wsHql+/yIUbK0kVCVGhWvPVsvtkjiA aDbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=gkZ2PT3F; 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 22sor1000756pfo.32.2019.04.26.08.50.49 for (Google Transport Security); Fri, 26 Apr 2019 08:50:49 -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:1c13:: with SMTP id c19mr46633254pfc.11.1556293849569; Fri, 26 Apr 2019 08:50:49 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id e4sm12019017pfn.185.2019.04.26.08.50.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 08:50:48 -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 01/13] rockchip: dts: rk3399: Sync rk3399-opp from Linux Date: Fri, 26 Apr 2019 21:19:48 +0530 Message-Id: <20190426154956.29567-2-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=gkZ2PT3F; 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: , Sync rk3399-opp.dtsi from Linux. Linux commit details about the rk3399-opp.dtsi sync: "arm64: dts: rockchip: use SPDX-License-Identifier" (sha1: 4ee99cebd486238ac433da823b95cc5f8d8a6905) Signed-off-by: Jagan Teki Reviewed-by: Paul Kocialkowski --- arch/arm/dts/rk3399-opp.dtsi | 133 +++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 arch/arm/dts/rk3399-opp.dtsi diff --git a/arch/arm/dts/rk3399-opp.dtsi b/arch/arm/dts/rk3399-opp.dtsi new file mode 100644 index 0000000000..d6f1095abb --- /dev/null +++ b/arch/arm/dts/rk3399-opp.dtsi @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd + */ + +/ { + cluster0_opp: opp-table0 { + compatible = "operating-points-v2"; + opp-shared; + + opp00 { + opp-hz = /bits/ 64 <408000000>; + opp-microvolt = <800000>; + clock-latency-ns = <40000>; + }; + opp01 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt = <800000>; + }; + opp02 { + opp-hz = /bits/ 64 <816000000>; + opp-microvolt = <850000>; + }; + opp03 { + opp-hz = /bits/ 64 <1008000000>; + opp-microvolt = <925000>; + }; + opp04 { + opp-hz = /bits/ 64 <1200000000>; + opp-microvolt = <1000000>; + }; + opp05 { + opp-hz = /bits/ 64 <1416000000>; + opp-microvolt = <1125000>; + }; + }; + + cluster1_opp: opp-table1 { + compatible = "operating-points-v2"; + opp-shared; + + opp00 { + opp-hz = /bits/ 64 <408000000>; + opp-microvolt = <800000>; + clock-latency-ns = <40000>; + }; + opp01 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt = <800000>; + }; + opp02 { + opp-hz = /bits/ 64 <816000000>; + opp-microvolt = <825000>; + }; + opp03 { + opp-hz = /bits/ 64 <1008000000>; + opp-microvolt = <875000>; + }; + opp04 { + opp-hz = /bits/ 64 <1200000000>; + opp-microvolt = <950000>; + }; + opp05 { + opp-hz = /bits/ 64 <1416000000>; + opp-microvolt = <1025000>; + }; + opp06 { + opp-hz = /bits/ 64 <1608000000>; + opp-microvolt = <1100000>; + }; + opp07 { + opp-hz = /bits/ 64 <1800000000>; + opp-microvolt = <1200000>; + }; + }; + + gpu_opp_table: opp-table2 { + compatible = "operating-points-v2"; + + opp00 { + opp-hz = /bits/ 64 <200000000>; + opp-microvolt = <800000>; + }; + opp01 { + opp-hz = /bits/ 64 <297000000>; + opp-microvolt = <800000>; + }; + opp02 { + opp-hz = /bits/ 64 <400000000>; + opp-microvolt = <825000>; + }; + opp03 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <875000>; + }; + opp04 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt = <925000>; + }; + opp05 { + opp-hz = /bits/ 64 <800000000>; + opp-microvolt = <1100000>; + }; + }; +}; + +&cpu_l0 { + operating-points-v2 = <&cluster0_opp>; +}; + +&cpu_l1 { + operating-points-v2 = <&cluster0_opp>; +}; + +&cpu_l2 { + operating-points-v2 = <&cluster0_opp>; +}; + +&cpu_l3 { + operating-points-v2 = <&cluster0_opp>; +}; + +&cpu_b0 { + operating-points-v2 = <&cluster1_opp>; +}; + +&cpu_b1 { + operating-points-v2 = <&cluster1_opp>; +}; + +&gpu { + operating-points-v2 = <&gpu_opp_table>; +}; From patchwork Fri Apr 26 15:49:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 270 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 051C23F089 for ; Fri, 26 Apr 2019 17:50:56 +0200 (CEST) Received: by mail-pg1-f198.google.com with SMTP id m35sf2327681pgl.6 for ; Fri, 26 Apr 2019 08:50:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556293854; cv=pass; d=google.com; s=arc-20160816; b=JWpdZvqXicy2AYTcT2r2F3KvFoZLhk0RVxImk6MMZ7SLDcvwwxlTUqgEG58ry8JzJe WnMi2WPvQPnG+nrpLdAQOWNZt3HyhaYzY+9dw7kEQNuXq50feaew/zjX5ZWsl1WKeq1s ADJx1SPWYP7/dGph8zzhEyFoZUJG37H1UGKnW8a4WYURSnbahqCBsagAQSw/ta9sS4Md VNbtrlDewIxktdi29NZ2IkkZzv+5OLRjdA9R+IaUO7zG14WZ0N7lM2gXuBSBHJqWp+ah ps88875+dJcnZKyPD4XtZGJRmMNyZEHffNzUeJUgvzVDIg0GdM7MNRB5Izyv6V0ZrqU+ Y7WQ== 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=4DO5wdxd7QIBvJ4cd0hz5es7ExEvEwNOySW6yKK04uM=; b=IE0rp4hPfVLz/NEufgCMdtbLG3VRd4KFdZABfPrIMfsbNG4OQaONHaQwd7ACD9vlVr 1ssRa+h5ZmbflPK9JIptLAO7bHYiISOhRWFib2Et5YZun3DFvqPWEhE+U4eZCFYyNKnk pasdJ4IC7emM8FOVhctsCeAWLq1j+B+BAukUw2m3+naw+B02FniWIxDTCrxoWqHC0otT Po1RXzrb9pOllYEXJIV7yUDtJg84Lu8VWZLsqItIfz9Yv5wjNL+bUrZMGyQSsvta7QiF byembZ9bTLRDbxjQN6He8VhnyqHgzr9CPMVRETcGKbkMN0h5CNDYd0ducOxAEQND7wUK fWjQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UFLRt3Sh; 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=4DO5wdxd7QIBvJ4cd0hz5es7ExEvEwNOySW6yKK04uM=; b=S/uh6WxrpDKJwxbI+bMFkeijR49kvqWBAN+tuK12Ooy5VF1TQLbulxgojajse6BeWi jnbr8I87XiqbWM4Sm/9h6SzuJSmpdFUH0T8pFR5tKa1E8z+9r8+ts8TxavDRhJUvcoHs Zf6vcjE+osW2hs3cwRWdgd0FM/7Qqfb+Dfjqo= 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=4DO5wdxd7QIBvJ4cd0hz5es7ExEvEwNOySW6yKK04uM=; b=B0VsVK0EkCp7GHFOe9y1qXqV8iDQIDKkEUHHZpgwYM9khvwOpW4ioJU17weVhxZsx2 1bf32Bd0S2uahN9SlIN4qTRNWBBHewstHnoMDlx2jT0RxPuhEgv190jZ1equeIv4aID9 DdB2k3/A3l2Al02eo3R2hDsjSHNI+/yIkiK/PhAwgGnnFi19KLGwtYs8dVGeU5HUb5Cj +DjBID7c+XEMPPTKg1P52/JqJFaQ14y8OT7WHn5rcOfqKB/zn9SvwQDzl4/kEZG/d1hU cgILU7NC+0IGC/diHD8LDz7WsAzN7IgXen1HOVvA/SPkjTNbn6A4+DkQSXvngFM+BUCf mW2Q== X-Gm-Message-State: APjAAAUCZE1n9K38jVSTxAvWj0dr/HlQK5reU/DPkg6p+vqKoNKAFC7t 2ZfRVCc2HioDf1DB+u/1dDcChCkl X-Google-Smtp-Source: APXvYqy885CxHBmEuPlbWG8pOM5080VFrKkauiEHNG1pvRhx4u1I26agIHZAU0SycW9Fejb+Z1dzXQ== X-Received: by 2002:a63:6581:: with SMTP id z123mr45087310pgb.243.1556293854804; Fri, 26 Apr 2019 08:50:54 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a65:450d:: with SMTP id n13ls6468327pgq.5.gmail; Fri, 26 Apr 2019 08:50:54 -0700 (PDT) X-Received: by 2002:a62:121c:: with SMTP id a28mr47124876pfj.58.1556293854501; Fri, 26 Apr 2019 08:50:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556293854; cv=none; d=google.com; s=arc-20160816; b=opyCq9wkcsawenxgmrfC4jH7JgMdC78Ns8g5yZZMsl6CGVyNij6wsTpTELFgLP1+mL brD797aSLnlgC2F5PgqMJZTbl6EnBuOppqtuwjbTYBy2kl3/KwwsWHEpALv14E35ygc8 SzUbBYD+ONXHs8iRJZw3WL10dSn2iFA16b+PdZ6OF4owkuLoN1ggisHt71wrTrIFw/No ILM0BYDaY1qVdT6TOU5LA8PioA1x/Jhc2I+cuJopD4rVfeG45eaIhjR4CpdwGKXqbafC mQ0mzCpVPHl3yjl+MEME3gKid7gDE1tYMDVEEBiDBiOx38ZZ/C1GPI3gKjNSpLN30ZiV X9wA== 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=ZAbutBDKzKAmiGZFBhi5+rF3YZAfREq6DX6BxocjFlw=; b=O8oF+hk8rhCkRoszEf9VnKUm4KH9kE9xcpFX65RjVRKHP0012Kgw729o9tggqvRZAm 2AZadh2/tGihSejyfOBbElJu9AZ1nk8J3Y4eS9X+zyLcXUalth8t3k/83EO90qIUmuyZ IqhlqiVeoNGlQeKQm9yOZAm6eGttr/4JCsNiJFm4haxHDBgRORD8oSFdALoGm6+DwMyp jiMvmkkq6T5dPeQjenFO1agNpWy1PyfnGDhNJNnKvelQfZ1YeyPTsf/axBdM3E3MwPyp wN6ml73KnHJHuti/cNb8+PWpVugpBjFqSIuaAaoCkz0EuSKbuIy9HVXOQWUKuO3MutZJ o4bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UFLRt3Sh; 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 b36sor23849600plb.26.2019.04.26.08.50.54 for (Google Transport Security); Fri, 26 Apr 2019 08:50:54 -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:54c:: with SMTP id 70mr47237012plf.210.1556293854246; Fri, 26 Apr 2019 08:50:54 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id e4sm12019017pfn.185.2019.04.26.08.50.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 08:50:53 -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 02/13] rockchip: dts: rk3399: Sync pwm2_pin_pull_down from Linux 5.1-rc2 Date: Fri, 26 Apr 2019 21:19:49 +0530 Message-Id: <20190426154956.29567-3-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=UFLRt3Sh; 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: , To make successful build with dts(i) files syncing from Linux 5.1-rc2 the rk3399.dtsi would require pwm2_pin_pull_down. So, sync the pwm2_pin_pull_down node from Linux 5.1-rc2. Since this node is strictly not part of any commit alone, I have mentioned Linux 5.1-rc2 tag for future reference of where would this sync coming from. Signed-off-by: Jagan Teki Reviewed-by: Paul Kocialkowski --- arch/arm/dts/rk3399.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi index b53e41b4dc..99471f6287 100644 --- a/arch/arm/dts/rk3399.dtsi +++ b/arch/arm/dts/rk3399.dtsi @@ -2495,6 +2495,12 @@ rockchip,pins = <1 RK_PC3 RK_FUNC_1 &pcfg_pull_none>; }; + + + pwm2_pin_pull_down: pwm2-pin-pull-down { + rockchip,pins = + <1 RK_PC3 RK_FUNC_1 &pcfg_pull_down>; + }; }; pwm3a { From patchwork Fri Apr 26 15:49:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 271 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 9E3EF3F089 for ; Fri, 26 Apr 2019 17:51:00 +0200 (CEST) Received: by mail-pg1-f198.google.com with SMTP id n5sf2324876pgk.9 for ; Fri, 26 Apr 2019 08:51:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556293859; cv=pass; d=google.com; s=arc-20160816; b=Gb8BmCg5yXQ+axPXy/RNEOBepROmw91DvSLclJAo8OBs7VKWMUKxl3V8Phm8J9NRhI vHCgh9IbvDFj23DQfDAubdqZwTKqymRLO92Rsl8aWdLhqt3L49GP+sjk7fz1Jpfr9BZK 1Z1yu2DbyZDxloBebPlCgCKnuAPgCDrTxxn6xTee+ydC1fVl2olNYPa/TjgA1ZE86UBa uKT0PIw4Ba1DTrcw5Rc8wZxjZ0QMcaaE8kpNOPdVzshTlQUi+GrRwTq5WiPZOUD3NRGS 5fkheUJ6OX79tskvopF3e/AecqLyr1Kk2ep6ifWanRfwB0QCf91MxuQHgoDnlUfoCpBQ Vkug== 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=DG80SaO2JIpYJUB9I4VtjWIYuxI1yQgBfFsUf/8IL7M=; b=ob6CIBGdwDmrnv40Ar2I+KPiIKSEjHTaegsXn3GUrVz3dsT1rN8m5b/ZmjEX+sL1JY C4cyrP2kyZiSF9xojXoI41NRtFuLkTnZnm8N8Lsk7NmkjpkbZ/pOiz4TusPAGtUb06iA 3/qTQq/T9lcnsIeTXGhvTYhAqM/0FCuug55RjeqixbgCEsEFMcApZ0r8I0vV8DMmUnlw rdFbcnMUNYoncw1teNE7BToW3SLr+Jbxo+TQDikzNF9KTVPGrysVZcp3TsgiIEoKvTtO 5ur2xMzXWLiuYVts7xPco00/GFbhiXJKIPqelfLO1P/9bt3wLM5Qr81rvE6ByEotH+o5 /iXA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HQBAGUh3; 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=DG80SaO2JIpYJUB9I4VtjWIYuxI1yQgBfFsUf/8IL7M=; b=TquVA/pEIcX02nvEcGphRxbHlLRGJ8AqHuXXKU5llGQy4yliNdR0JV+RxEHrYAgT8B 7pJlB7BrsC+jCZfsVrXbv8v+PJzFkNV5PLJXQdPsp90nG8Zl4Bs76B9D54uz4JcY+E3D ZsILZGjfMcMfXx93Xggj7kpM0P6R6uRCOvYZc= 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=DG80SaO2JIpYJUB9I4VtjWIYuxI1yQgBfFsUf/8IL7M=; b=kFCxD3D3Vb10RscMS3wWS3LQqd7lqGjT4mVY1xQrAXnm7J9s5AZk9IRy69xPksuwAK PIbpziuplzQKWpVATbj8SDOb5oXm/XMc79AINDdaW4cASM9OtnoHsNENdxk95gAX/qdO fn5IzBmkblgorsJcDqCx0ZM4410dLzk51F8n7I8Bp6+fXmbXR3G+TvB3vIzrCbmQ2M/Q 8NoZWfADeQgCtr6ABtnLZw4NedDwKtKc9cs8wPuvj0N3SOqb8hcPBvhY7SkoXnMjQBjp M+KMWWp9WxkPe++okb2KicaoNFMw5PbgJzk2wOseos1lzAny7SOANIwnmJKZcf44/JkS Y0sg== X-Gm-Message-State: APjAAAX3MDgE5l13EYI8aPpidrPjwYqUHDOvclqMlueqrSfttsVts0E3 XBhszHB/q+oZ5pMOka3k9W9+Cgeh X-Google-Smtp-Source: APXvYqzuJagk/Cn0/27/WHOut5dstpXmqRsg5WFdNcpNvXXYmtDb5EEwRxT6FCdTXtjvSsOCwSNRVw== X-Received: by 2002:a63:3d4c:: with SMTP id k73mr44391436pga.154.1556293859464; Fri, 26 Apr 2019 08:50:59 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:120a:: with SMTP id a10ls1746984pfj.10.gmail; Fri, 26 Apr 2019 08:50:59 -0700 (PDT) X-Received: by 2002:a65:6546:: with SMTP id a6mr8817961pgw.5.1556293859051; Fri, 26 Apr 2019 08:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556293859; cv=none; d=google.com; s=arc-20160816; b=SELwbGSNHZvEkqj0O/Sppt9Wh8zj8MaooxX+iYdzTk1TUVPXz1LizUojqGQT7Pf0Nu vwt5lCQVTWuAHAlvndC1X49rgkVSi/m4Lap/GZCKeeXh9ZgFzxyM6c7omTYlQ/U5QRTF iY5NAQ0ldKgpVmMODXyT0RW9AIgHWrfafD5a52FJa4IL1/rbV65OXnUV4Di+fHjL66d4 TDQvH8RPEeDj01CZb1RWW9N1Ov0It/OrCJ+DKrh+02L1IGyN7nlkIYbJBglRs4BLFmgi KcI9mYHd0IsiCCq3OZbNHuSneh8/CSiRoZad3EF8N0PrmxUDEoURhy4knMe8oGvIuud0 e7Rg== 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=8HgTT5FFWp9LGZ+GQUgEQrP/qpv6/c8meFnx4zcO6tA=; b=YZUHQvY8Fw9VFZPGdU2ym5xV66s64z/uAKyEACvkgb8H9dDu7+oZy/3gsnX6a9Xva6 xK+dcQIBT3w7wjkKdv7GHfF5ndTuCvCC96W8yHJPZQC1/bH4ATBLrtQk/MK+LlXGwLjN zGBEUCYX+sy9w9OEH0xvWndDgriZVBlH6czycYJL1S1rcXSwfZOoRmqIJRmMBmO9NCFW YQY3rxR987lDmF7/g0WHHW5S71Soo/ZGt8uHAh9+V8qOlxnxjvWaKBZVGSwqVBeS3EUt SBIQed1W9r4HUxjKK0A3HfBpwsVbeOqbx6vIR3S1UmXqsmjqz3SjjOdJBbhSK8lWyTpj gL/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HQBAGUh3; 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 c22sor1009836pfn.47.2019.04.26.08.50.59 for (Google Transport Security); Fri, 26 Apr 2019 08:50:59 -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:4e86:: with SMTP id c128mr47149908pfb.39.1556293858769; Fri, 26 Apr 2019 08:50:58 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id e4sm12019017pfn.185.2019.04.26.08.50.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 08:50:58 -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 03/13] rockchip: dts: rk3399: Create initial rk3399-u-boot.dtsi Date: Fri, 26 Apr 2019 21:19:50 +0530 Message-Id: <20190426154956.29567-4-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=HQBAGUh3; 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: , U-Boot always managed to use Linux devicetree files with respective bindings, but on the other hand u-boot also has it's own u-boot specific nodes or properties example u-boot,dm-pre-reloc which is required for SPL_OF_CONTROL to allocate particular node. It is always a better job to add these u-boot specific nodes and properties into separate dts files which has an extension of -u-boot.dtsi This would help to sync the devicetrees from Linux whenever required instead of adding specific nodes. So, create initial rk3399-u-boot.dtsi with sdmmc u-boot,dm-pre-reloc property so-that the subsequent rk3399 boards can include the same on their board dtsi files. Signed-off-by: Jagan Teki --- arch/arm/dts/rk3399-u-boot.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 arch/arm/dts/rk3399-u-boot.dtsi diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi new file mode 100644 index 0000000000..f533ed95eb --- /dev/null +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +&sdmmc { + u-boot,dm-pre-reloc; +}; From patchwork Fri Apr 26 15:49:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 272 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 765023F089 for ; Fri, 26 Apr 2019 17:51:05 +0200 (CEST) Received: by mail-pg1-f198.google.com with SMTP id o1sf2311735pgv.15 for ; Fri, 26 Apr 2019 08:51:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556293864; cv=pass; d=google.com; s=arc-20160816; b=s5KreVMCgBTc/WN3SD9iS6hjrhdDLQla50udJCxzVQzgYXzT49hIjJ+B1rECnZNs+v mkxnnZJEFUmqp1hj9/vgMsfvLhoI6E52NXQh7bCF3zmVvQ5T04AxoJa4N+E0wZilR2+9 m2pH84u4/Jf7NkLbMf8u3aYbYXS5JQmcsTX33Jg1UJUFt+bzV/Sm6avJSV7RTJuLe66g cKBqWdDcOurKJz+Ed0qYyf8fIlg+XvBvvTmSQDmPP1BCSU/xvHz1qg443+VcmyFbXFpa RPB2M9QmU0X8p+VWuD7alhXtFLgGvnSwKLF0lT6XBNiq/0xj+bgUoHFYYN8e/MOssTtb jXyw== 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=fg95Cu1JWHYFxOpqN6vAJiDk0X4vHkfEdZnvI78+ISE=; b=fMzqEIPtvb3STgZVGUaAr3yEZTSEO5xYdkyCok83I13dxv0Z87peoCvZ0dGY31DGAZ q0HYo4JQNVajiojd8h0NCY2t3tsW2iVl7vYZlbuz0ZUaEUR2t+XAxKL5tx0duMjjpfQS +9vB3jZl6CzIghoYfN9aNMNlihWgtQmFq2k92bINxoQOI1iHZ5GNm1ijMlq60RS0cWEY fxhN0ZXIlKe9hSgZdSrqLAA7p4kUj+l38fn+YIkoXYjhU4DA+huET+DKvNGel48ybJaW omprIiTTQVxVgycy40tIEB/w7VmYqDcAz+aNPIqhS9VRk3pdz2WIog+Kp/IDg/bC44Vw S97A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KKPoLTdE; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 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=fg95Cu1JWHYFxOpqN6vAJiDk0X4vHkfEdZnvI78+ISE=; b=esQUlPhzaqTnitI89PdW9Vb2hOQWdQMf8vz0B+4oOYkcM/n3XxUPvRdjdNbSfTXaUo Nixh0bkinOcWL9ssVi1s3ZygtP5Jrk7MQGVESJlLSqKdPn1PrB2ap9oEFJIuKYvHpUyB uee9OzhwsPHqQ8x0jyBbQU565sK5FqcRXNmm8= 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=fg95Cu1JWHYFxOpqN6vAJiDk0X4vHkfEdZnvI78+ISE=; b=UzC4KipnBU1KnXYzprB0v3yDn/oJ9IgMg9DbEV5ZArV9tcfbJ3bFFWizw4WSbCCqMt 2xx89Z2fCfe/K19roI+dLsjAa76/4EHFQNLtR1mtzMtUeSBm8ykL97Wvt3SHub1SKLlL RWRUxre6L9gsF/tGD4sy9GPObI7eRiIQQhC8Ii3sgiVobrNdAnbTnBtMOgowwLYMKbN+ sciciKQC+RAU9zNFOpGkRcFUEB4pOdDCYFS8tuMZzYCx5uxasv5myxvyEMNljo3y1lV2 stO/nzFXGXQAVmRBY9rAQAxg2V/hTd+jIIvmrvqkOhpGLBhE332JoLbxjVnp4cZ4ES7S 7wTg== X-Gm-Message-State: APjAAAUSxSnRX3w+9q0T8W7yT+X9iEvtSSfdjLwuP/VrmAiCNOPQf2eL qe4Lt2C41z4ocwzNY7OHHwyhoZrz X-Google-Smtp-Source: APXvYqzuKwFTEfMyMnL4l2a8nN1tdjJy19cgI6BIrHxVlT5oP0db2pK8o/8egU3/vb+V7EUzENcPYA== X-Received: by 2002:a17:902:521:: with SMTP id 30mr45437693plf.248.1556293864196; Fri, 26 Apr 2019 08:51:04 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a65:63ca:: with SMTP id n10ls6468448pgv.10.gmail; Fri, 26 Apr 2019 08:51:04 -0700 (PDT) X-Received: by 2002:a62:e411:: with SMTP id r17mr2422727pfh.127.1556293863869; Fri, 26 Apr 2019 08:51:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556293863; cv=none; d=google.com; s=arc-20160816; b=p6mm/En8sSjJ0WYSFz271OMnOR0kW6wHbmN/42OtqlHSo48+0/DtYzqEZFJejYWKmk KbW+ZC8UXaEbwwHtluoV7lsP+LQPkK+QR11x2iaN3GviqPTpufJc7TttaymYLSVlZahK xobgg7QZvNqb1F7KIQtrX+PtNSWbDtPgqQaE+dBemzfw8GxZwf40da8+koA27g8Rrhei XC49qlSWorFCJzC4v4cCgOkmv/5/D+jbolX+kX9czArHsxadEtd56Cr4teSEoN7/mYdz 0mzZ5TmcxBerbux2PqtcP3ROgQVxlNn/if626NPyS5SSQ27L9HazbHkXyYppjoOj2EGQ rmlQ== 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=Um8qSQd4kNEDgUzuJzj+ZQ3+GQ9eCiB/O4N9spqTVvI=; b=BizUDz6hBxzlTNAnh25iK8fijC426a+rM8JGv/lY3N3KMDpqT0+O0MZ6osHLyza7pE 4vfpOUfgGxTjLE0l0tlqJDFRiN4kyrQa5sjxPIdF4wS1SNheatGNRiYejNhBqec5BXFx PaayuVaAAyZcCwB0Cn3Itnouyk7ZOE0LOAEy9osrVFHH8ZGNDLkAGrZPQ1Mclf8vZKZS clQP5bw5GxtKiP+hLGU7rstCOEFQ3R7PBTRZpR0Eg6HRcXt4r8Xn7Wb17BZsYLnFCePZ HCXQT65/VNWitXxKWVZEDgqfOJBEJLl7+je+ZFbYsIBAPQ3dHK3Kq993FZuGddO7Jb2u eWlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KKPoLTdE; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id u3sor20524989plb.12.2019.04.26.08.51.03 for (Google Transport Security); Fri, 26 Apr 2019 08:51:03 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:902:8ec8:: with SMTP id x8mr15122456plo.21.1556293863556; Fri, 26 Apr 2019 08:51:03 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id e4sm12019017pfn.185.2019.04.26.08.50.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 08:51:02 -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 04/13] Kconfig: Add default SPL_FIT_GENERATOR for rockchip Date: Fri, 26 Apr 2019 21:19:51 +0530 Message-Id: <20190426154956.29567-5-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=KKPoLTdE; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 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 default SPL_FIT_GENERATOR py script for rockchip platforms if specific target enabled SPL_LOAD_FIT. So, this would help get rid of explicitly mentioning the default SPL FIT generator in defconfigs. however some targets, like puma_rk3399 still require their own FIT generator so in those cases the default will override with defconfig defined generator. Signed-off-by: Jagan Teki Reviewed-by: Paul Kocialkowski --- Kconfig | 1 + configs/chromebook_bob_defconfig | 1 - configs/evb-rk3399_defconfig | 1 - configs/ficus-rk3399_defconfig | 1 - configs/firefly-rk3399_defconfig | 1 - configs/rock960-rk3399_defconfig | 1 - 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Kconfig b/Kconfig index 305b265ed7..5679a288ec 100644 --- a/Kconfig +++ b/Kconfig @@ -424,6 +424,7 @@ config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on SPL_FIT default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI + default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP help Specifies a (platform specific) script file to generate the FIT source file used to build the U-Boot FIT image file. This gets diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig index ce3deccb8a..04e25e1d4f 100644 --- a/configs/chromebook_bob_defconfig +++ b/configs/chromebook_bob_defconfig @@ -19,7 +19,6 @@ CONFIG_DEBUG_UART=y CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index d98535357a..49b2e2e089 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART=y CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig index 94c565efc2..fe3b9964e8 100644 --- a/configs/ficus-rk3399_defconfig +++ b/configs/ficus-rk3399_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEBUG_UART=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index 6725b48970..914304bb43 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART=y CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-firefly.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index cb5a35f4f5..5e6778ea20 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEBUG_UART=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y From patchwork Fri Apr 26 15:49:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 273 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B4BAA3F089 for ; Fri, 26 Apr 2019 17:51:10 +0200 (CEST) Received: by mail-pl1-f198.google.com with SMTP id w9sf2235291plz.11 for ; Fri, 26 Apr 2019 08:51:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556293869; cv=pass; d=google.com; s=arc-20160816; b=epOEZetBHVcKvZj3o3pQDgRIxCU7j650ZmMc+efPq/BoRiz4KN0tYvCgV8DU2YF2Wl uv7w/pxGJks+Bhykj/8hrmBqnYnk9cQKm5ycHDoPdO9Hvz88fONPh7Ik32g/ZxARC4Zq s1PDsula6yhA9Y/sjFG2rjTq7m/UWHip5bfY5tjUBboLtSS5PdO9XE3JLHk7nBqCQX4h YQWCN/H+GV7GvWut0reL09EUJoqi8Xl3aZdAuw5sK1pj20tmRvgyhAkQMCzbmjzK0cJB c+tYW8BpRe62PrllEIW7dJvaRUrAbSFTa/LrULKlLE+iDbiP9kLEGIiuzoTYboLUbuHS tHug== 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=hPrBnQ/CYHJUZlHab+n8AfSwLVBAXKj/+D+Cejz4KQc=; b=E1K8xtKjJnhwsZJYwjiZAM0rYWdbG8VTM2eeH4PEXqew9nJKtZMlD9A+nEf875/+NA 2l4uKJytwn+95NYc4qXEaUmCZjX8tVYXHn39lKmTnfTWxomzoOe1P5DToLxtVFyb8xlF QxV6r7lLrPM2bf24+KMbjiZXUa8ono0M9dpNGVx30AInyCyv+TGF4OugV4yJyhZw0Jpk 0PuiZUFWYpI+4GgQqALdFBTwRs2Zwlc3p09cMbpWICIIeVMS6mhhyPPFGNN6jczqxcM1 eYQBl2ladW9t6AnVxr6y4y+xjDTYlgGSb/37IwzvluICV1U6uGtU9HzaY9hEnAmhSnb9 A6Jw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=A7zvfGfo; 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=hPrBnQ/CYHJUZlHab+n8AfSwLVBAXKj/+D+Cejz4KQc=; b=EjS5YF3dZa/4yMgmQCJRLwZuPthCfS+9TAh8LyEFcQyz+6K+POA2K6aB4FuNwsr+PI zP815sIyr9YmGz0X/cDJokVcZ7jbqmaSG9tx8XYOAPUPc8jb01M/a945av33WXnYdkw9 njJeru1mqOJOw7VUDTZpRurENefn1eLuX7+DA= 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=hPrBnQ/CYHJUZlHab+n8AfSwLVBAXKj/+D+Cejz4KQc=; b=BbG7rKmW15wDAqnTeks5Y/Tkpryfw8E3IbU6yx5WamXpaj/0x9TY2Hjiw2ntUuRDUG /txmZkAhh2bDwForj5FzH2Xj7qJbimR7tVRJyhCA9k9iq9922yHiN+PihccCkvYsmjUS 8rAzi4bJBY+M0fotxWXTicg47FH9kUv7NIv68N48dQ0tqVT9fcXcO7plEyGX6sdqFZNR aLP1QP+jTanngCUOQrxjYuFFMHVgaVJ6RtqHag7F44kASiznfPZ0V9C+9fnzOgJrNLzA D+PkmsCAqX4PoubpxHza1fa7rW5FQYjf8HbqgwxUvuaZ9ZYhvNqjfmNzp1hMyQSNGB2V o8UQ== X-Gm-Message-State: APjAAAXZNOUqYqNY4n/tjIP7sLCCgshhw8c8+FEUGBis+qBbwcjekTG4 GKShLcQeqYdQmGgx+uuza+Xt/SWH X-Google-Smtp-Source: APXvYqyiB0+L+k51OK7NnDTVMiwxF9FUH53aHWPN6NEHEX0uyRAaHlPNW4M5uf3TivdFq5PeAn2AJQ== X-Received: by 2002:a63:fe0a:: with SMTP id p10mr43558058pgh.86.1556293869362; Fri, 26 Apr 2019 08:51:09 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:4104:: with SMTP id o4ls2852361pfa.4.gmail; Fri, 26 Apr 2019 08:51:09 -0700 (PDT) X-Received: by 2002:a63:e818:: with SMTP id s24mr44790251pgh.190.1556293868979; Fri, 26 Apr 2019 08:51:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556293868; cv=none; d=google.com; s=arc-20160816; b=w+pT+/3VkieqxrlGZY3Vv2TIQYG61Fb90vKXYBYon9Ap9UfeVCkgoSZ+eMAUOWaghy pvpmGDY29apI6vAI5eAR0XBPfb/dCRp4um6JPyyLv4oySYNWylDtmvDzR6okhh45BL+7 P2tnDxkEHnd2+Ukq9Ekc9itMe0zbCZ7UOLWvWu/2aLuHNrt/UK0rNFqP+6BH4G2reQHA W/ZMlIMrA1LCDNa/ppHkKTlsyq3fhbsTPCri0QjLio/GAuBVvbYUnT3ufMD3HwE+GnlA 0tY9/uOeadGQhpLT9jQgNE1nT3dKuEaiDinR5dYdGL50W/T/+YKfA0ZBFwmTKFAaTjJQ gJMw== 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=9q74pJJIIpQ0KAFtoHUfhl+mex8xFScYri09elCP9sY=; b=vdyoHNZOt03Y5RVg6dEo9rR2ZKLACVAEp3esT8P4Um61/6XA8gGafo5DCqkqgWX629 hqtvTpkNeYEQA3wJ3lWwD4vlTzQOs9HnMejRZttl7sQgyz3LfwcgPcwSk1ThS8QQFjcg 9ce6zPhrBE6UeqIRFqBwBbRYe5WFceXGYYC6vvBQ2Lt8RQEaWRS6hsQIN8wvGzN7HkS7 6ZDnZW1tAjvnpZ08Db/A006n61j3JOZ1+/Re7jyjSKNkXrNDbzuUHSXNQN+f1KtMUln+ RkEGkTFKdUpp+jhErjiAki1xs3qGNjhTVhT33sWKcEb3n5mg0XcbrikQ4W3T503Qapjo 7z0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=A7zvfGfo; 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 z14sor978217pgu.23.2019.04.26.08.51.08 for (Google Transport Security); Fri, 26 Apr 2019 08:51:08 -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:a65:4302:: with SMTP id j2mr43820794pgq.291.1556293868610; Fri, 26 Apr 2019 08:51:08 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id e4sm12019017pfn.185.2019.04.26.08.51.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 08:51:07 -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 05/13] arm: rockchip: rk3399: Move common configs in Kconfig Date: Fri, 26 Apr 2019 21:19:52 +0530 Message-Id: <20190426154956.29567-6-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=A7zvfGfo; 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: , Few SPL and U-Boot proper configs are common to all rk3399 target defconfigs, move them and select it from platform kconfig. Moved configs: - SPL_ATF - SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF - SPL_LOAD_FIT - SPL_CLK if SPL - SPL_PINCTRL if SPL - SPL_RAM if SPL - SPL_REGMAP if SPL - SPL_SYSCON if SPL - CLK - FIT - PINCTRL - RAM - REGMAP - SYSCON - DM_PMIC - DM_REGULATOR_FIXED Signed-off-by: Jagan Teki --- arch/arm/mach-rockchip/Kconfig | 16 ++++++++++++++++ configs/chromebook_bob_defconfig | 16 ---------------- configs/evb-rk3399_defconfig | 16 ---------------- configs/ficus-rk3399_defconfig | 16 ---------------- configs/firefly-rk3399_defconfig | 16 ---------------- configs/puma-rk3399_defconfig | 16 ---------------- configs/rock960-rk3399_defconfig | 16 ---------------- 7 files changed, 16 insertions(+), 96 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index b9a026abb5..dbe7f11d39 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -132,9 +132,25 @@ config ROCKCHIP_RK3399 select ARM64 select SUPPORT_SPL select SPL + select SPL_ATF + select SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF + select SPL_LOAD_FIT + select SPL_CLK if SPL + select SPL_PINCTRL if SPL + select SPL_RAM if SPL + select SPL_REGMAP if SPL + select SPL_SYSCON if SPL select SPL_SEPARATE_BSS select SPL_SERIAL_SUPPORT select SPL_DRIVERS_MISC_SUPPORT + select CLK + select FIT + select PINCTRL + select RAM + select REGMAP + select SYSCON + select DM_PMIC + select DM_REGULATOR_FIXED select DEBUG_UART_BOARD_INIT select BOARD_LATE_INIT select ROCKCHIP_BROM_HELPER diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig index 04e25e1d4f..fdcbabf912 100644 --- a/configs/chromebook_bob_defconfig +++ b/configs/chromebook_bob_defconfig @@ -17,16 +17,12 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y CONFIG_NR_DRAM_BANKS=1 -CONFIG_FIT=y -CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.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_SPL_SPI_LOAD=y -CONFIG_SPL_ATF=y -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y @@ -45,12 +41,6 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-gru-bob" 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_REGMAP=y -CONFIG_SPL_REGMAP=y -CONFIG_SYSCON=y -CONFIG_SPL_SYSCON=y -CONFIG_CLK=y -CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_I2C_CROS_EC_TUNNEL=y CONFIG_SYS_I2C_ROCKCHIP=y @@ -70,16 +60,10 @@ CONFIG_SPI_FLASH_GIGADEVICE=y 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_REGULATOR_PWM=y -CONFIG_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_ROCKCHIP_SPI=y CONFIG_SYSRESET=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 49b2e2e089..1ba9dcba62 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -11,15 +11,11 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEBUG_UART=y CONFIG_NR_DRAM_BANKS=1 -CONFIG_FIT=y -CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-evb.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_SPL_ATF=y -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y @@ -32,12 +28,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" 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_NET_RANDOM_ETHADDR=y -CONFIG_REGMAP=y -CONFIG_SPL_REGMAP=y -CONFIG_SYSCON=y -CONFIG_SPL_SYSCON=y -CONFIG_CLK=y -CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y @@ -47,16 +37,10 @@ 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_REGULATOR_PWM=y -CONFIG_DM_REGULATOR_FIXED=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y -CONFIG_RAM=y -CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig index fe3b9964e8..67c62065aa 100644 --- a/configs/ficus-rk3399_defconfig +++ b/configs/ficus-rk3399_defconfig @@ -11,14 +11,10 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEBUG_UART=y -CONFIG_FIT=y -CONFIG_SPL_LOAD_FIT=y # 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_SPL_ATF=y -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y @@ -31,12 +27,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-ficus" 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_NET_RANDOM_ETHADDR=y -CONFIG_REGMAP=y -CONFIG_SPL_REGMAP=y -CONFIG_SYSCON=y -CONFIG_SPL_SYSCON=y -CONFIG_CLK=y -CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y @@ -48,17 +38,11 @@ CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_GMAC_ROCKCHIP=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y -CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y -CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y -CONFIG_RAM=y -CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index 914304bb43..1d3a7f2982 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -11,15 +11,11 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEBUG_UART=y CONFIG_NR_DRAM_BANKS=1 -CONFIG_FIT=y -CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-firefly.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_SPL_ATF=y -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y @@ -31,12 +27,6 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-firefly" 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_REGMAP=y -CONFIG_SPL_REGMAP=y -CONFIG_SYSCON=y -CONFIG_SPL_SYSCON=y -CONFIG_CLK=y -CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y @@ -47,16 +37,10 @@ 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_REGULATOR_PWM=y -CONFIG_DM_REGULATOR_FIXED=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y -CONFIG_RAM=y -CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 3547ec6b27..e5ea2fe0b3 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -15,8 +15,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y CONFIG_NR_DRAM_BANKS=1 -CONFIG_FIT=y -CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_SOURCE="board/theobroma-systems/puma_rk3399/fit_spl_atf.its" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" CONFIG_MISC_INIT_R=y @@ -31,8 +29,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_SPI_LOAD=y -CONFIG_SPL_ATF=y -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y @@ -51,12 +47,6 @@ CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-ddr1600" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-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_CLK=y -CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MISC=y @@ -74,20 +64,14 @@ CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y -CONFIG_DM_PMIC=y CONFIG_DM_PMIC_FAN53555=y CONFIG_PMIC_RK8XX=y CONFIG_SPL_DM_REGULATOR=y CONFIG_REGULATOR_PWM=y -CONFIG_DM_REGULATOR_FIXED=y CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y -CONFIG_RAM=y -CONFIG_SPL_RAM=y CONFIG_DM_RTC=y CONFIG_RTC_ISL1208=y CONFIG_DEBUG_UART_SHIFT=2 diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index 5e6778ea20..cc7d6f89b1 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -11,15 +11,11 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEBUG_UART=y -CONFIG_FIT=y -CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.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_SPL_ATF=y -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_SYS_PROMPT="rock960 => " CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y @@ -32,12 +28,6 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960" 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_REGMAP=y -CONFIG_SPL_REGMAP=y -CONFIG_SYSCON=y -CONFIG_SPL_SYSCON=y -CONFIG_CLK=y -CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y @@ -45,16 +35,10 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ROCKCHIP=y CONFIG_SF_DEFAULT_SPEED=20000000 -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y -CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y -CONFIG_DM_REGULATOR_FIXED=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y -CONFIG_RAM=y -CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y From patchwork Fri Apr 26 15:49:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 274 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E4FE13F089 for ; Fri, 26 Apr 2019 17:51:15 +0200 (CEST) Received: by mail-pl1-f199.google.com with SMTP id j1sf2242256pll.13 for ; Fri, 26 Apr 2019 08:51:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556293874; cv=pass; d=google.com; s=arc-20160816; b=bQnbxpvrlCze80bxERbEa/99WNeskTvUGIuTJr24Op2fA2atKXTtp9i5PXRRRAR0AU Iznp50MnLeDRNMAx1xiDdrW/rPtXwS3c1EdskIlm/4sP/l2wlb23XoSC3anitxo8q0CJ T9xQ03bs2tXcgdAty2bHpj+9qbQWP6QSo2iVs7fA9aSpQVhyMqLJNoyMJPy55Yrj1ZLT LoInFGSoDos2A9bOlCvG0bxF9he6Mqi9lOGmrfcEGg40Y75im4mA5K5l/gra+Roix1Ua sXKn0WFo/DrO4rEpinvAIZXMVNBqXdbd3U5sCIyKpXXz3Pbv/y+x9+5Ie4kpMxtCpD3L siXA== 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=vVxXEgprjW409DaXwKJwA5pxqYs3HjcLcWbzyzqEp8U=; b=TWdcMbTjZ4Dx7cUZAJh8EVNAdUclIgKVe6Q3Otor6QUx42mcut0YcJ7MeNjYbPALfc 3qBzOYLBwruvM7BFij6MVWTOjFjshLK9OcuT+EjqVvz0lYepzwFRH5Nx2DwxZOgagJO0 j7IvkEMYiTrcwyFfnjWxOIhIZnJwLIyxZbtTy8eOhfhIzsp4So9Vu0RzhDXH8vyzdDeO 9HNNvR7O9UnzyPt+Q7l+v/cGyJzO5sJoKWMxLgLGQyzdb3oCqZl7F+OdbGQfLgb5cyzK 9A/eJoFAttNo/3UMrXHY12HqgckfWaiBOLqkrl0WwzFawPnzy70Xb8oWEFvN/hrAKdyh fdkQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=APODiKEN; 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=vVxXEgprjW409DaXwKJwA5pxqYs3HjcLcWbzyzqEp8U=; b=hmFt8li/qHj3SC+sglJROeTb5YBhNmYVV82K7StZIrZ5nRWoackpECbSZeuCf3yvTm U6g+7y9uiON9EW5RtEqtpJdRNHniwBsIUsPaiTEedFZz27WhVMJKPCb5J42c721BIOf9 qPvbywm09sA7ZKAMyfo+oJjnhyweFFrIXo+Js= 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=vVxXEgprjW409DaXwKJwA5pxqYs3HjcLcWbzyzqEp8U=; b=TU/p0KD/nCnVylYLfi6I9WKobipIFRT4Hvlv83l4WKKpW83zAQrYkVhlNmwrUrLLbB mpvwMbzlxbyt/1ALh5Kk0C7qBRtToOtD6xbYIt0qqJxsQxuuvikS1GkOm2/n2EI3vI+3 ssrBXWWzeqlqkSq50F6a5czXnPTNN0d5Q5rWWZGFSB/8YbE+KNxenxoYf824rnH87OyD S1k+fp5k/yYpiz3Z4ptuyEhq0blqhnKlRBVEc9cchwEZIFT+7QLS1onYLk1Xh7pZqNzC htkFhzWE6as0fjn+MvHC2Wkt7NGRbG/t3r3tLp2ZzyMtQYrnLlpgw2JIPcQZG+9xIKQi fM/A== X-Gm-Message-State: APjAAAVXKwSxHcpVUX8POR7Im+s3lFEifEDQzaVfXD+fqdgWMWt050Q3 Yml7k2DwydVsouWX7xWUn41chLb6 X-Google-Smtp-Source: APXvYqy1zhmsXmu6qbjIR/bJLVzbRkpUbM/wBoNAxtu1qAHePKGp5CSMJGmML9jgy6S0T4dUi0RtRA== X-Received: by 2002:a63:dd0f:: with SMTP id t15mr11666236pgg.414.1556293874669; Fri, 26 Apr 2019 08:51:14 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:8a82:: with SMTP id a2ls7938875pfc.13.gmail; Fri, 26 Apr 2019 08:51:14 -0700 (PDT) X-Received: by 2002:a63:27c5:: with SMTP id n188mr21113138pgn.338.1556293874228; Fri, 26 Apr 2019 08:51:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556293874; cv=none; d=google.com; s=arc-20160816; b=Beu/J+Il4c4coe0B35ZQ2pJJHWqQULLdAesz7OaxYki4XlI3ygSPoNpGQSfijmbL+C BSfpTTBpFccvjfFrmYPwjV04HL3x4M0aE12rj93bfCJ4tiu5FMcldBrAmwQUBVLMHede fb0M4otZB3juNLNcTpzBGpGAqncxGCssSBAoo7Ckun/73dG2EydL4Z6RBmUsk3BdHnPq AF+bDwLtKAZOiYGx2jjd6986SpAzn7fBss6z5jkKRAzuCnAOxZSYn8twRL827h30TUxK E31XQemcLvtJ+nEWMmJW+6al7q9fyxsBtxPVJhWkf6J0/bcK7ctJ68c37xI+ia5dsmur t6AQ== 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=uWfueGC3YBCodcmxWjcTTynqtqhdPaaQPJVbOp596zk=; b=omZv0BISSlzA6WpAHlV8brf3ddrxZwg6M0SPE2DdS/r+fVIZLCoWJYPdVu7NeIda+Q rdz7Q1AS4+R1rrPGelOS6u3GDu5DHisC3CY77eK5pYi5egtv4dJmkOBX8LT693iE2Stz IlIjNFtjIJBc2nCG/rDEk4uc5sCikW8lm15ejOgUlvK6oNSMoD0o07dFs/ZehRJuzQnk gkiKBkXrrZdDgnrACvaTk/mw6UD/vZXuH+H//awfBSJbe51hYasFm5e7wfNkbh3IGzjy jsaVX3QbXK+GsynqwY+0mGO61xPfUfCa5ZpBKzTRl6Xyh2Quhcp7V1zHpmtrWrQINphh 8JVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=APODiKEN; 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 r19sor11556806pls.71.2019.04.26.08.51.14 for (Google Transport Security); Fri, 26 Apr 2019 08:51:14 -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:7084:: with SMTP id z4mr48050530plk.305.1556293873616; Fri, 26 Apr 2019 08:51:13 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id e4sm12019017pfn.185.2019.04.26.08.51.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 08:51:12 -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 06/13] rockchip: rk3399: Add Orangepi RK3399 support Date: Fri, 26 Apr 2019 21:19:53 +0530 Message-Id: <20190426154956.29567-7-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=APODiKEN; 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 Orangepi RK3399 board. Specification - Rockchip RK3399 - 2GB/4GB DDR3 - 16GB eMMC - SD card slot - RTL8211E 1Gbps - AP6356S WiFI/BT - HDMI In/Out, DP, MIPI DSI/CSI - Mini PCIe - Sensors, Keys etc - DC12V-2A and DC5V-2A Commit details about Linux DTS sync: "arm64: dts: rockchip: Add support for the Orange Pi RK3399" (sha1: d3e71487a790979057c0fdbf32f85033639c16e6) Signed-off-by: Jagan Teki --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3399-orangepi-u-boot.dtsi | 7 + arch/arm/dts/rk3399-orangepi.dts | 771 +++++++++++++++++++++++ board/rockchip/evb_rk3399/MAINTAINERS | 7 + configs/orangepi-rk3399_defconfig | 58 ++ 5 files changed, 844 insertions(+) create mode 100644 arch/arm/dts/rk3399-orangepi-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-orangepi.dts create mode 100644 configs/orangepi-rk3399_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0e2ffdb87f..6d55b0caf8 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-orangepi.dtb \ rk3399-puma-ddr1333.dtb \ rk3399-puma-ddr1600.dtb \ rk3399-puma-ddr1866.dtb \ diff --git a/arch/arm/dts/rk3399-orangepi-u-boot.dtsi b/arch/arm/dts/rk3399-orangepi-u-boot.dtsi new file mode 100644 index 0000000000..236b61d78d --- /dev/null +++ b/arch/arm/dts/rk3399-orangepi-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-ddr3-1333.dtsi" diff --git a/arch/arm/dts/rk3399-orangepi.dts b/arch/arm/dts/rk3399-orangepi.dts new file mode 100644 index 0000000000..cf37b96a6b --- /dev/null +++ b/arch/arm/dts/rk3399-orangepi.dts @@ -0,0 +1,771 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. + */ + +/dts-v1/; + +#include "dt-bindings/pwm/pwm.h" +#include "dt-bindings/input/input.h" +#include "rk3399.dtsi" +#include "rk3399-opp.dtsi" + +/ { + model = "Orange Pi RK3399 Board"; + compatible = "rockchip,rk3399-orangepi", "rockchip,rk3399"; + + chosen { + stdout-path = "serial2:1500000n8"; + }; + + clkin_gmac: external-gmac-clock { + compatible = "fixed-clock"; + clock-frequency = <125000000>; + clock-output-names = "clkin_gmac"; + #clock-cells = <0>; + }; + + adc-keys { + compatible = "adc-keys"; + io-channels = <&saradc 1>; + io-channel-names = "buttons"; + keyup-threshold-microvolt = <1800000>; + poll-interval = <100>; + + button-up { + label = "Volume Up"; + linux,code = ; + press-threshold-microvolt = <100000>; + }; + + button-down { + label = "Volume Down"; + linux,code = ; + press-threshold-microvolt = <300000>; + }; + + back { + label = "Back"; + linux,code = ; + press-threshold-microvolt = <985000>; + }; + + menu { + label = "Menu"; + linux,code = ; + press-threshold-microvolt = <1314000>; + }; + }; + + dc_12v: dc-12v { + compatible = "regulator-fixed"; + regulator-name = "dc_12v"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + }; + + keys: gpio-keys { + compatible = "gpio-keys"; + autorepeat; + + power { + debounce-interval = <100>; + gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; + label = "GPIO Power"; + linux,code = ; + linux,input-type = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pwr_btn>; + wakeup-source; + }; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&rk808 1>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_reg_on_h>; + reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; + }; + + /* switched by pmic_sleep */ + vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 { + compatible = "regulator-fixed"; + regulator-name = "vcc1v8_s3"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc_1v8>; + }; + + vcc3v0_sd: vcc3v0-sd { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_pwr_h>; + regulator-boot-on; + regulator-max-microvolt = <3000000>; + regulator-min-microvolt = <3000000>; + regulator-name = "vcc3v0_sd"; + vin-supply = <&vcc3v3_sys>; + }; + + vcc3v3_sys: vcc3v3-sys { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_sys>; + }; + + vcc5v0_host: vcc5v0-host-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_host_en>; + regulator-name = "vcc5v0_host"; + regulator-always-on; + vin-supply = <&vcc_sys>; + }; + + vcc5v0_typec0: vcc5v0-typec0-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_typec0_en>; + regulator-name = "vcc5v0_typec0"; + vin-supply = <&vcc_sys>; + }; + + vcc_sys: vcc-sys { + compatible = "regulator-fixed"; + regulator-name = "vcc_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&dc_12v>; + }; + + vdd_log: vdd-log { + compatible = "pwm-regulator"; + pwms = <&pwm2 0 25000 1>; + regulator-name = "vdd_log"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1400000>; + vin-supply = <&vcc_sys>; + }; +}; + +&cpu_l0 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l1 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l2 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l3 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_b0 { + cpu-supply = <&vdd_cpu_b>; +}; + +&cpu_b1 { + cpu-supply = <&vdd_cpu_b>; +}; + +&emmc_phy { + status = "okay"; +}; + +&gmac { + assigned-clocks = <&cru SCLK_RMII_SRC>; + assigned-clock-parents = <&clkin_gmac>; + clock_in_out = "input"; + phy-supply = <&vcc3v3_s3>; + phy-mode = "rgmii"; + pinctrl-names = "default"; + pinctrl-0 = <&rgmii_pins>; + snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; + tx_delay = <0x28>; + rx_delay = <0x11>; + status = "okay"; +}; + +&gpu { + mali-supply = <&vdd_gpu>; + status = "okay"; +}; + +&hdmi { + ddc-i2c-bus = <&i2c3>; + status = "okay"; +}; + +&hdmi_sound { + status = "okay"; +}; + +&i2c0 { + clock-frequency = <400000>; + i2c-scl-rising-time-ns = <168>; + i2c-scl-falling-time-ns = <4>; + status = "okay"; + + rk808: pmic@1b { + compatible = "rockchip,rk808"; + reg = <0x1b>; + interrupt-parent = <&gpio1>; + interrupts = <21 IRQ_TYPE_LEVEL_LOW>; + #clock-cells = <1>; + clock-output-names = "rtc_clko_soc", "rtc_clko_wifi"; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_int_l>; + rockchip,system-power-controller; + wakeup-source; + + vcc1-supply = <&vcc3v3_sys>; + vcc2-supply = <&vcc3v3_sys>; + vcc3-supply = <&vcc3v3_sys>; + vcc4-supply = <&vcc3v3_sys>; + vcc6-supply = <&vcc3v3_sys>; + vcc7-supply = <&vcc3v3_sys>; + vcc8-supply = <&vcc3v3_sys>; + vcc9-supply = <&vcc3v3_sys>; + vcc10-supply = <&vcc3v3_sys>; + vcc11-supply = <&vcc3v3_sys>; + vcc12-supply = <&vcc3v3_sys>; + vddio-supply = <&vcc_3v0>; + + regulators { + vdd_center: DCDC_REG1 { + regulator-name = "vdd_center"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <1500000>; + regulator-ramp-delay = <6001>; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_cpu_l: DCDC_REG2 { + regulator-name = "vdd_cpu_l"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <1500000>; + regulator-ramp-delay = <6001>; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_ddr: DCDC_REG3 { + regulator-name = "vcc_ddr"; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc_1v8: DCDC_REG4 { + regulator-name = "vcc_1v8"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcc1v8_dvp: LDO_REG1 { + regulator-name = "vcc1v8_dvp"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3400000>; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc3v0_tp: LDO_REG2 { + regulator-name = "vcc3v0_tp"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3400000>; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc1v8_pmupll: LDO_REG3 { + regulator-name = "vcc1v8_pmupll"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <2500000>; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcc_sdio: LDO_REG4 { + regulator-name = "vcc_sdio"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3400000>; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3000000>; + }; + }; + + vcca3v0_codec: LDO_REG5 { + regulator-name = "vcca3v0_codec"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3400000>; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_1v5: LDO_REG6 { + regulator-name = "vcc_1v5"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <2500000>; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1500000>; + }; + }; + + vcca1v8_codec: LDO_REG7 { + regulator-name = "vcca1v8_codec"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <2500000>; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_3v0: LDO_REG8 { + regulator-name = "vcc_3v0"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3400000>; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3000000>; + }; + }; + + vcc3v3_s3: SWITCH_REG1 { + regulator-name = "vcc3v3_s3"; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc3v3_s0: SWITCH_REG2 { + regulator-name = "vcc3v3_s0"; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + }; + }; + + vdd_cpu_b: regulator@40 { + compatible = "silergy,syr827"; + reg = <0x40>; + fcs,suspend-voltage-selector = <1>; + regulator-name = "vdd_cpu_b"; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1500000>; + regulator-ramp-delay = <1000>; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vcc3v3_sys>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_gpu: regulator@41 { + compatible = "silergy,syr828"; + reg = <0x41>; + fcs,suspend-voltage-selector = <1>; + regulator-name = "vdd_gpu"; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1500000>; + regulator-ramp-delay = <1000>; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vcc3v3_sys>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; +}; + +&i2c1 { + i2c-scl-rising-time-ns = <450>; + i2c-scl-falling-time-ns = <15>; + status = "okay"; +}; + +&i2c3 { + i2c-scl-rising-time-ns = <450>; + i2c-scl-falling-time-ns = <15>; + status = "okay"; +}; + +&i2c4 { + clock-frequency = <400000>; + i2c-scl-rising-time-ns = <450>; + i2c-scl-falling-time-ns = <15>; + status = "okay"; + + ak09911@c { + compatible = "asahi-kasei,ak09911"; + reg = <0x0c>; + vdd-supply = <&vcc3v3_s3>; + }; + + mpu6500@68 { + compatible = "invensense,mpu6500"; + reg = <0x68>; + interrupt-parent = <&gpio1>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&gsensor_int_l>; + vddio-supply = <&vcc3v3_s3>; + }; + + lsm6ds3@6a { + compatible = "st,lsm6ds3"; + reg = <0x6a>; + interrupt-parent = <&gpio1>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&gyr_int_l>; + vdd-supply = <&vcc3v3_s3>; + vddio-supply = <&vcc3v3_s3>; + }; + + cm32181@10 { + compatible = "capella,cm32181"; + reg = <0x10>; + interrupt-parent = <&gpio4>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&light_int_l>; + vdd-supply = <&vcc3v3_s3>; + }; +}; + +&io_domains { + status = "okay"; + bt656-supply = <&vcc_3v0>; + audio-supply = <&vcca1v8_codec>; + sdmmc-supply = <&vcc_sdio>; + gpio1830-supply = <&vcc_3v0>; +}; + +&pmu_io_domains { + status = "okay"; + pmu1830-supply = <&vcc_3v0>; +}; + +&pinctrl { + buttons { + pwr_btn: pwr-btn { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = + <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + sd { + sdmmc0_pwr_h: sdmmc0-pwr-h { + rockchip,pins = + ; + }; + }; + + usb2 { + vcc5v0_host_en: vcc5v0-host-en { + rockchip,pins = + <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + vcc5v0_typec0_en: vcc5v0-typec0-en { + rockchip,pins = + <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + sdio-pwrseq { + wifi_reg_on_h: wifi-reg-on-h { + rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + wifi { + wifi_host_wake_l: wifi-host-wake-l { + rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + bluetooth { + bt_reg_on_h: bt-enable-h { + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_host_wake_l: bt-host-wake-l { + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_wake_l: bt-wake-l { + rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + mpu6500 { + gsensor_int_l: gsensor-int-l { + rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + lsm6ds3 { + gyr_int_l: gyr-int-l { + rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + cm32181 { + light_int_l: light-int-l { + rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&pwm0 { + status = "okay"; +}; + +&pwm2 { + status = "okay"; +}; + +&saradc { + vref-supply = <&vcca1v8_s3>; + status = "okay"; +}; + +&sdhci { + bus-width = <8>; + mmc-hs400-1_8v; + mmc-hs400-enhanced-strobe; + non-removable; + status = "okay"; +}; + +&sdio0 { + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + clock-frequency = <50000000>; + disable-wp; + keep-power-in-suspend; + max-frequency = <50000000>; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; + sd-uhs-sdr104; + status = "okay"; + + brcmf: wifi@1 { + compatible = "brcm,bcm4329-fmac"; + interrupt-parent = <&gpio0>; + interrupts = ; + interrupt-names = "host-wake"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_host_wake_l>; + }; +}; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; + clock-frequency = <150000000>; + disable-wp; + max-frequency = <150000000>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; + vmmc-supply = <&vcc3v0_sd>; + vqmmc-supply = <&vcc_sdio>; + status = "okay"; +}; + +&tcphy0 { + status = "okay"; +}; + +&tcphy1 { + status = "okay"; +}; + +&tsadc { + rockchip,hw-tshut-mode = <1>; + rockchip,hw-tshut-polarity = <1>; + status = "okay"; +}; + +&u2phy0 { + status = "okay"; + + u2phy0_otg: otg-port { + phy-supply = <&vcc5v0_typec0>; + status = "okay"; + }; + + u2phy0_host: host-port { + phy-supply = <&vcc5v0_host>; + status = "okay"; + }; +}; + +&u2phy1 { + status = "okay"; + + u2phy1_otg: otg-port { + status = "okay"; + }; + + u2phy1_host: host-port { + phy-supply = <&vcc5v0_host>; + status = "okay"; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rk808 1>; + clock-names = "ext_clock"; + device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_reg_on_h>; + }; +}; + +&uart2 { + status = "okay"; +}; + +&usb_host0_ehci { + status = "okay"; +}; + +&usb_host0_ohci { + status = "okay"; +}; + +&usb_host1_ehci { + status = "okay"; +}; + +&usb_host1_ohci { + status = "okay"; +}; + +&usbdrd3_0 { + status = "okay"; +}; + +&usbdrd_dwc3_0 { + status = "okay"; + dr_mode = "otg"; +}; + +&usbdrd3_1 { + status = "okay"; +}; + +&usbdrd_dwc3_1 { + status = "okay"; + dr_mode = "host"; +}; + +&vopb { + status = "okay"; +}; + +&vopb_mmu { + status = "okay"; +}; + +&vopl { + status = "okay"; +}; + +&vopl_mmu { + status = "okay"; +}; diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index caad30641e..07ee8ce92c 100644 --- a/board/rockchip/evb_rk3399/MAINTAINERS +++ b/board/rockchip/evb_rk3399/MAINTAINERS @@ -5,3 +5,10 @@ F: board/rockchip/evb_rk3399 F: include/configs/evb_rk3399.h F: configs/evb-rk3399_defconfig F: configs/firefly-rk3399_defconfig + +ORANGEPI-RK3399 +M: Jagan Teki +S: Maintained +F: configs/orangepi-rk3399_defconfig +F: arch/arm/dts/rk3399-u-boot.dtsi +F: arch/arm/dts/rk3399-orangepi-u-boot.dtsi diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig new file mode 100644 index 0000000000..deb7bc1388 --- /dev/null +++ b/configs/orangepi-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-orangepi.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-orangepi" +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 From patchwork Fri Apr 26 15:49:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 275 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 61DE03F089 for ; Fri, 26 Apr 2019 17:51:20 +0200 (CEST) Received: by mail-pg1-f200.google.com with SMTP id b37sf2307036pgl.19 for ; Fri, 26 Apr 2019 08:51:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556293879; cv=pass; d=google.com; s=arc-20160816; b=UXHHnOzFyQquoF4Zn2Gsjg+dG2BaQqlVhI/nA/S5yUH99jUxB4BnVs3OxHtY4AHVy4 ZzkYDGL6kdYpIRgPUQQkAixyTdKC1ka8+fCEbx+YHBPqEdnvBASROr1W8rqY7NaNv8X1 dKacDOnVoVthn6zBJBtcnt0oEB+wKltv+p8JjJqIeHrnipnQRyygWo3YHy1zL4gMfKt2 e5UEp/LBJcFXS+wz+Co+wdYeCGnDIYsOOhkV+2I3/I6/O6yQVUgPtI6vtk8u15hkYMt+ NaZwPEOWiYr2DsQ9ig77OKfDnWh8QO/mFzcn9YdZvYt/Bt+jHSvbrtsHidieX5KbMplT 3I5A== 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=flho7Zbuxy3g4wPyDpo68J1zJ8xywDkPGsXODy4cba4=; b=RPidG2H3vXsgFLdB4Z3V9Tj93oUFS8Z0bz3Ry++lB04ZnVC26bsmuyPMt2e8dEv6g2 hkoUHzNr8T5qfAtlo+w9g+k2YTw+7K9iuZOdtZ4TzmmF5kO3nNa53PKtczpawHCUA+6e JqBaixkHilrJHO2+6BgAOyetZOFPtPW2oJtUH9enasfXOD31y8NJC4gBqVnWMv3Iw3lq x/9bt7LsVVV25v0EdS8TeaImaPJO36Qg58NsGsHm8MKxWkdttQJaV8GnkVuMPLvKbIeL kDc/I/yMOmto7Fs6jGpzxLvxTQmObuUfCRje/FFmGYc549fkqXtDndTaWdkLGzdHX++E tqhw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="nDkBcH/W"; 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=flho7Zbuxy3g4wPyDpo68J1zJ8xywDkPGsXODy4cba4=; b=bpT8dJskXe/d+CSt5k455ofqcg7uH7vub8u7VlmhOSG6MmzQb5tqVaYKxpFriuTElX doHvnOLUqpDjqdc3jilZzBCK9zHYHsqhD2CQEkzAq/N+VhOBHvS+49tFNQ81I7SwhKv5 c7NkULF8bMeVUEEGGROAF0a3sXjP38qGX3TSE= 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=flho7Zbuxy3g4wPyDpo68J1zJ8xywDkPGsXODy4cba4=; b=gvhbmmsKYVUNaKFe4+DyIm3Q6HSLJnA20u6CXeBUrFnsrnwCJb2/jml+uCSZjKsUbo fwMZD02KnQATa0jGtfB3Iaa4Lj3LpFysRJMbPnR/XBY74/SuH1cm4y363N/yy84sG/uh DHp2tBwuK0l3Yp9+orkTd2u5QBW+EIEqb+Ha/E0qHwstfG+rou4kFgZhvIjAGf1dQWt0 7yDE99DtDrk8CNXG9ieBoPgiKi4UGloan9owg1FgZsPfQdYyZFqD9Y/jFDF9mKhmxtWi XrlPmzHitDAFJz0xPPP86s9Qm7KNauAyHswtHRexUC2Wn/PwRR/a+faRQ4jJWK5NzyPU lt1Q== X-Gm-Message-State: APjAAAWnS5LgNMSjbUuocBmcjzMVMRXC1LraTpxi5fMsKxdASKyi00Aq kqWjfIQgCxcVj71RtQbDKdv6JbAh X-Google-Smtp-Source: APXvYqwOr0xcuM5rn1W10wP1cVxOL3VfZKqoJd8zB9uU/mhQSDQNeMe9wnCWfudGYeaXVfpZHTV4Jg== X-Received: by 2002:a63:4558:: with SMTP id u24mr42319508pgk.225.1556293879158; Fri, 26 Apr 2019 08:51:19 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:13:: with SMTP id 19ls6469090pga.11.gmail; Fri, 26 Apr 2019 08:51:18 -0700 (PDT) X-Received: by 2002:aa7:9206:: with SMTP id 6mr3002981pfo.71.1556293878734; Fri, 26 Apr 2019 08:51:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556293878; cv=none; d=google.com; s=arc-20160816; b=HYIDIQ2Pv+9Ju+a30vVHWs+wwl6+JmZbqARiZxyuZ8ekL7pNKIWuu1LpvjDJn1h38K zWbe6oC+7CVFAv+7h65AwM8nlUBFWykJoE6ffb7UiVw8CboOgl83daas+eCcxu/5dDvn uKztX+meoc1Jd6F8yq44D/F8J7WMLUQeDZzKgoURaBoKcB22e79vorq3HO+s+S9wtiz2 rBgfzZ2ZO3VUNLyZWoVmoPMh3mEv/Hii39lQhv651QFDqU7HK8qx2//YS0kklL4sIeyp mKl1Nw4A8Xnm7mpfcs0XSkEBBaVDalyqD7VC0ORbKrDJ4iqSr/4fgxgzsvJU+bCmoQhl /6Tg== 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=kTaAzJhqREM/FbUnGVxVShBuYTrURNMzN5ybIjo7rXM=; b=ubg4Gc+qjQHZbh8vmr1teweWpd71PmLqQFS97dhiK2fZlesy6HpwGOa5kX41ORRSI7 ub6m1uMsii1lJV/xD8ZE/Y/J1GJJvXQo26fkLCTQbqfBEKh6MocOBf9E/ok1+8sQ3cbN oBJ+bKpUNlJp2/4p8OlWB5hEGx3nHPpTNvjxJCccbb53iYGcomPbpnyRaCinFMI6u2ow grX5ppxm/+8wKx6AAGw9Q4iWR6MD5PPYEilyl9YpEJBYvC9m8tQvZcu+6askh2CMVGKR gLokTIi9blugwcI3F2aljK+74+hqITnMyWlpvTDc271w1ln0JEWbmON63G96Z005JNnu O4ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="nDkBcH/W"; 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 w6sor24765535plp.55.2019.04.26.08.51.18 for (Google Transport Security); Fri, 26 Apr 2019 08:51:18 -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:8bc3:: with SMTP id r3mr1491555plo.53.1556293878224; Fri, 26 Apr 2019 08:51:18 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id e4sm12019017pfn.185.2019.04.26.08.51.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 08:51:17 -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 07/13] rockchip: dts: rk3399: Sync rk3399-nanopi4.dtsi from Linux Date: Fri, 26 Apr 2019 21:19:54 +0530 Message-Id: <20190426154956.29567-8-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="nDkBcH/W"; 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: , Sync rk3399-nanopi4.dtsi from Linux 5.1-rc2 tag. Linux commit details about the rk3399-nanopi4.dtsi sync: "arm64: dts: rockchip: Add nanopi4 bluetooth" (sha1: 3e2f0bb72be36aa6c14ee7f11ac4dd8014801030) Signed-off-by: Jagan Teki --- arch/arm/dts/rk3399-nanopi4.dtsi | 703 +++++++++++++++++++++++++++++++ 1 file changed, 703 insertions(+) create mode 100644 arch/arm/dts/rk3399-nanopi4.dtsi diff --git a/arch/arm/dts/rk3399-nanopi4.dtsi b/arch/arm/dts/rk3399-nanopi4.dtsi new file mode 100644 index 0000000000..d325e11728 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi4.dtsi @@ -0,0 +1,703 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * RK3399-based FriendlyElec boards device tree source + * + * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd + * + * 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 +#include "rk3399.dtsi" +#include "rk3399-opp.dtsi" + +/ { + chosen { + stdout-path = "serial2:1500000n8"; + }; + + clkin_gmac: external-gmac-clock { + compatible = "fixed-clock"; + clock-frequency = <125000000>; + clock-output-names = "clkin_gmac"; + #clock-cells = <0>; + }; + + vcc3v3_sys: vcc3v3-sys { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc3v3_sys"; + }; + + vcc5v0_sys: vcc5v0-sys { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v0_sys"; + vin-supply = <&vdd_5v>; + }; + + /* switched by pmic_sleep */ + vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc1v8_s3"; + vin-supply = <&vcc_1v8>; + }; + + vcc3v0_sd: vcc3v0-sd { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_pwr_h>; + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc3v0_sd"; + vin-supply = <&vcc3v3_sys>; + }; + + vbus_typec: vbus-typec { + compatible = "regulator-fixed"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vbus_typec"; + }; + + gpio-keys { + compatible = "gpio-keys"; + autorepeat; + pinctrl-names = "default"; + pinctrl-0 = <&power_key>; + + power { + debounce-interval = <100>; + gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; + label = "GPIO Key Power"; + linux,code = ; + wakeup-source; + }; + }; + + leds: gpio-leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&leds_gpio>; + + status { + gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; + label = "status_led"; + linux,default-trigger = "heartbeat"; + }; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&rk808 1>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_reg_on_h>; + reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; + }; +}; + +&cpu_b0 { + cpu-supply = <&vdd_cpu_b>; +}; + +&cpu_b1 { + cpu-supply = <&vdd_cpu_b>; +}; + +&cpu_l0 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l1 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l2 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l3 { + cpu-supply = <&vdd_cpu_l>; +}; + +&emmc_phy { + status = "okay"; +}; + +&gmac { + assigned-clock-parents = <&clkin_gmac>; + assigned-clocks = <&cru SCLK_RMII_SRC>; + clock_in_out = "input"; + pinctrl-names = "default"; + pinctrl-0 = <&rgmii_pins>; + phy-mode = "rgmii"; + phy-supply = <&vcc3v3_s3>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; + snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; + tx_delay = <0x28>; + rx_delay = <0x11>; + status = "okay"; +}; + +&gpu { + mali-supply = <&vdd_gpu>; + status = "okay"; +}; + +&hdmi { + ddc-i2c-bus = <&i2c7>; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_cec>; + status = "okay"; +}; + +&i2c0 { + clock-frequency = <400000>; + i2c-scl-rising-time-ns = <160>; + i2c-scl-falling-time-ns = <30>; + status = "okay"; + + vdd_cpu_b: regulator@40 { + compatible = "silergy,syr827"; + reg = <0x40>; + fcs,suspend-voltage-selector = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&cpu_b_sleep>; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1500000>; + regulator-name = "vdd_cpu_b"; + regulator-ramp-delay = <1000>; + vin-supply = <&vcc3v3_sys>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_gpu: regulator@41 { + compatible = "silergy,syr828"; + reg = <0x41>; + fcs,suspend-voltage-selector = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&gpu_sleep>; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1500000>; + regulator-name = "vdd_gpu"; + regulator-ramp-delay = <1000>; + vin-supply = <&vcc3v3_sys>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + rk808: pmic@1b { + compatible = "rockchip,rk808"; + reg = <0x1b>; + clock-output-names = "xin32k", "rtc_clko_wifi"; + #clock-cells = <1>; + interrupt-parent = <&gpio1>; + interrupts = <21 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_int_l>; + rockchip,system-power-controller; + wakeup-source; + + vcc1-supply = <&vcc3v3_sys>; + vcc2-supply = <&vcc3v3_sys>; + vcc3-supply = <&vcc3v3_sys>; + vcc4-supply = <&vcc3v3_sys>; + vcc6-supply = <&vcc3v3_sys>; + vcc7-supply = <&vcc3v3_sys>; + vcc8-supply = <&vcc3v3_sys>; + vcc9-supply = <&vcc3v3_sys>; + vcc10-supply = <&vcc3v3_sys>; + vcc11-supply = <&vcc3v3_sys>; + vcc12-supply = <&vcc3v3_sys>; + vddio-supply = <&vcc_3v0>; + + regulators { + vdd_center: DCDC_REG1 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <1350000>; + regulator-name = "vdd_center"; + regulator-ramp-delay = <6001>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_cpu_l: DCDC_REG2 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <1350000>; + regulator-name = "vdd_cpu_l"; + regulator-ramp-delay = <6001>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_ddr: DCDC_REG3 { + regulator-always-on; + regulator-boot-on; + regulator-name = "vcc_ddr"; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc_1v8: DCDC_REG4 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc_1v8"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcc1v8_cam: LDO_REG1 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc1v8_cam"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc3v0_touch: LDO_REG2 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc3v0_touch"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc1v8_pmupll: LDO_REG3 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc1v8_pmupll"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcc_sdio: LDO_REG4 { + regulator-always-on; + regulator-boot-on; + regulator-init-microvolt = <3000000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc_sdio"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3000000>; + }; + }; + + vcca3v0_codec: LDO_REG5 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcca3v0_codec"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_1v5: LDO_REG6 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-name = "vcc_1v5"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1500000>; + }; + }; + + vcca1v8_codec: LDO_REG7 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcca1v8_codec"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_3v0: LDO_REG8 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc_3v0"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3000000>; + }; + }; + + vcc3v3_s3: SWITCH_REG1 { + regulator-always-on; + regulator-boot-on; + regulator-name = "vcc3v3_s3"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc3v3_s0: SWITCH_REG2 { + regulator-always-on; + regulator-boot-on; + regulator-name = "vcc3v3_s0"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + }; + }; +}; + +&i2c1 { + clock-frequency = <200000>; + i2c-scl-rising-time-ns = <150>; + i2c-scl-falling-time-ns = <30>; + status = "okay"; +}; + +&i2c2 { + status = "okay"; +}; + +&i2c4 { + clock-frequency = <400000>; + i2c-scl-rising-time-ns = <160>; + i2c-scl-falling-time-ns = <30>; + status = "okay"; + + fusb0: typec-portc@22 { + compatible = "fcs,fusb302"; + reg = <0x22>; + interrupt-parent = <&gpio1>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&fusb0_int>; + vbus-supply = <&vbus_typec>; + }; +}; + +&i2c7 { + status = "okay"; +}; + +&io_domains { + bt656-supply = <&vcc_1v8>; + audio-supply = <&vcca1v8_codec>; + sdmmc-supply = <&vcc_sdio>; + gpio1830-supply = <&vcc_3v0>; + status = "okay"; +}; + +&pcie_phy { + assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>; + assigned-clock-rates = <100000000>; + assigned-clocks = <&cru SCLK_PCIEPHY_REF>; + status = "okay"; +}; + +&pcie0 { + ep-gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>; + max-link-speed = <2>; + num-lanes = <4>; + status = "okay"; +}; + +&pinctrl { + fusb30x { + fusb0_int: fusb0-int { + rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + gpio-leds { + leds_gpio: leds-gpio { + rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + pmic { + cpu_b_sleep: cpu-b-sleep { + rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + gpu_sleep: gpu-sleep { + rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + pmic_int_l: pmic-int-l { + rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + rockchip-key { + power_key: power-key { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + sdio { + bt_host_wake_l: bt-host-wake-l { + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_reg_on_h: bt-reg-on-h { + /* external pullup to VCC1V8_PMUPLL */ + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_wake_l: bt-wake-l { + rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + wifi_reg_on_h: wifi-reg_on-h { + rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + sdmmc { + sdmmc0_det_l: sdmmc0-det-l { + rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + sdmmc0_pwr_h: sdmmc0-pwr-h { + rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&pmu_io_domains { + pmu1830-supply = <&vcc_3v0>; + status = "okay"; +}; + +&pwm0 { + status = "okay"; +}; + +&pwm1 { + status = "okay"; +}; + +&pwm2 { + pinctrl-names = "active"; + pinctrl-0 = <&pwm2_pin_pull_down>; + status = "okay"; +}; + +&saradc { + vref-supply = <&vcca1v8_s3>; + status = "okay"; +}; + +&sdhci { + bus-width = <8>; + mmc-hs200-1_8v; + non-removable; + status = "okay"; +}; + +&sdio0 { + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; + sd-uhs-sdr104; + status = "okay"; +}; + +&sdmmc { + bus-width = <4>; + cap-sd-highspeed; + cap-mmc-highspeed; + cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; + disable-wp; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc0_det_l>; + sd-uhs-sdr104; + vmmc-supply = <&vcc3v0_sd>; + vqmmc-supply = <&vcc_sdio>; + status = "okay"; +}; + +&tcphy0 { + status = "okay"; +}; + +&tcphy1 { + status = "okay"; +}; + +&tsadc { + /* tshut mode 0:CRU 1:GPIO */ + rockchip,hw-tshut-mode = <1>; + /* tshut polarity 0:LOW 1:HIGH */ + rockchip,hw-tshut-polarity = <1>; + status = "okay"; +}; + +&u2phy0 { + status = "okay"; +}; + +&u2phy0_host { + status = "okay"; +}; + +&u2phy0_otg { + status = "okay"; +}; + +&u2phy1 { + status = "okay"; +}; + +&u2phy1_host { + status = "okay"; +}; + +&u2phy1_otg { + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer &uart0_rts &uart0_cts>; + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rk808 1>; + clock-names = "lpo"; + device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + max-speed = <4000000>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_reg_on_h &bt_host_wake_l &bt_wake_l>; + vbat-supply = <&vcc3v3_sys>; + vddio-supply = <&vcc_1v8>; + }; +}; + +&uart2 { + status = "okay"; +}; + +&usbdrd3_0 { + status = "okay"; +}; + +&usbdrd3_1 { + status = "okay"; +}; + +&usbdrd_dwc3_0 { + status = "okay"; +}; + +&usbdrd_dwc3_1 { + dr_mode = "host"; + status = "okay"; +}; + +&usb_host0_ehci { + status = "okay"; +}; + +&usb_host0_ohci { + status = "okay"; +}; + +&usb_host1_ehci { + status = "okay"; +}; + +&usb_host1_ohci { + status = "okay"; +}; + +&vopb { + status = "okay"; +}; + +&vopb_mmu { + status = "okay"; +}; + +&vopl { + status = "okay"; +}; + +&vopl_mmu { + status = "okay"; +}; From patchwork Fri Apr 26 15:49:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 276 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E64663F089 for ; Fri, 26 Apr 2019 17:51:24 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id f64sf2450913pfb.11 for ; Fri, 26 Apr 2019 08:51:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556293883; cv=pass; d=google.com; s=arc-20160816; b=lfFEUsacN65A5/vw7ZcvXTdNB5z/1ONF/GYxw+cJbQBQgcdQvyru2ZVmoeaxwh6O4K bCRtDAfiyw8n67dSfw5p0157KRRZzb8XLoW73myw1xnTd8i0Yr5zcG5mctjUbzba0KCz 3Cq5RW+WgTCDPbpskmIz8OtGMU8HadOowlPtjqXLg2ABq9n8dElkA4Jp9Mem1ziRXnn0 gvgD6gQHkE8Y8bqy23RTSJyFUXPDJfxKD8/auN50AH/XK5hGGjIO9FmRg9ungWxlujI+ ubNWOAmJ78zZXemOqr5q7AJZHOK6+TLLI8mqpmiRDgI5w+o5y1KcD81opW5RGncEjhjP Bi7g== 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=22MukzyYOAAGZQzTudxaO3jK7Ek7pw7exmp1qPOZFeQ=; b=xIYN4Yzt1X3wSuJdJBH9lPknwLyMwzbgrUag3Q0xoBEYdls4L1IXUtkAGGSrz/zGVR ChWk5jn66SNQepzrJO+mKdrhcC7NX/JcVwRLbDAP/4cbnNALBs/fhOpokiEMa1VrTyhf oIJgaeCkfkwmH0+1sb7Y8Oa2p2znXuQ+YDdcFI5sr8xjrc/LqBSjo0NKNGEAYf+0CiC/ VjJh6ikRIVfk2KP7ZzcqFVHcLVxQVYrzzRC6vC6IF1zMWmRg1frVCupCxP9ZSpqz//+y YHfd++AqplmXDMQTvVpyJLHJogO9lx5Mob0QudmQiJ4Ys4TZRgslKVgqqGAxslP2rIhz KaQQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BfHgoKl6; 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=22MukzyYOAAGZQzTudxaO3jK7Ek7pw7exmp1qPOZFeQ=; b=f/Pey6IfqMEieRo8fr9jVMfTD/3TIzmnSHvvX8ucGgErKd7CcODPMR1Vk3egkqAGZ+ 0bJ5kTKrcoSJclZ0qBwDJi2OQb4yllAWCX3TwXTQlyUOpEichVaM248rRFCXafPE6eV8 cNzNI26g0muESFDysSeBlg9Lj6H7NsP5gYsCs= 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=22MukzyYOAAGZQzTudxaO3jK7Ek7pw7exmp1qPOZFeQ=; b=QMc9swuKaIUvvu0HmPETWCDBG/eOW9pST7BKDNK3C0fPErp/YpcFEUARaCAXk5Nnqb mf2hERhvVg/DIY11nmiekI2TFU4AFK1g9kbBRlvRs1BJEqyDvPg6BPQwJos+3xYYobF0 /O/PUoiMXv2PIVo1H8IfMOhNIdU2SqgptkZFTodTj4w6Kd7QabNOJ0V+Hc1XQN2kfOIx ak1nVZvq8lUOsGZpUw7Y1WyDzhqmQXyr1mj4dXygIMpaiqhLWlWxy3pZgxf3odAQye4K aed2UdCczlZGP6WXcOMa3z0JbHi3NWQ45U4BbJqwoGvPM7RqrEwjrdq2qSHhbUVzvERW zH6Q== X-Gm-Message-State: APjAAAVEflXX1vw17ZURQKtH99z2C9JBYmKFMEloZEl+8kUgmwvalfi2 CSAZ4yUi3EB4CgFaG5cTnED2S9Fk X-Google-Smtp-Source: APXvYqzilbL2vfOd5owuJOgdZQpTRsh+iB9TWf/9sYWNNOTS/PwpFMY3yy98u0v3WQXxDzNWkAQfYQ== X-Received: by 2002:a63:fd58:: with SMTP id m24mr20646671pgj.298.1556293883760; Fri, 26 Apr 2019 08:51:23 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:ba86:: with SMTP id k6ls7158067pls.10.gmail; Fri, 26 Apr 2019 08:51:23 -0700 (PDT) X-Received: by 2002:a17:902:bd4b:: with SMTP id b11mr46161521plx.68.1556293883392; Fri, 26 Apr 2019 08:51:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556293883; cv=none; d=google.com; s=arc-20160816; b=mLAG9aXW4flmy2b2VBSu8pAIzGGLvJ9qn/MlNtZFKMYM9zw9ysQUrUNLltXt/8wd1O 5nUASw85NTXyinvX+k4+9qB7oCCKVRkjDWYBA0eDPWKSPj3yEN8H5uCawTrzyZgZ61bs He+ggBePxGJDlRsUO3Zkd0aYP0927hB8JWVtBz6QPG2ppBVSnfl80TgEMyWjjJWUbgki 4IXV9kFyiiNxEp5xoXxMmt6QA6zQquwtGHMQRUZ/cU2LZ8iC8FEiBfdDIX7yEPHoRVem hwLtEIg8UM7jGnTl8BPrUherJBHiupd3ttNgphHVkCanWcMf2d/ANFcUFutu/YheloQ4 3S5w== 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=d6JHM5/ooTGFq5zs+8Ro6gi/VDxPGLGt5ecNLlHQODg=; b=jBw1nD4OCVnjsVEScbM39s/8tcPiA2y98pTydDC5O6rtvIm40LrXcOdlC6ZwgYk8BS jqk3/J93h2o7xsmE/J3PN68tIJXhl3r71WufINiiNJwKqcrJs7Qritvo56pRnppZu3X1 BH7lD/F5GNLXVyPk57G/dkyJ/anF8emR2eoXQUDaf/iUPpO+akRsKWqjee9Lc/hyhjTh dUnUgJE05bh43yesTsgzjdF0byuHrUMMqfqVXbOV3ek8vRUVFBXRvtilSw3zwoArOlUK NHkgZs6DTVm+czcBA7kQKkXLWoyu7zmECXopW9GrMdobyZ4Z06zrLw/bmKWVPCWzwmLN eG9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BfHgoKl6; 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 p67sor28658299pfi.63.2019.04.26.08.51.23 for (Google Transport Security); Fri, 26 Apr 2019 08:51: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:a62:2603:: with SMTP id m3mr8891667pfm.232.1556293883132; Fri, 26 Apr 2019 08:51:23 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id e4sm12019017pfn.185.2019.04.26.08.51.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 08:51:22 -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 08/13] rockchip: dts: rk3399: nanopi4: Use CD pin as RK_FUNC_1 Date: Fri, 26 Apr 2019 21:19:55 +0530 Message-Id: <20190426154956.29567-9-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=BfHgoKl6; 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: , sdmmc cd pin is configured as RK_FUNC_GPIO which is wrong and indeed failed to detect the sdcard on the board with below error Card did not respond to voltage select! So, fix it by replacing RK_FUNC_GPIO with RK_FUNC_1 which is already defined in rk3399.dts so make use of same like other boards. Add these changes in -u-boot.dtsi to make Linux sync easy for future changes. Signed-off-by: Jagan Teki --- arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 arch/arm/dts/rk3399-nanopi4-u-boot.dtsi diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi new file mode 100644 index 0000000000..20db99c0b8 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +&sdmmc { + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_cd>; +}; 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