From patchwork Sat Nov 9 20:30:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1192497 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IWyNL98A"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 479TKb47RJz9s7T for ; Sun, 10 Nov 2019 07:30:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 70A6AC21DF9; Sat, 9 Nov 2019 20:30:18 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 57987C21C27; Sat, 9 Nov 2019 20:30:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A15FDC21C27; Sat, 9 Nov 2019 20:30:14 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 4CA03C21BE5 for ; Sat, 9 Nov 2019 20:30:14 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id z26so9484488wmi.4 for ; Sat, 09 Nov 2019 12:30:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=E4Z4yrEoXd6L76AsV86qrXqu/wnx6vU0r9QT/L+ERlE=; b=IWyNL98AJmHMZZL4+IhEF4vQIXFMTEXNTBSp4gz0vt0fFlV2lBQ/FZjdj7nVIjH0/T 4mN4MvQmPt/0x1/SZLZ7kAU3T7PbVLNf49P9RbOlbhi9+u3xrV/czHk1dbO5h9y8Kn1P /tL3cz81fU1oMFREQnHUXUDnDuG5UMWavnBhV7+ZS3mXpNhQqBtlT0aryO1H4XG8Htbw kkwFe06SAAfp6HgCRNq5qxyiD8JOAvrf3Epthg4xZoOwd4yOo8S0UQjvnfNPXNDDsykF wx8wJcgPjJHZFk/gf3UXTiLCoR/gtQZZXMZRzDwBxzivj6dfJ55GBjz8yWkPOLT1NnoU bzYw== 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:mime-version :content-transfer-encoding; bh=E4Z4yrEoXd6L76AsV86qrXqu/wnx6vU0r9QT/L+ERlE=; b=cxTyRrYMopbOkuvDtk0VhtVHtw7ntab5QbSE3CyvKSq5LEdDWSHJsN8/3shzcnCiUr Py5PH9WxzmpRl10i0NZGdE3qwdvGQgjl6QJz4W1Nm1Y7crh/p85uSRKqrFzpK/jQ94h8 RGG7HTMOIhEsllCHekBvPnMopyanhvXS9kqo2wTKeKPIujryvavlsfiUBNYiR6p7jUqS FLV9Vio36rf+EQ9Ma/99m9AjJJjySj05H6Hn0iJGQWFTVk9djYp3vYBvoWRZOdmBA3kX Jbb74PFsh4KStvvo8B1UdM8E3gfnE2l+2QpoGmIw2YpTEO26ABoIBUqjN0dpJB7ogOJ9 VZJA== X-Gm-Message-State: APjAAAW+OqTG6o5cMqnGCvncc0GlUg7j5z29SxxqqH/7ldjcW5801WCd /ms20Ed4laA4rnz/+yhgpd8= X-Google-Smtp-Source: APXvYqyFzyvhvoXrF08dTArPBn3tvxXGsM6BSh0OuwUqZbz3dvfn1ztYGunkhwwRs896x8DJ5xOuhg== X-Received: by 2002:a7b:c08c:: with SMTP id r12mr13672005wmh.67.1573331413756; Sat, 09 Nov 2019 12:30:13 -0800 (PST) Received: from morpheus.roving-it.com.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id z14sm9120926wrl.60.2019.11.09.12.30.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 12:30:13 -0800 (PST) From: Peter Robinson To: Jagan Teki , Kever Yang , Philipp Tomsich , Heiko Stuebner , Simon Glass , u-boot@lists.denx.de Date: Sat, 9 Nov 2019 20:30:05 +0000 Message-Id: <20191109203007.248686-1-pbrobinson@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [U-Boot] [PATCH 1/3] rockchip: dts: rk3399: move the u-boot, dm-pre-reloc to the 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" The u-boot specific pieces in the dts files should be in u-boot.dtsi not the main files, this allows easier sync with upstream. The rk3399.dtsi has a mix of both so move them all for consistency. Signed-off-by: Peter Robinson Reviewed-by: Kever Yang --- arch/arm/dts/rk3399-u-boot.dtsi | 44 +++++++++++++++++++++++++++++++++ arch/arm/dts/rk3399.dtsi | 11 --------- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi index 2738a3889e..3ec66c6fc3 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -3,10 +3,46 @@ * Copyright (C) 2019 Jagan Teki */ +&cic { + u-boot,dm-pre-reloc; +}; + +&cru { + u-boot,dm-pre-reloc; +}; + +&dmc { + u-boot,dm-pre-reloc; +}; + +&grf { + u-boot,dm-pre-reloc; +}; + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&pmu { + u-boot,dm-pre-reloc; +}; + &pmu { u-boot,dm-pre-reloc; }; +&pmucrc { + u-boot,dm-pre-reloc; +}; + +&pmusgrf { + u-boot,dm-pre-reloc; +}; + +&sdhci { + u-boot,dm-pre-reloc; +}; + &sdmmc { u-boot,dm-pre-reloc; }; @@ -22,3 +58,11 @@ &uart2 { u-boot,dm-pre-reloc; }; + +&vopb { + u-boot,dm-pre-reloc; +}; + +&vopl { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi index b73442ee34..3f773b10f4 100644 --- a/arch/arm/dts/rk3399.dtsi +++ b/arch/arm/dts/rk3399.dtsi @@ -275,7 +275,6 @@ }; sdhci: sdhci@fe330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; reg = <0x0 0xfe330000 0x0 0x10000>; interrupts = ; @@ -1072,7 +1071,6 @@ }; pmugrf: syscon@ff320000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd"; reg = <0x0 0xff320000 0x0 0x1000>; @@ -1083,7 +1081,6 @@ }; pmusgrf: syscon@ff330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmusgrf", "syscon"; reg = <0x0 0xff330000 0x0 0xe3d4>; }; @@ -1204,7 +1201,6 @@ }; cic: syscon@ff620000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cic", "syscon"; reg = <0x0 0xff620000 0x0 0x100>; }; @@ -1219,7 +1215,6 @@ }; dmc: dmc { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-dmc"; devfreq-events = <&dfi>; interrupts = ; @@ -1268,7 +1263,6 @@ }; pmucru: pmu-clock-controller@ff750000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmucru"; reg = <0x0 0xff750000 0x0 0x1000>; rockchip,grf = <&pmugrf>; @@ -1279,7 +1273,6 @@ }; cru: clock-controller@ff760000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cru"; reg = <0x0 0xff760000 0x0 0x1000>; rockchip,grf = <&grf>; @@ -1310,7 +1303,6 @@ }; grf: syscon@ff770000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; reg = <0x0 0xff770000 0x0 0x10000>; #address-cells = <1>; @@ -1520,7 +1512,6 @@ }; vopl: vop@ff8f0000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-lit"; reg = <0x0 0xff8f0000 0x0 0x3efc>; interrupts = ; @@ -1578,7 +1569,6 @@ }; vopb: vop@ff900000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-big"; reg = <0x0 0xff900000 0x0 0x3efc>; interrupts = ; @@ -1818,7 +1808,6 @@ }; pinctrl: pinctrl { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pinctrl"; rockchip,grf = <&grf>; rockchip,pmu = <&pmugrf>; From patchwork Sat Nov 9 20:30:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1192499 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Cl7SRmLp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 479TL45dVKz9sNx for ; Sun, 10 Nov 2019 07:30:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 81084C21E38; Sat, 9 Nov 2019 20:30:29 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 C3626C21DD7; Sat, 9 Nov 2019 20:30:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C2A8DC21C27; Sat, 9 Nov 2019 20:30:15 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 6FE7CC21BE5 for ; Sat, 9 Nov 2019 20:30:15 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id r10so10664231wrx.3 for ; Sat, 09 Nov 2019 12:30:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s++pTscK89JfKfDaNw6sLo8FJbA+JoFoM84NonvI6bI=; b=Cl7SRmLp+XBkzKf5A6VQuhXc7fliE4gbsbGJQ45QFfBxm8xhTwmjtctZS/72EWZQKR 7VN2q8FbVI/DnBpva9nasZGaHUbDUYOw3DRdG0x0paoIDis8TpJNJYZ45VjFJJBQQkIk evqYX957Xmk3nTBxsgm8F4PeYORVg68ML6fzfB9fLrdGmwWIYy6tNKjI/A42bmpv5Q1f KrZyoSyx+4g6Gru8gHUCo4CaNYRw1bnWBK7AqaStlOqNLAEcXu3E6OF9CzAfuVUd11nT oZiWTviQbsznjd9+A6rDE/4jhfa1pTrAdsN5gaoMlh9qpXOKtBxk5KQrKEIO4hBoREBP V6LQ== 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=s++pTscK89JfKfDaNw6sLo8FJbA+JoFoM84NonvI6bI=; b=lmFUTGq7F39HOx8cuYc/TbBR/itsaH7RykpfzzKjdjoAYmg8hT0mwOj90ZEBhswOXc h8BH5UJMP4bHFQwvZ3RMQvEjKlCkkFaU5a38Pg9X20adhx19olsFRwJ9PKdPmjSZ+OC3 gLzHh8pJjnZIgVpEJNK3tgQK1Rod8n40P5ajMgfo7w7nsHHQcl3VLll9K+w6gPT9pIpP hhz72AAPxpo2dzWrG1QXpvq/Sc9aO1RVMr1uhgPsg8+wmHAEeL4Z4V6XPDSG3Go50dG9 BhmR7JRZ1WFfiFwhh0T7ZWjEBl/OPmDsHcpAN03VYpw1W5R/3BivcjnHmufUPSgbJBuP RymQ== X-Gm-Message-State: APjAAAVxKp4+JRNWPQBrV4E402/wlOvNR369HXfQpNW9W37kjh0EN6E7 HSojdpOoK7fypgJ275LJqw8= X-Google-Smtp-Source: APXvYqziv432WjW+CSqtFWgvMkCCrknFcvsfqi3WwwD88i547xIaCcWbhXZiKXy6erU/6Nstc1SzyQ== X-Received: by 2002:adf:e890:: with SMTP id d16mr14989284wrm.105.1573331414995; Sat, 09 Nov 2019 12:30:14 -0800 (PST) Received: from morpheus.roving-it.com.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id z14sm9120926wrl.60.2019.11.09.12.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 12:30:14 -0800 (PST) From: Peter Robinson To: Jagan Teki , Kever Yang , Philipp Tomsich , Heiko Stuebner , Simon Glass , u-boot@lists.denx.de Date: Sat, 9 Nov 2019 20:30:06 +0000 Message-Id: <20191109203007.248686-2-pbrobinson@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191109203007.248686-1-pbrobinson@gmail.com> References: <20191109203007.248686-1-pbrobinson@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 2/3] rockchip: dts: rk3399-evb: move u-boot, spl-boot-order to to the 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" The u-boot specific device tree directives should be in u-boot.dtsi Signed-off-by: Peter Robinson Reviewed-by: Kever Yang --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-evb.dts | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi index 20910e744b..ccb33d34d1 100644 --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi @@ -5,3 +5,9 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-4GB-1600.dtsi" + +/ { + chosen { + u-boot,spl-boot-order = &sdhci, &sdmmc; + }; +}; diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index a506e8da37..8e887f3a17 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -15,8 +15,6 @@ chosen { stdout-path = &uart2; - u-boot,spl-boot-order = \ - &sdhci, &sdmmc; }; vdd_center: vdd-center { From patchwork Sat Nov 9 20:30:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1192498 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PWdztosD"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 479TL42sQGz9s7T for ; Sun, 10 Nov 2019 07:30:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 22F10C21DEC; Sat, 9 Nov 2019 20:30:38 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 649D1C21C4A; Sat, 9 Nov 2019 20:30:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8E0A2C21D74; Sat, 9 Nov 2019 20:30:20 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id DD583C21D4A for ; Sat, 9 Nov 2019 20:30:16 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id 8so9563441wmo.0 for ; Sat, 09 Nov 2019 12:30:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BGsjEZc3iG/YmNFty/dCinSglgFrqHlWtbVFejuu8gg=; b=PWdztosDjvU31RSxgFgAkS6dhk2Re/V6giD4yHaLxI2QQsZ0xBLpfWEQS01Lpk59LW jD0i6L3hjRBzIWIq9R8P7VJCXBYJ70RtpR2JS/GE/IOwHASNKQHqJjv++/2SjTqaHHEP 7KMO+tFQNdHH7wDPkZE/whkK2HaeYndvw7cliQCDHrovDlOD4pUnxlZcKcCY+BcUev3w Ayb3/Qc0BfcSo/0XCx3pvLy70PLyfBGlw+O6Jx/guR/8gKcrv7pF3eGeHlRLDHR7ViXC 3/1Ou3VGVGPrAD4eh9iFC5b2JM3zQjR1UtUpSutxrFdKubWdCAmZng7FFUYbvMfUCH8t m4pA== 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=BGsjEZc3iG/YmNFty/dCinSglgFrqHlWtbVFejuu8gg=; b=h8NpEB3ls/d7XsGpodzvz5BP69R2iHRhmYheKbeO5Nf7lMriP8gDeiqvkW4RMYKXmz joj3jy9IaMQ1IbSA0xSVmsutaRasjNyVOjnN12mJK5dkcr8lv9JgC06XdKQpi5BZB8nb 1Y3N9hg3EIwW5HX2gn8eki2a9N1svczkoPLeZsJRGGWbSqyDFbEHeHzjhFpKu+yksJ24 QuwBWXotx3Zj2yYt28bJOVnIVk3s3NqbOvZIF4CvGDAcBqcAwgrRCTavT28fFhHhufmK GIvHhc05+dT5eF/n64Foo+GDa8EHlbw7I8itkJMTwvFBJStSvIVYuK8qZXYE8Qti0mKy 3ITQ== X-Gm-Message-State: APjAAAXbY9V0koRIqPi7NKrbBbHGpHP0h9CLQXv9eth8YNU1hw3BwGhY E3z44+XON4FWoRFzbUR6rfa73aks X-Google-Smtp-Source: APXvYqyNm7ObckI56oCn/nH8xoqQhyAoHeVykmILbelU5NjWRWPQMBevxpBoSBbysi+10IqZurWpEg== X-Received: by 2002:a1c:453:: with SMTP id 80mr14291456wme.5.1573331416238; Sat, 09 Nov 2019 12:30:16 -0800 (PST) Received: from morpheus.roving-it.com.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id z14sm9120926wrl.60.2019.11.09.12.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 12:30:15 -0800 (PST) From: Peter Robinson To: Jagan Teki , Kever Yang , Philipp Tomsich , Heiko Stuebner , Simon Glass , u-boot@lists.denx.de Date: Sat, 9 Nov 2019 20:30:07 +0000 Message-Id: <20191109203007.248686-3-pbrobinson@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191109203007.248686-1-pbrobinson@gmail.com> References: <20191109203007.248686-1-pbrobinson@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 3/3] rockchip: dts: rk3399-firefly: move u-boot, spl-boot-order to to the 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" The u-boot specific device tree directives should be in u-boot.dtsi Signed-off-by: Peter Robinson Reviewed-by: Kever Yang --- arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-firefly.dts | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi index 67b63a8352..38e0897db9 100644 --- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi @@ -5,3 +5,9 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" + +/ { + chosen { + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; + }; +}; diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts index a4cb64f8bd..89c67fd24c 100644 --- a/arch/arm/dts/rk3399-firefly.dts +++ b/arch/arm/dts/rk3399-firefly.dts @@ -14,7 +14,6 @@ chosen { stdout-path = &uart2; - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; backlight: backlight {