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: 291 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E95D53F08F for ; Sat, 27 Apr 2019 13:42:43 +0200 (CEST) Received: by mail-pf1-f198.google.com with SMTP id g1sf3912013pfo.2 for ; Sat, 27 Apr 2019 04:42:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556365362; cv=pass; d=google.com; s=arc-20160816; b=Ort0BSuC8ZwjbGSX9yIZgpBug6x/ZXPCkccc949cmd26faz3FR6EwPdG6W50w8gbN/ Coqfv8313/JruRqFlGXDbNPlU+7WNTrRudAMEMsw70Wa/O2q67sdFKfg9rISfTO11mmr sFqdeFmCZ8buWaLD2G61hejm8X2Rnhjg1+oWk/+L7eW9OeLZLMEH+gBu74Jbkmixkshq YzxcU486nvcDYaad+fJqJACxgQErQJv5TSpuC3x/3kcYV9JAPMGcWwHnTfnfvEHnOP5M wmcL7l9Hg77apcm2kWRmnJYCOGQvuGGumjJWC3y/loBhiNYUHUE2tXmRiFmBm+njEMJ3 yUrg== 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=DjOw0Jr/C4mNV0osZLT1iN0ev6qoo/10bFuJ3ru9FxI=; b=cj079PAJ9EJ6hAuy3PnPZj4XcdE4NbFk5EKkCz8TPQg58no5li08oMjrKwUlE2EkFm ttzLxC2VlhXnATZhjdhm5bVZMztKe0GAsnA2oW9TxjOOHzqyCIbNMeqTTcLHyiMhb1rR OE+pF7vMl/F3BWXXeTi+2NYME6E+gHXslFEOo3d/237KsV+PsoVRSE8Od4UztfxQp7Pb qaWx59sXUA11PtbZQTGUO2hNG+Nxqk0uiIZzI1K+M9PVqEzlp/xQ5qbuZNu72fQVzGob 5gXKsU9RxqhlOUJeJ/oB6mUkYRxe9f27Ip0LhU+u0S+FVorVALWKVqkK36Z1Zspo2Mwa Z9Pw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=J7gPbzS5; 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=DjOw0Jr/C4mNV0osZLT1iN0ev6qoo/10bFuJ3ru9FxI=; b=cvBs9k0kJ0HWDmNIYWpf/f09y+q+qawquHvytzceE3i3lgCpfYgZ4g5ZSs156TMuoA 9oT1kfjUaP1DaaGT4wrnUg89PJQ0z4FD1RvzYmMSvGFXQniqYuuhoHcrUU8kcukdNr53 uyXdJkQ8uZxh0yScI8NbeRa/jg4x1RxRlIH6M= 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=DjOw0Jr/C4mNV0osZLT1iN0ev6qoo/10bFuJ3ru9FxI=; b=O6N+ZludwjdcudKsHvD3une/JE7R8FcjB5uWrrYHyuin+LhpK7viQgj1pd2tQaWbom vbKDO83wJMR4wo+ZAYwMpls9jYteHSc/7sPbQtG6LW8u4NHpx/y76n1JXlujD8QDGnWs 5z/KBlJPMq6lRtm24Y/IoQlBWZC/MYL/IO0Upj5UljikzFJZDiaJX7VFoNu+XFsnbWAj 24rMlC09jEdqAgzQBeVY7cur/oI504ExUrSmp3GjrIsdGTe0j2m5h7lxbYA3hReOw/wh X7zZGwbOykf9lNMpo8UB3+/KW6HWRVd633RUihs1pab4z4n0/UU57Z8CITVqDYAiLMDr HuSg== X-Gm-Message-State: APjAAAW6/HAeNxgH+kwvotDZYuNClZc5mfV7T8OdEiVCPCu5o8daVVIu TnE6HXFHpFltVmXF0GV3WoMb4aY3 X-Google-Smtp-Source: APXvYqwXClEufZLnux+ebsh5oyQFTTcMb/X3R55X7bhseWE4vcxR0p8mZVX4Nbf6FgJsCmFqDNhtWg== X-Received: by 2002:a65:63cb:: with SMTP id n11mr16946624pgv.236.1556365362741; Sat, 27 Apr 2019 04:42:42 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:5681:: with SMTP id h1ls80925pfj.11.gmail; Sat, 27 Apr 2019 04:42:42 -0700 (PDT) X-Received: by 2002:aa7:9e5b:: with SMTP id z27mr30390325pfq.186.1556365362382; Sat, 27 Apr 2019 04:42:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556365362; cv=none; d=google.com; s=arc-20160816; b=NqFtro337z6+QjNkV14Sw/tmcGKajU37I5xG3/nI/rIXdVuAIv7b6wLrqlLO6YY6XJ rYRkzVgCBshinyXEWvECqoCkeqdVByKVRf0XQsmEBHgFjA/sXuAQAD09E0pYvhS0K1Vk WTcY7rWmBJlIGPnzxTxn8tDAxdhAZJ6YvrCL2L6B3C/9FR7DGrI0+8KLPzAwyFT7HKve jQlaAxs3FKm+fdDWcRaiapVXFP8GqObaImWkMh0jz0o90WLp50sAFxkAMzJ33OiuJSvs sjpNb5EyHBG7sXBPtE8n05PaCaKU7mOQ7l8bG/lyJRvtLzfzIa61H4Qa/KtvwR9vj7Eq prcg== 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=mDlOKbc2vLQOvRZdD76W9yxNTBh1swonSvJjMNV8S5c=; b=Z60KcN54o1dFK4T8+o/yNFam+LHgwRPSjVqp5mum1hEZVCzsspefTs9+9eapwqxgOt 3raag6c/pr5jYBifi7aYCSVx+BqXAbUPTWT65EODXLmDa5xU2bGfhAr3yxBY1XUD2tn0 WvCkegTkQQFzuPe5yW9MIdiDi61p4Yoy+klV99Y0X6HdA3X8CcXe4hVvYHDyLq43hJ0g 3Vsa8pG3567qiJpPbXhmbQWgIqqqPHjjLo2HB43PE09jhSazwedV8IGuvn9ESUNxBHlj m213MSzI6AzMINu/LFaDLeIs8eGfthkQEKmOsgDRPjEwZU7GSxEq1jbaRf4tG/WJAdcb WgPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=J7gPbzS5; 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 187sor770162pfb.0.2019.04.27.04.42.42 for (Google Transport Security); Sat, 27 Apr 2019 04:42:42 -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: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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH v6 3/3] arm64: rockchip: dts: rk3399: Use rk3399-u-boot.dtsi 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 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=J7gPbzS5; 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: , 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>;