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>;