From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F04C3C433EF for ; Mon, 11 Apr 2022 01:31:59 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9449183DE1; Mon, 11 Apr 2022 03:30:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Vcs2rLsM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 749CE83DCA; Mon, 11 Apr 2022 03:30:25 +0200 (CEST) Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CA7A383B1B for ; Mon, 11 Apr 2022 03:30:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ed1-x532.google.com with SMTP id d10so16580381edj.0 for ; Sun, 10 Apr 2022 18:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r3PGwDSGQ4WJTv4WElr/EBDRe53X2VOIY/CIUfXqAKU=; b=Vcs2rLsMN/3bScdyTSnCTMkwoBiBJRzLsqVvnzC3VKeNBoyAtS4ZGH7EBIa5abhhKv xxSjDNL+/ZsLuHbvngHvnzOkWULtuzoAiv59iFG7uIprME4+jYu1Af7f1nWJ9ykGq3eS C93LFm/CHPhzo6nX+KHLL58fwkOJLWVfPStv0nFlpZIsDK457J9yOAFi8cpaKNOh2iXC suARrA5VLyCjTTVv0dIRSwtJ174QkFSQM79B4i/N8Cmcacp2DY5dhcOP3kILcad/UMQ5 PKBYmEEFMACgwlvePX/6Y7wOH0oYw2DxnPkhqNQ9KWXvNL8jqV1gVSWwLYXjYsN6TM6E Tebw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r3PGwDSGQ4WJTv4WElr/EBDRe53X2VOIY/CIUfXqAKU=; b=Tk5kGPjWlERjvwoP9MSQi6QmqPZZttENnFRSlIRX///qwEYFRr6amll7WXNBnGHUuB z7mhFguP6LYpo8XWLca+Cfb4zJ6wpYljK+i4ffRsXB8IPmMHqMiQxqEMAUkzjnzXQovr Tv38JtibbToe0MIjraBCbiWGdmZ44yPelo3U/NqrfZL0GqVJIdlwVaDY7dFeClvSL68u j2IOSb61eBRxvdiOlULGBaIQ7mKjNtBhqjk0cDgMyxWTQPbvQy8PKpW7ubZ1Hu9Lo4cI tenyFfreJbGipW+GL9wyqqQlfUCAa1d78aQjqE3a0jdQpYSdzqvmKmE/mXHm00QROfJO R4AQ== X-Gm-Message-State: AOAM530Ei8l6qM5cQDQYDIrxFYzfQiF84V1UZJkn6u/msvwAdWBQIizn 3QvGPWg/gkiEPzyh7Cm/BfmSZ0m/qdmzYQ== X-Google-Smtp-Source: ABdhPJxpxki7FDQo0shdqJecsQOseU/RTM7UxJWw5T8VgplRPEsc7EVLRV3QQRjNFDWbLFf9AmniZg== X-Received: by 2002:aa7:c50a:0:b0:41d:794d:5f12 with SMTP id o10-20020aa7c50a000000b0041d794d5f12mr4199788edq.150.1649640600432; Sun, 10 Apr 2022 18:30:00 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id a22-20020a50ff16000000b00410d029ea5csm14121333edu.96.2022.04.10.18.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 18:30:00 -0700 (PDT) From: Johan Jonker To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, lukma@denx.de, seanga2@gmail.com, u-boot@lists.denx.de Subject: [PATCH v10 07/16] arm: dts: rockchip: fix include rk3xxx-u-boot.dtsi Date: Mon, 11 Apr 2022 03:29:37 +0200 Message-Id: <20220411012946.14099-8-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220411012946.14099-1-jbx6244@gmail.com> References: <20220411012946.14099-1-jbx6244@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Move the include for rk3xxx-u-boot.dtsi to rk3188-u-boot.dtsi to stay in line with U-boot dtsi files. Signed-off-by: Johan Jonker Reviewed-by: Kever Yang --- arch/arm/dts/rk3188-u-boot.dtsi | 1 + arch/arm/dts/rk3188.dtsi | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3188-u-boot.dtsi b/arch/arm/dts/rk3188-u-boot.dtsi index 43f05b9876..735776c16b 100644 --- a/arch/arm/dts/rk3188-u-boot.dtsi +++ b/arch/arm/dts/rk3188-u-boot.dtsi @@ -4,6 +4,7 @@ */ #include "rockchip-u-boot.dtsi" +#include "rk3xxx-u-boot.dtsi" &global_timer { status = "okay"; diff --git a/arch/arm/dts/rk3188.dtsi b/arch/arm/dts/rk3188.dtsi index 6c1c2ff533..6764776cce 100644 --- a/arch/arm/dts/rk3188.dtsi +++ b/arch/arm/dts/rk3188.dtsi @@ -9,7 +9,6 @@ #include #include #include "rk3xxx.dtsi" -#include "rk3xxx-u-boot.dtsi" / { compatible = "rockchip,rk3188"; -- 2.20.1