From patchwork Fri Apr 26 17:26:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 281 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 04A823F033 for ; Fri, 26 Apr 2019 19:27:23 +0200 (CEST) Received: by mail-pg1-f197.google.com with SMTP id n5sf2490102pgk.9 for ; Fri, 26 Apr 2019 10:27:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556299641; cv=pass; d=google.com; s=arc-20160816; b=IqDnUwJpHAKvLXaB46SORTyDGBNGOCL6Jaxu+k5hiqW2e6mSUR6zFjMvp2NATtY3qI y5giGAFFDB5hcSLubn/pevSA2+RBsLLMg6cCi+teKHHejyK89b9X8QmVNWWEOBOTRcgJ Uyf4+F8xwL8kDsb7vvWfMi3u7HG8t1qWu4DGYwF9/hwycMO7BPeAeCEDE5EyuU7wWwqH RCQ5KoHrzl5224Haxr38qcEtLEPlgjNzpuPeNwev3DvRZJXr/DLtz0fuAYHOCBNPCjVm NeuIvhPAYZCAy7ED7Q8AQuhwmdQz6eOhqDs/bUHn+1Stv79cLvsXkiAvnAdPREalC6hQ AFSg== 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=EE+7+UEXbnYSvYfe4LkUHc9gb+Jg7kaB8uwJ5fSBzSU=; b=cfy0f7zHibD92Oj4ogKP28fsTImE20EmUk6h4AtpKpyJjf8e7njnArVPDAwUDheuhd 92GEaLl0+lVFUxdkBbE/iHtHqcEgNiQ5rDysCYPIvo+AKHF4VjN4u5DnyeihTc3rLcv8 aa12jKEUUlY5FKH0M8uHwPwg7Skwu/hmdKqkpnY+XsqJpTKNDw5rtjAAbqyFqr4vhAVZ hPyD2J5JbfHylkXxjWewzF1Kcu01IWltxsnNUEwgRC5ZmL+AOcXgfUWxG88NE7GxDHfk 8p+rNSDaVITya3jCgpNEFJvtK3zjZFbCJvK1BpXspbfjAK+P7MqTwq/swjTr5E/LrqxD YwBw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Iqv4qKWN; 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=EE+7+UEXbnYSvYfe4LkUHc9gb+Jg7kaB8uwJ5fSBzSU=; b=rWtuKKIIPiYy8alriFENkJb3I6nP+ILnkIuBKkpaBU0wA9nOj1a7ZuqJz5Tw9BmKBT zmZ4AcGiWFsti8J144ekIeGGd1bAtDdfJQgfnzbXAaVz6A2UoTQ469Et4/fcaEge6VVx Pa9XXvTWsLF/e5AjJlgiA/dfoqmWg5K6L4bjs= 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=EE+7+UEXbnYSvYfe4LkUHc9gb+Jg7kaB8uwJ5fSBzSU=; b=FBMEsNh8mj7NXK6xoEFqSSw6v0M01tjIRjkebilJkKDG0UZkZuA3Om7xpr+kfTFW6j q1wRZbf3TPf974vy/Lp4eTj65G8Q488rkF6S22pEoytKiOkDxJlBuAD61POBs7+WzM/A B/S91Re/Bdm0ceHTddL9bIKOayb/aJFPqA9qnThLI0gWBxkNUO38cdF0F2ERzsmh+d0K x1oAmYzkGd9Urfs+j8j7lyXVpEeXpZFCD9WBJArDt/yjyjpsq3BdSHgGutIWR4eqjNEx YY9dqZqZ0xQThTWU/31ug/3klq/ha2GK4NiiAEOZ7zmRZNmMJOR8PN+whUBPPO4n7wtY Y+Lg== X-Gm-Message-State: APjAAAULv5DnDqBQUqJY/Ha9zf6zsFNG6PoqZJd0d5heTuFSV9r0UtfU H5d0fyQ0q0aycCBg1KSg/7HZDvdk X-Google-Smtp-Source: APXvYqxDWrZQV1bOZ09bU20FJ5Ed8fuSFZoDLJN/ExqRwC53PlqCR8CHmKCf1DmUfs4bcy/CnG5cgQ== X-Received: by 2002:a62:448d:: with SMTP id m13mr49549015pfi.182.1556299641614; Fri, 26 Apr 2019 10:27:21 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:7581:: with SMTP id j1ls7207760pll.9.gmail; Fri, 26 Apr 2019 10:27:21 -0700 (PDT) X-Received: by 2002:a17:902:bb84:: with SMTP id m4mr11342944pls.302.1556299641213; Fri, 26 Apr 2019 10:27:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556299641; cv=none; d=google.com; s=arc-20160816; b=ab/L/txEvjeqFuc4XpZIACKXTckGPnjLZWuHd+w5qQu6EgL1Oqh6o7lk6o1PVT5RWx ZOlYLoxFGF4mad8Jg1YMWPRj3XgRLMvEwEc8QKwPfqSwRG24n6s7Rj416jBSHaeLC0iC 5KG0Ntv29vJZel5zDlqYMilOvr9x22IbJxmK2mYBFOWE6RJONcYT2uetMFq33a1pAEEi VIb9jum1h+0ls1kW6kDWSXcmaFTj29tqOk13GdCwoYBizI5GjCiqERcseKm6b1Mh3ZM5 0uXz5poEsnEWZbdSDTupf1ZqXgCZAP0Xmwo2YCKGJolodVrymgP3m/pSfnvW3stloUED Fn2Q== 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=Hu+Ktl2rpa0ZJLKAbjjAbkz8EryEx9BDrE50TMhTQQo=; b=OxpcsLHqFd69KCAya7X3k/v0o1DvekOa7PiOlzev6SJiabT55DCd/bbEr5vTe0uCpm YALWR08mwjszA5hO2NnheieGAa1nwV9cWWXiGkF6Cqy5QtDYb2mxn0ZRZf9bSpqTqYja vFJm2r66J6WzB2Q8Sbfc2JJs2CvWuWB7J1IP7lrdU4U2UjBH0hd2YIP69+7rCSAuxSoY 4Tfzx9Yoq6+kd2bW24nxzIHrWKr9f3JYjTuNspSkuiR3tdBAuv2SmYkFIgDNmfoJvTXB /HgVl7NSxajNdywwY4fDff6yW/uUeK/nsVHRNp3Mrcfd6NqsCa8m1yiQVEyY84V9WgBU 2sJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Iqv4qKWN; 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 4sor1297381pfd.25.2019.04.26.10.27.21 for (Google Transport Security); Fri, 26 Apr 2019 10:27:21 -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:a63:fe4e:: with SMTP id x14mr2605869pgj.411.1556299640849; Fri, 26 Apr 2019 10:27:20 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id a129sm40807630pfa.152.2019.04.26.10.27.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 10:27:20 -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 v5 03/13] arm64: rockchip: dts: Add rk3399-u-boot.dtsi files Date: Fri, 26 Apr 2019 22:56:47 +0530 Message-Id: <20190426172653.2930-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190426172653.2930-1-jagan@amarulasolutions.com> References: <20190426172653.2930-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=Iqv4qKWN; 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 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. This patch will create all preliminary infrastructure, like - create rk3399-u-boot.dtsi - create board specific -u-boot.dtsi files - include rk3399-u-boot.dtsi - move sdram dtsi into board -u-boot.dtsi files - move sdmmc, u-boot,dm-pre-reloc - move spi1, u-boot,dm-pre-reloc This would help to - sync the dts(i) files from Linux whenever required instead of adding specific nodes. - easy to add u-boot specific changes like binman node into common -u-boot.dtsi file Signed-off-by: Jagan Teki --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 7 +++++++ arch/arm/dts/rk3399-evb.dts | 2 -- arch/arm/dts/rk3399-ficus-u-boot.dtsi | 7 +++++++ arch/arm/dts/rk3399-ficus.dts | 1 - arch/arm/dts/rk3399-firefly-u-boot.dtsi | 7 +++++++ arch/arm/dts/rk3399-firefly.dts | 2 -- arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 7 +++++++ arch/arm/dts/rk3399-gru-bob.dts | 1 - arch/arm/dts/rk3399-gru.dtsi | 1 - arch/arm/dts/rk3399-puma-ddr1600.dts | 2 +- arch/arm/dts/rk3399-puma.dtsi | 3 --- arch/arm/dts/rk3399-rock960-u-boot.dtsi | 7 +++++++ arch/arm/dts/rk3399-rock960.dts | 1 - arch/arm/dts/rk3399-u-boot.dtsi | 12 ++++++++++++ 14 files changed, 48 insertions(+), 12 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 create mode 100644 arch/arm/dts/rk3399-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..20910e744b --- /dev/null +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-u-boot.dtsi" +#include "rk3399-sdram-lpddr3-4GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index ce004d0d18..a506e8da37 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"; @@ -155,7 +154,6 @@ }; &sdmmc { - u-boot,dm-pre-reloc; bus-width = <4>; status = "okay"; }; 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..67b63a8352 --- /dev/null +++ b/arch/arm/dts/rk3399-ficus-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-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..67b63a8352 --- /dev/null +++ b/arch/arm/dts/rk3399-firefly-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-1600.dtsi" diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts index f90e7e88db..a4cb64f8bd 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"; @@ -592,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 new file mode 100644 index 0000000000..f0d31edefd --- /dev/null +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-u-boot.dtsi" +#include "rk3399-sdram-lpddr3-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-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..b4fc2457f0 100644 --- a/arch/arm/dts/rk3399-puma-ddr1600.dts +++ b/arch/arm/dts/rk3399-puma-ddr1600.dts @@ -6,5 +6,5 @@ /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>; 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..7fb5072a9b --- /dev/null +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-u-boot.dtsi" +#include "rk3399-sdram-lpddr3-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"; 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; +};