From patchwork Sat Apr 27 11:42:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1091911 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="VRZqtB27"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44rpvt54CGz9s55 for ; Sat, 27 Apr 2019 21:43:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5DF3DC21C3F; Sat, 27 Apr 2019 11:42:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 21336C21E2F; Sat, 27 Apr 2019 11:42:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5553AC21D8E; Sat, 27 Apr 2019 11:42:39 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id 47AD7C21DA2 for ; Sat, 27 Apr 2019 11:42:34 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id w20so2189442plq.3 for ; Sat, 27 Apr 2019 04:42:34 -0700 (PDT) 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:content-transfer-encoding; bh=w0N4ouP2DUFUgXUhjYEbGzSum/fljQInZXnPEQuOOj8=; b=VRZqtB27xvAeuDvbR7Pe6yEjmo9lb6kSHgZvD+znXgBaP4qVE+FiWa7PXiaG7WFhUk izc+c+txymmqP8iavGR81y/+NYKAdmZV7CXULCfJ6izCM2Wj2mWjBbxjvrLqNcKqR5jq j1ic2CmwrJmwOwncNMnTfGXk2lYcpJ9srQySw= 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:content-transfer-encoding; bh=w0N4ouP2DUFUgXUhjYEbGzSum/fljQInZXnPEQuOOj8=; b=Oog1qOF/nzZbbqeRFb1AEZpZn7Zaa/JjZ9CEp0gomlXDUsMJkwJqYUlTAZcNw+F59d k8POXaftzgoQ37JYE/GRyD7l4PDFPonRNJ04PfWzvP6YOjja6bkZ+Q6n2sHoZEuS28rW 1wMa6GoPq0gQkOB+FkwPmkth/vZ9fCiNFAEyzzBsu68iQj0T371INmFlDaIM1AYJBP0f uFI5DQGLP+0/NBlsXcV/Ic3MgBHk0HgJEn/zdhHYrS7F1zDbzkue9AxXOlMI8f/rBipZ NitJAwUDAmzXp8B/04UdM5qOksQ4FgKu8p1o3bPiPBts9A6NBWAz8mnTdi1s6hhhvvM5 iwsw== X-Gm-Message-State: APjAAAWJGHL9SjqHCVqCx1Bj1tNuQSAgR8HuloLVoxaSmvljtRIMlyze O4j08B5djeWcoqJyAIeSs+39uQ== X-Google-Smtp-Source: APXvYqwPQNSRQADRufc4dtOOqKBi6xBv+b/kU2Kq5f+3KI31y+kDRiQYADqizANtJloNhFAWyx2bAQ== X-Received: by 2002:a17:902:864b:: with SMTP id y11mr48537243plt.1.1556365352829; Sat, 27 Apr 2019 04:42:32 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k79sm68958973pfj.28.2019.04.27.04.42.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Apr 2019 04:42:32 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Date: Sat, 27 Apr 2019 17:12:00 +0530 Message-Id: <20190427114202.7358-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190427114202.7358-1-jagan@amarulasolutions.com> References: <20190427114202.7358-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH v6 1/3] arm64: rockchip: dts: rk3399: Add board -u-boot.dtsi files X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Devicetree files in RK3399 platform is synced from Linux, like other platforms does. Apart from these u-boot in rk3399 would also require some u-boot specific node like dmc. dmc node has big chunk of DDR timing parameters which are specific to specific board, and maintained with rk3399-sdram*.dtsi. So, create board specific -u-boot.dtsi files and move these sdram dtsi files accordingly. This would help of maintain u-boot specific changes separately without touching Linux dts(i) files which indeed easy for syncing from Linux between releases. These board specific -u-boot.dtsi can be extendible to add more u-boot specific nodes or properties in future. Signed-off-by: Jagan Teki --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-evb.dts | 1 - arch/arm/dts/rk3399-ficus-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-ficus.dts | 1 - arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-firefly.dts | 1 - arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-gru-bob.dts | 1 - arch/arm/dts/rk3399-rock960-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-rock960.dts | 1 - 10 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/rk3399-evb-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-ficus-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-firefly-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-gru-bob-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-rock960-u-boot.dtsi diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi new file mode 100644 index 0000000000..7e2c57af22 --- /dev/null +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-lpddr3-4GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index ce004d0d18..2366e7ed3a 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -7,7 +7,6 @@ #include #include #include "rk3399.dtsi" -#include "rk3399-sdram-lpddr3-4GB-1600.dtsi" / { model = "Rockchip RK3399 Evaluation Board"; diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi new file mode 100644 index 0000000000..eab86bdb30 --- /dev/null +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts index 4af0e4e383..4b2dd82b67 100644 --- a/arch/arm/dts/rk3399-ficus.dts +++ b/arch/arm/dts/rk3399-ficus.dts @@ -8,7 +8,6 @@ /dts-v1/; #include "rk3399-rock960.dtsi" -#include "rk3399-sdram-ddr3-1600.dtsi" / { model = "96boards RK3399 Ficus"; diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi new file mode 100644 index 0000000000..eab86bdb30 --- /dev/null +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts index f90e7e88db..5d52319393 100644 --- a/arch/arm/dts/rk3399-firefly.dts +++ b/arch/arm/dts/rk3399-firefly.dts @@ -7,7 +7,6 @@ #include #include #include "rk3399.dtsi" -#include "rk3399-sdram-ddr3-1600.dtsi" / { model = "Firefly-RK3399 Board"; diff --git a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi new file mode 100644 index 0000000000..9edb8cf841 --- /dev/null +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" diff --git a/arch/arm/dts/rk3399-gru-bob.dts b/arch/arm/dts/rk3399-gru-bob.dts index 0e3d91fc28..1ee0dc0d9f 100644 --- a/arch/arm/dts/rk3399-gru-bob.dts +++ b/arch/arm/dts/rk3399-gru-bob.dts @@ -7,7 +7,6 @@ /dts-v1/; #include "rk3399-gru-chromebook.dtsi" -#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" / { model = "Google Bob"; diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi new file mode 100644 index 0000000000..5256f6d3f2 --- /dev/null +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-lpddr3-2GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts index 25c58b4261..7e06bc97e5 100644 --- a/arch/arm/dts/rk3399-rock960.dts +++ b/arch/arm/dts/rk3399-rock960.dts @@ -5,7 +5,6 @@ /dts-v1/; #include "rk3399-rock960.dtsi" -#include "rk3399-sdram-lpddr3-2GB-1600.dtsi" / { model = "96boards Rock960"; From patchwork Sat Apr 27 11:42:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1091912 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="P7iFw6Qx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44rpwX6FhYz9s55 for ; Sat, 27 Apr 2019 21:43:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 593A1C21DAF; Sat, 27 Apr 2019 11:43:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C97C4C21DFB; Sat, 27 Apr 2019 11:42:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EE1C3C21C3F; Sat, 27 Apr 2019 11:42:42 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by lists.denx.de (Postfix) with ESMTPS id BE1C6C21DD3 for ; Sat, 27 Apr 2019 11:42:38 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id o5so2792772pls.12 for ; Sat, 27 Apr 2019 04:42:38 -0700 (PDT) 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:content-transfer-encoding; bh=IpZFneVy9JVt/DR/0/w8JKHfiyseQp/ECVAIuWSjprc=; b=P7iFw6QxSLhZm9jgpWUOKRq4lbEqW7Ge+2xGOW3kgrKAwJHYmiZkLLA1a0xwciTVjB QDIaRZnH48MZfL0PsJNMgaxBBw5aEqaE2k1V0x64VIDrxleobecO1J4zpgr44nFDzK57 DNt72PQGcvxdpJy5MUDGkLWmuHm59LNUqXCWM= 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:content-transfer-encoding; bh=IpZFneVy9JVt/DR/0/w8JKHfiyseQp/ECVAIuWSjprc=; b=bl3BeyaF1na+WYcR6QbN0OPWLksoUpGgUpZDm0ZhGCnh7vOfIuUJKgHKDzmcaQA05t I+kLr6smH00rAyoArR3oscOQSzgCoGU2a7w21kNYKipDxS2JO41YQnAZYGE+JHBmiEHz PcQ+3Meu4we1ZHgMOAcd5fW1ZmrLGlNHw7V320wesgKQ30BJjnBnY2LQQTfC20EUJZVl GQmtM9CBBwzhqBbS17c7s29+n2V+DmrySwB8qojdJtwhNI8cQy/EqcislanN0nsKWD4v WRXMgX8hJE97rfagXNZ/gRMtJIqXW3ay7RWAmb4gPTo+Hw5DQI3jZMCrTgcr0oOdEsg+ JIVw== X-Gm-Message-State: APjAAAXf2+ZQ0S3z1rwE1B5vHDFprn9L7DChxMg3TyRGRMWUv4bwYRDa nfA9WvPpFWQzh7bs7Dl1Y0RQNOW27b8= X-Google-Smtp-Source: APXvYqyNVOaO26g74eTbHURxCFOa42XUldQnEY3hqlRb5p38/iPsJO+c3RmJ3W46uzwF4uFYSTVm3A== X-Received: by 2002:a17:902:820a:: with SMTP id x10mr12306899pln.316.1556365357360; Sat, 27 Apr 2019 04:42:37 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k79sm68958973pfj.28.2019.04.27.04.42.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Apr 2019 04:42:36 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Date: Sat, 27 Apr 2019 17:12:01 +0530 Message-Id: <20190427114202.7358-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190427114202.7358-1-jagan@amarulasolutions.com> References: <20190427114202.7358-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH v6 2/3] arm64: rockchip: dts: Add initial rk3399-u-boot.dtsi file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 better to maintain these u-boot specific nodes and properties into seperate dts files. This would help to sync the devicetrees directly from Linux. This patch is adding initial rk3399-u-boot.dtsi and move sdmmc, spi1 u-boot,dm-pre-reloc properties into it 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 | 12 ++++++++++++ 1 file changed, 12 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..0786c1193a --- /dev/null +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +&sdmmc { + u-boot,dm-pre-reloc; +}; + +&spi1 { + u-boot,dm-pre-reloc; +}; From patchwork Sat Apr 27 11:42:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1091913 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="J7gPbzS5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44rpx573rGz9s55 for ; Sat, 27 Apr 2019 21:44:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9A2FDC21C4A; Sat, 27 Apr 2019 11:43:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 91ADEC21DD7; Sat, 27 Apr 2019 11:43:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5DE55C21D74; Sat, 27 Apr 2019 11:42:46 +0000 (UTC) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by lists.denx.de (Postfix) with ESMTPS id 5978CC21DEC for ; Sat, 27 Apr 2019 11:42:43 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id g3so2995920pfi.4 for ; Sat, 27 Apr 2019 04:42:43 -0700 (PDT) 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:content-transfer-encoding; bh=mDlOKbc2vLQOvRZdD76W9yxNTBh1swonSvJjMNV8S5c=; b=J7gPbzS5v+7uzbVR0YQKbSK3pEeZF14BosTi7YQuWSlv8+MEof3h7vZOl1+uwe1W4x 5kirxqKVpYGYWB7IpM8MGWzpXX6y1VYdT0sbVEdf2/mc+OqbX0lc2QWthNeAOaEwLFU6 ykjcu3/NzIg766iCGI2kdnCOTVOzd2DT/ZGjs= 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:content-transfer-encoding; bh=mDlOKbc2vLQOvRZdD76W9yxNTBh1swonSvJjMNV8S5c=; b=sB6VdJ8XDMQftp33Sjyn7MMQBodOjqWruYGutap+Slie2pwPiL9MGpo7OjyDrA+c9+ mBn6s8+1JUGRF+/SeaVFdGNaRUDiFL7XgvZBoalomTRZqx8+tc8kMWlgcyTX1G8A+iHx 2xvOKuTf2k52poQPnnNrAQbSInuMtG3ezjJG/luc2uLH/OqgHg/vWPIbTQN+ep3MN+xS g2XoZofrODWo1AD9jBpHGY/8PFydYblhrKW7y65ZZ7a4hl+zVQWY6PQ7zUtPEwwR2neT Hcws9xm2wlWAABkQSmvH7DuRgt7waaeCRtBPrhEOhNtmuSJoiDvJPJrb+y6lSmwvB6+S sC6w== X-Gm-Message-State: APjAAAU85IXVzpSN7KAL7YPtiDkAdt90m0zoWovLLYPVULP0MBcIgNL4 AyXMFvI77/FHKT7ia6XM648I7w== X-Google-Smtp-Source: APXvYqxiYHmWVn4Q9NmtcYzLUCQwmgxUI6wwCJ4E9IQA5uMXjeiyOJVK29o5sG0i/BED3DPMlRKx9g== X-Received: by 2002:a62:1d83:: with SMTP id d125mr15918500pfd.74.1556365361934; Sat, 27 Apr 2019 04:42:41 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k79sm68958973pfj.28.2019.04.27.04.42.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Apr 2019 04:42:41 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Date: Sat, 27 Apr 2019 17:12:02 +0530 Message-Id: <20190427114202.7358-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190427114202.7358-1-jagan@amarulasolutions.com> References: <20190427114202.7358-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH v6 3/3] arm64: rockchip: dts: rk3399: Use rk3399-u-boot.dtsi X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Now we have - board specific -u-boot.dtsi files for board specific u-boot dts changes. - soc specific rk3399-u-boot.dtsi for soc specific u-boot dts changes. So, include the rk3399-u-boot-dtsi on respective board -u-boot.dtsi and drop the properties which are globally available in rk3399-u-boot.dtsi Right now rk3399-u-boot.dtsi has sdmmc, spi1 u-boot,dm-pre-reloc property and more properties and nodes can be move further based on the requirements. Signed-off-by: Jagan Teki --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 1 + arch/arm/dts/rk3399-evb.dts | 1 - arch/arm/dts/rk3399-firefly-u-boot.dtsi | 1 + arch/arm/dts/rk3399-firefly.dts | 1 - arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 1 + arch/arm/dts/rk3399-gru-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-gru.dtsi | 1 - arch/arm/dts/rk3399-puma-ddr1600.dts | 1 + arch/arm/dts/rk3399-puma.dtsi | 3 --- 9 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 arch/arm/dts/rk3399-gru-u-boot.dtsi diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi index 7e2c57af22..20910e744b 100644 --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki */ +#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-4GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index 2366e7ed3a..a506e8da37 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -154,7 +154,6 @@ }; &sdmmc { - u-boot,dm-pre-reloc; bus-width = <4>; status = "okay"; }; diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi index eab86bdb30..67b63a8352 100644 --- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki */ +#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts index 5d52319393..a4cb64f8bd 100644 --- a/arch/arm/dts/rk3399-firefly.dts +++ b/arch/arm/dts/rk3399-firefly.dts @@ -591,7 +591,6 @@ }; &sdmmc { - u-boot,dm-pre-reloc; bus-width = <4>; status = "okay"; }; diff --git a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi index 9edb8cf841..726f396f32 100644 --- a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki */ +#include "rk3399-gru-u-boot.dtsi" #include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi b/arch/arm/dts/rk3399-gru-u-boot.dtsi new file mode 100644 index 0000000000..7bddc3acdb --- /dev/null +++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-u-boot.dtsi" diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi index df19263acc..8b3d90fdc6 100644 --- a/arch/arm/dts/rk3399-gru.dtsi +++ b/arch/arm/dts/rk3399-gru.dtsi @@ -545,7 +545,6 @@ ap_i2c_audio: &i2c8 { &spi1 { status = "okay"; - u-boot,dm-pre-reloc; pinctrl-names = "default", "sleep"; pinctrl-1 = <&spi1_sleep>; diff --git a/arch/arm/dts/rk3399-puma-ddr1600.dts b/arch/arm/dts/rk3399-puma-ddr1600.dts index 337e0eabb4..42763f82d0 100644 --- a/arch/arm/dts/rk3399-puma-ddr1600.dts +++ b/arch/arm/dts/rk3399-puma-ddr1600.dts @@ -6,5 +6,6 @@ /dts-v1/; #include "rk3399-puma.dtsi" +#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index 8304f67192..2712ab6826 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -492,7 +492,6 @@ }; &sdmmc { - u-boot,dm-pre-reloc; clock-frequency = <150000000>; max-frequency = <40000000>; supports-sd; @@ -648,8 +647,6 @@ &spi1 { - u-boot,dm-pre-reloc; - status = "okay"; #address-cells = <1>;