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 6CE65C433F5 for ; Sat, 16 Apr 2022 15:11:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B6D5283DFB; Sat, 16 Apr 2022 17:10:31 +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="qRyu9v8Z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 690D483D92; Sat, 16 Apr 2022 17:10:25 +0200 (CEST) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 B2DB483DF0 for ; Sat, 16 Apr 2022 17:10:05 +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-x534.google.com with SMTP id g20so12960276edw.6 for ; Sat, 16 Apr 2022 08:10:05 -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=qRyu9v8Z9tkVzTzbpzbe2/kJXAn8RerA5a5+Ea5t3aIRRo4nL5pdwH6VjQWciY2iEu WbceyoXzqgcyg6yUBbPyIHFzqU7N0HExll4JuCs5e/GEEKRN6oJlSOePHt4YKLZdT9Xt eRYsf2ds9u8D9kC2A/2jp6suYS+PKdAsvqE5AofvDWKILHlOhZpCIDD1mOQS9f4CBJ39 bUdIhQDw7wp6IuAt4j/gq+GhvIw8e6H6KvC4eX9Ib/a3+eCE7LKB3EGNRFh5aO+rIDOQ tWN8zwXMlRdYoT8QQNtWddUk7l8ZQTyl6Rr1L0reCBncgiXxvOmZhQ4OcT9DpameVMaJ cwAA== 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=PygNhs/QzWEUjAjqNdF1hi4Hb7LA1uXQ/uC/ICoH75l2cmajy5O6R8O65Xih45CYld OjGHMRr0v7mG3irkN3s+E6/dfd03AbnCPX66WXFaTg5H8OsQ4hMmeOjB1wel83S9OhJr 9jncvoMwTbZS/tDmJzADedMdEebSDi9bLNDzSo4c4kpH9s4kNhtaImkO5FhKAF20/xYE UOrizx3xsFdYhTDmetvzYDqyKWBVv40/aZ/Jc2K5PtLnjhFZkCKlu8IXizWeZU3ik2yX wplgToRak7xP4FHzBGVKPJ4bGJkL/YY+gRAv3S6QAC+w83xA711XmZyciUB/Ymqalgr+ ex4g== X-Gm-Message-State: AOAM533VIn1MYq/q08PmkfhHZXsRK1bW4vfyfJeuQcvSa+jhKKfxLCFJ a5sB+OuqGBJC9f3anMMP8mQ= X-Google-Smtp-Source: ABdhPJx/Sjf6ov9YgcfEAOLJM5RiFFpFYr8M6w2RF8seKAj4UE4wMzk2eDsILpQktOivzDmOpbc+DA== X-Received: by 2002:a05:6402:d62:b0:41d:79e6:1617 with SMTP id ec34-20020a0564020d6200b0041d79e61617mr4137508edb.378.1650121804876; Sat, 16 Apr 2022 08:10:04 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id l3-20020aa7cac3000000b00422c961c8c9sm2152510edt.78.2022.04.16.08.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 08:10:04 -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 v11 07/16] arm: dts: rockchip: fix include rk3xxx-u-boot.dtsi Date: Sat, 16 Apr 2022 17:09:43 +0200 Message-Id: <20220416150952.18758-8-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220416150952.18758-1-jbx6244@gmail.com> References: <20220416150952.18758-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