From patchwork Fri Apr 26 13:34:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 263 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 6DE263F033 for ; Fri, 26 Apr 2019 15:34:48 +0200 (CEST) Received: by mail-pf1-f198.google.com with SMTP id n63sf2230819pfb.14 for ; Fri, 26 Apr 2019 06:34:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556285687; cv=pass; d=google.com; s=arc-20160816; b=zcaXtwB0L9rJrvxfOBRlZy3ICOAeCdZ8OagnO0eGhtOpOWOQMLOtdHUWNriE20gguK aUPVhEHDm3HihTZBP0aD3gmF/qGu12ksXgQkNpGD1sLQdHOoW+ENY1MG7uic0v66skio H1MWXoIJmHS9sRP4xl5rU246gkd6AaimQW2ounal/thQDoTEcEN2uN9i1S4PNcgMVMiF UnqB3pjR3LZmNca3y1X8SOO3ZeRgXX8mPPCvfxK4cmak5PMSdA0UR/N555sIaRkLYQ6b LDKSWK+FH5xFsmaaaZ+Wgke8Q9m8UtGiNEL6ZnDdJzVWUL4tXnzfxQzv+HephOWFOB8z Rjrw== 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=p9rZsRUcrKJpchScabYB33yARn50kFY00f+dvuoaNmI=; b=dLDG2YvYe0yYl8Uq1IQL0jnT3UUpA+mTEPhBlZktC6Licwds0oLk8napwhbyL3XTS2 rdmQLPhaYrXA5bz1IHwUEdM4lEq5Y9wFILKarfweC5Eos5CcTJGzR5lrkA8xaIhAiFa+ 8crT9d1AGW4jlCb5smZtWbtpqoz3rSHIZT+nruBKBKyRJAvi77bEIX8XOMk+5zoZ68aQ 5aXyriQ5apvFBdr6UZgA01Sg+b0c3x5mvIcsgwF32Ulk+MDBtMwM3h4ju/bKAZU2wXBv 2gEq4Dkn9reo00uBOeYED1q8H+WVlgHZLW0eXm4eXTD5yWw7IgQV3YbPzDpxi/tuKGhx zSJg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PvqYNQLo; 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=p9rZsRUcrKJpchScabYB33yARn50kFY00f+dvuoaNmI=; b=WPZMFaa2aR/rAwJoyo7mSfjKB6WXqQV1yDVym6IY2taPZ5AXanEzLAptZdoHhqYzLL CpgfTs6822rZT31qKBFwGaaU3KI5vBTC1mb9NfUknDzc1kjmrbb6ejZfx7nTOZDVgW57 TJ4KEIkp75y+DDMMbi688i15hIpQneFKd4aik= 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=p9rZsRUcrKJpchScabYB33yARn50kFY00f+dvuoaNmI=; b=Nv1oIN3qMHW+b1y04GeVvrYI/Yvfkrj79SwZBEivbwxJOI6c1YVI8qaLTVwtK7zYIu PSDyEiB/K1exFDTlb63iodIjUeL6LCDRA6wKCJjfvuYKwLtpDOwHdUwObqeWfFdeHqEx jFHLOa+cLZ5emi6f1KpZWbvfXw0HC1dKYtS0YYCjU+36vfoyh/EObvV5obC89C11jnk+ pUeoA11VFALfEdM7gS7t5fN8KFjBDivhJqyNPhFHnCchkH2od1fhdkMACo5FZYdBo6TB UotUd7GBKRVM/h08cCZfNeA/TaF3N4aHUuhVBimcMfx9uZegukh8eAnRGorDVNi22Zf1 Ga4g== X-Gm-Message-State: APjAAAW8jTMXsy/EESGzTowxUQBvXwrhHTnRp23JIo2TVkdmnSsUDUWU O96O8gn8tefHazMxNvRWA5eGCsR4 X-Google-Smtp-Source: APXvYqy+fX731++nZS7gtwbUEp2hPyHmJSeVwr/QHwGhCqVhiFZzEWVkjd68hmhaCsKMdpy0/tQOoA== X-Received: by 2002:a62:1d83:: with SMTP id d125mr10563682pfd.74.1556285687210; Fri, 26 Apr 2019 06:34:47 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a65:450d:: with SMTP id n13ls6399350pgq.5.gmail; Fri, 26 Apr 2019 06:34:46 -0700 (PDT) X-Received: by 2002:a65:6108:: with SMTP id z8mr43527325pgu.106.1556285686743; Fri, 26 Apr 2019 06:34:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556285686; cv=none; d=google.com; s=arc-20160816; b=Z8PFhY//RgP7XlmQLL/CTlsEy6lVboXPF3YJofox8xMsx9g6NYKC7F/J8pGAmuFV0i 603LVpjhPwa6pyWcPzDSImGRcORWUpy0/vYyMh78mZNFctCCfN2wioghif+rgcSjBiQI yK4JsqSGXZDn2HLxE4KYbzdoA/nwIpt2xBgH9xwiL7NQxC7HTXTTxIV7FgHyTlPafCr5 JfibigC3Mnv5X8Zol/fa3xtjrEKYrbe+mSZr3gkRIwASnH0fR4Bhk0+vEgUR5FFbq9vG +dNiR8m1RWn4pzGjIeLToR6XPlMr1TaACzyXriMMJSlYR+9hTR55gfupGjIxix9az+KY EaIw== 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=DOYcE2jBsaACz3HvBKiQdfAKk8BFPbwKPna+LoxS5hk=; b=Hyw9+5nkYns5APq6XRt5iNETgNDdnrIUCLwYmbJoS0M6avZy300P3P9TYF81kg0/MJ 2xtZM8ekxCkkhnkUwGntbfC0CqIZmPiYp07hoAfXbYL/eALO7bP7Ab0WMirGZ9pwI1DZ nQRqqGsNsnnLIOJkYZAQft316ez4cxWTSmdZYc4ldcD+uFyicnXFNUW9ZOtSms4YaQw5 hHgA0eWr6u9z7XGYNOnf2BSQFqlOJVmO94RPqvVo/PHEM067QwmIROs/hwRn3GfAHZ+Z 3KSs5LSQwBB0XiQ2P1Vk1I9V+aroj0Mzdke5D2d1VUBRELebe7Xt4bnm+6KgztA3YVog P91w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PvqYNQLo; 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 x18sor28619103pfa.69.2019.04.26.06.34.46 for (Google Transport Security); Fri, 26 Apr 2019 06:34:46 -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:5a42:: with SMTP id o63mr48840880pfb.170.1556285686377; Fri, 26 Apr 2019 06:34:46 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id y19sm36946770pfn.164.2019.04.26.06.34.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 06:34:45 -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 1/5] arm64: rockchip: dts: rk3399: Create -u-boot.dtsi files Date: Fri, 26 Apr 2019 19:04:26 +0530 Message-Id: <20190426133430.17802-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190426133430.17802-1-jagan@amarulasolutions.com> References: <20190426133430.17802-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=PvqYNQLo; 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: , We have a base rk3399-u-boot.dtsi which enabled sdmmc for SPL, extend the same with spi1 so-that the SPL spi boot boards can make use of the same. So, to make use of this common rk3399-u-boot.dtsi we have to include this in respective dts files. So, this patch will create all preliminary infrastructure, like - create -u-boot.dtsi - include rk3399-u-boot.dtsi - move sdram dtsi into -u-boot.dtsi - drop sdmmc, u-boot,dm-pre-reloc - drop 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 | 4 ++++ 14 files changed, 40 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 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 index f533ed95eb..0786c1193a 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -6,3 +6,7 @@ &sdmmc { u-boot,dm-pre-reloc; }; + +&spi1 { + u-boot,dm-pre-reloc; +};