From patchwork Fri Jun 28 10:07:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1124091 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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=none (p=none dis=none) header.from=rock-chips.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="QtfaAL0x"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45ZsxV2bH0z9s3Z for ; Fri, 28 Jun 2019 20:11:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D6634C21E36; Fri, 28 Jun 2019 10:09:13 +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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 81EC0C21E18; Fri, 28 Jun 2019 10:08:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 71550C21C2F; Fri, 28 Jun 2019 10:08:13 +0000 (UTC) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by lists.denx.de (Postfix) with ESMTPS id D173BC21DFA for ; Fri, 28 Jun 2019 10:08:09 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id i189so2721201pfg.10 for ; Fri, 28 Jun 2019 03:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nn/dxPyrvzGI/qHAw9hAZRB6UyUsr/R/jLKjp3BYROo=; b=QtfaAL0x+vXMyenW5UHnhZclYEAluRYGw6KSHb5CuLKRL9QsfdF6INo95sv65fWgB6 xYdzMb/0SgdJkPdjTr5RxzpI8vpWaAAnKFKl9ZgZ0wAKv4Zm/v7xNE7IxR2dTtzFxxXY JoiiPcYtFdmWSD7vDARZzXXqCn0V6ULwERex5TpKl8IAQBXOEydw8SJIiAfkeM2xAUPo 37Yx/zOoXXAJzf2lHPaLq7BwkxNK25kVQoCKIfVbV4+IAARNa0XZXRHgxQ64Y2OhchKG oLLLKy0RcUV54tjP0G5gG2+9iNHWbY6IqOkxPGDKng54SNU4hgttxLl5KLMYEJcwfmLm D7LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nn/dxPyrvzGI/qHAw9hAZRB6UyUsr/R/jLKjp3BYROo=; b=URD2JSLo9OFWpVCQIfImHknSAl7XH6bPbVxISbr9APQoAzC2d6rE1dLcACJwaezIIu SZgnhudWlKgOfJwHPCnffg0b+Zf64zXJuavimOl4MIbMfLvCLQId2ZuBZQG5Kxthxd8G 2SudC/TNHKmzzWiBVdkG2gBMRt4Lx0M7GK2sd0R/+wp0VPNfG25kRYX8jh3Xxkm4gbVt QJhcodKMsV1FwaPoM2cdbXtzlHPVWqc1oP4amrz7uYmZITQfO3PQ6tQI1EzX7NF6cxuN CeHWubAdpvBQSHi71nWfDzjVUbZQwmwrGz7PwFF8FvfbcAARwJQL1SEstxVryNu1nWfd DNpQ== X-Gm-Message-State: APjAAAU5TzU7PgSOGWMd1iRGyb6+VdMX3m9GS3IHaZVRhbV5ppBWbgzL ATlLZ/zEZNlzQU4OpVaz1NC945Ne X-Google-Smtp-Source: APXvYqyShTXxNOGpgZtfp9mqLnDbI90Mt4mAnsSX13nlNWIrGrD8GWc57iuuE9lu7MEybOD2HgvasQ== X-Received: by 2002:a17:90a:30e4:: with SMTP id h91mr11643440pjb.37.1561716488376; Fri, 28 Jun 2019 03:08:08 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id j14sm1756164pfe.10.2019.06.28.03.08.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Jun 2019 03:08:07 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Fri, 28 Jun 2019 18:07:46 +0800 Message-Id: <20190628100750.17334-5-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190628100750.17334-1-kever.yang@rock-chips.com> References: <20190628100750.17334-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Cc: trini@konsulko.com Subject: [U-Boot] [PATCH v3 4/8] rockchip: dts: tinker: migrate the dm-pre-reloc tag into -u-boot dts 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" Migrate all the "u-boot,dm-pre-reloc" tag from rk3288-tinker.dts into rk3288-tinker-u-boot.dtsi. When both board level and soc level '-u-boot.dtsi' files exist, we need to include the soc level 'rk3288-u-boot.dtsi' manually. --- Changes in v3: - include "rk3288-u-boot.dtsi" in dts. Signed-off-by: Kever Yang Changes in v2: None arch/arm/dts/rk3288-tinker-u-boot.dtsi | 28 ++++++++++++++++++++++++++ arch/arm/dts/rk3288-tinker.dts | 20 +----------------- 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 arch/arm/dts/rk3288-tinker-u-boot.dtsi diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi new file mode 100644 index 0000000000..69aae59f3d --- /dev/null +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Rockchip Electronics Co., Ltd + */ + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&uart2 { + u-boot,dm-pre-reloc; +}; + +&sdmmc { + u-boot,dm-pre-reloc; +}; + +&emmc { + u-boot,dm-pre-reloc; +}; + +&gpio3 { + u-boot,dm-pre-reloc; +}; + +&gpio8 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts index 3edd21cc2f..d230c2ba0e 100644 --- a/arch/arm/dts/rk3288-tinker.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -5,6 +5,7 @@ /dts-v1/; #include "rk3288-tinker.dtsi" +#include "rk3288-u-boot.dtsi" / { model = "Tinker-RK3288"; @@ -28,8 +29,6 @@ &pinctrl { - u-boot,dm-pre-reloc; - usb { host_vbus_drv: host-vbus-drv { rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; @@ -42,7 +41,6 @@ }; &uart2 { - u-boot,dm-pre-reloc; reg-shift = <2>; }; @@ -51,22 +49,6 @@ status = "okay"; }; -&sdmmc { - u-boot,dm-pre-reloc; -}; - -&emmc { - u-boot,dm-pre-reloc; -}; - -&gpio3 { - u-boot,dm-pre-reloc; -}; - -&gpio8 { - u-boot,dm-pre-reloc; -}; - &i2c2 { m24c08@50 { compatible = "at,24c08", "i2c-eeprom";