From patchwork Tue May 7 18:21: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: 359 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id AB86D3F066 for ; Tue, 7 May 2019 20:22:28 +0200 (CEST) Received: by mail-pg1-f199.google.com with SMTP id h14sf10772747pgn.23 for ; Tue, 07 May 2019 11:22:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1557253347; cv=pass; d=google.com; s=arc-20160816; b=QQI46ez7Tbo+usz58Z2XwkAThVBJMGnWiaqxb3RQxdMHvY9Ds7qp5N+ujTVI5QMXpI S1J5EUpGEaeW0YLbrjTynZGRQq+oCBmZiHyFPQkbU8iw1OzhTiuDxKfw7bVRFSHQTCDU eq3nD/8WXjfpiG6cgDFpAOpK4TqnX8bdYjaO9E3gsnXFAI9N22XeRFsqTFYi83Qm0rMd 2MWXLhhkHepp8N+ZquLQWHwmNxkoz0xhWufFJyNdfbxHaQ8WHEN9Mb4LatDHLdWT/imT ZieaEtLkukT27TuJcLRiV9i7ahZgPJwLlM4WDpW3IH61jX3YBOaGmKcMKwW6LzvY5ZbB Bmuw== 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=eW1Ivl9i74+DO2C4f8eS+mVJpJnQvR7oCfLRT1/kXGQ=; b=nH3hakrnEMekx+4Yedin54ArMVHfyVIHNZZyxr2MtrieGT03TynANFcR4XhzfsdCP6 CDRn40+2t6Vw7qqezlonCWTQWwl/0wIDRsrEn0jBS438aGGjjKA2Q6Te4UyFXDos+z8b NmzzBD4rqfoBitNNXNdeJAEMzCUQZDjffUTzNSNtR7jq7AMUl2MvIEzdFQmVuABNUkZU 7IYjx6CquzbBwpLeUu16RzZjtSliTIoi9Luh0Ujnkw9/v4sBvxVUedNNO5Dg0dzhSrLf gbbK4j1cp7mPPzrf3iurQNPLDI6SsVqszyEian8N/AtXnjP5qdPOIZynF1Pdw0tiTeEh K/rQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KEPQv+4N; 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=eW1Ivl9i74+DO2C4f8eS+mVJpJnQvR7oCfLRT1/kXGQ=; b=b2yeyur9y00O+TIlrJPrSeWHZURxZTUy9uvd2xUm30/vzo/u2pm7xgo7yAaTK1X0ct jy/N4W9vGvyhHyYCNxjb3mkHouK+sFv7Eal88XSvzQWywfovySz6MgZB0LtpA0SJkhD/ DKGuf/kYM02Bu5HDQklbaXCIHJOQb9TOGu5qU= 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=eW1Ivl9i74+DO2C4f8eS+mVJpJnQvR7oCfLRT1/kXGQ=; b=jka0aqMRRjMwPcpV85whePmvXjPhsaoWtuqhGRM2AFLWxMaoZlERhnen9ZzbYM0jpO KX82stxZBkvqRtqtVoU3JFcaq4FCwifFLVmDUZJbCFyPEWMP9j1l+EX57TsqPjALo1lT 8omPrP1aSBB7t8+dTfJMwtIznAHjKWo4zcDIo9aKNb6H5NfHh2/IU3UlJWj5uU4IUJBD OkdUUoCdlccdHPqRwO4U/WZ1KZfwkn+TPOwn7sfZd1+lfFpUQz0HjOhmFXybhB/UOqJr u8y2Sx9klRM+rYL6RUwMYmgNltHWh2WYixfRHE8CjZZBHrqgrLE8CNj+j4VCCguvluR1 HvjQ== X-Gm-Message-State: APjAAAXp+9KW7nGOjnrxGd3zGHsQQ+ShYh89nyY38o4vPGglJfIRys0B qh220UJ4eizxcTcyVCpDyVhv40Pw X-Google-Smtp-Source: APXvYqyy93PM8wocPJO6m/UFj+6OouTJHgcN9gT9oImz+WcwjbVUQqMXoVKz498i0NuhrT98u6tNpQ== X-Received: by 2002:a17:902:7247:: with SMTP id c7mr21757884pll.65.1557253347492; Tue, 07 May 2019 11:22:27 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:868e:: with SMTP id g14ls4292567plo.15.gmail; Tue, 07 May 2019 11:22:27 -0700 (PDT) X-Received: by 2002:a17:902:b10c:: with SMTP id q12mr42538059plr.254.1557253347120; Tue, 07 May 2019 11:22:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557253347; cv=none; d=google.com; s=arc-20160816; b=o/C0UxdGeKPe7wkcNp/R5Fao9dQFuZ6BJQq35Tq9BQVfszu7gyATjrlD/KLySpcfGB cjXcOIjMwXDI/iadWh1LI2F7MbaZT7rI9yTR7xJsfg19qY+dCy1M2NNn06Nespmnikhx W1GrrNOPuYKDeupuN0Zrgf9/cTd9ZFmAuqOaQnPMHkpIR+yrANjsoqJffFMz3hI78Q00 bfw+64rCHEJe+jiBlE0m/z3mQD0EbXUcxab764gza5I4iIrVUzTYs/wDnC6GDbOH2Z1m O1IfcqbqCNrHJNHF7lVGSVLkP2Jv+iEyj0/lpihvNRQlxAyeVad9B9SeV0xW6w1M/KpV rLPA== 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=0KtfW3TKs04iSgV5KPgv8zThhCUdoKHESc98JGCWyiY=; b=AOHcW1JHvqaz/RjGYr7C6wnx4qdXPC12Gr020Gm/h7Qep6JPJzfFNuf68/vroh+ZNH uDd7ayYvEUe6yBzw5l8hQs3RH7NO5pARg/KvHIzAACcL+8NXNPryWEHLVp99RJwJ6FYF Mhsg2MfsiftXayoCt3cXtwZSnThTgYEBHszZA5+jD/wUW38CuAI2lqbdAc1Iin51psLQ a3EtM6tNIHevj9S+GPLnnY/n1vLgBfEwfpRzzyrZnDZJIoPcmjZ7K5F+7HbN7JlOR3Aq CcBj0WitN9G9fKP/T+XmOoRCr7qx8fMu8y13ga5mK24eq7X9rO9HzKfCMkTQPd0bmolW kpgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KEPQv+4N; 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 t10sor16724911plq.14.2019.05.07.11.22.27 for (Google Transport Security); Tue, 07 May 2019 11:22:27 -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:7e4f:: with SMTP id a15mr5507082pln.205.1557253346781; Tue, 07 May 2019 11:22:26 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id d15sm18491568pfr.179.2019.05.07.11.22.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:22:26 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH v7 4/4] arm64: rockchip: dts: rk3399: Use rk3399-u-boot.dtsi Date: Tue, 7 May 2019 23:51:52 +0530 Message-Id: <20190507182152.4254-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507182152.4254-1-jagan@amarulasolutions.com> References: <20190507182152.4254-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=KEPQv+4N; 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. This would fix, the -u-boot.dtsi inclusion for evb, firefly, puma boards that was accidentally merged on below commit. "rockchip: dts: rk3399: Create initial rk3399-u-boot.dtsi" (sha1: e05b4a4fa84b65a0c8873e8f34721741fe2bc09d) Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 1 + arch/arm/dts/rk3399-firefly-u-boot.dtsi | 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 | 2 -- 7 files changed, 10 insertions(+), 3 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-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-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 4cdb4320b7..ca0fc391b2 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 319a610022..897e0bda85 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -647,8 +647,6 @@ &spi1 { - u-boot,dm-pre-reloc; - status = "okay"; #address-cells = <1>;