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 D28D8C433F5 for ; Mon, 4 Apr 2022 14:22:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6FAB283A62; Mon, 4 Apr 2022 16:21:29 +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="A21c/FeD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E900A8395F; Mon, 4 Apr 2022 16:20:15 +0200 (CEST) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 F29CA83997 for ; Mon, 4 Apr 2022 16:19:40 +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-x52a.google.com with SMTP id u9so6169063edd.11 for ; Mon, 04 Apr 2022 07:19:40 -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=RNyLMDi3gaKRG0F0zavYF6DSL0p5dUKEboDgZ1I81Hs=; b=A21c/FeDuu97IshiwyMwFNVmBPjq78ai1KdJAU6DIp0+930ZFHgDV2du4+SoapthL6 E0Iu/7pvgBppxBwJiyo+gCV9BJalWIHgMJ1XkrNlq0JN62LglN3GZMLUabjDvwXI21Lz FgfKnt7y3GxNosxRtx4GjWlZYwFUa1WsBXT6eNavzxUdOsoymtdeYtcKgx2WgaMFpBhc rfI7X2hSVxjXCTuPo5qetnuZBVA3oaGqJl9DwcWWbeOtnuTi2F+pquwWGs8/amRIbIgX fkPk8xMAMaAJl56khMmoO+jeeW8zvrI2ayvznHD9UsHv4nxq7A55kh7vxg6fCQ84NsBi kgaw== 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=RNyLMDi3gaKRG0F0zavYF6DSL0p5dUKEboDgZ1I81Hs=; b=SvlIBt6gfodQ5+HlrYOnYNq/DdKi2UyJI5EICIlENaH5bQKLzeeKojuwKS11dpQJzU Gq2qpSVR3oePBD10cN22yBOAO09GyHSq80Q7SHLefaALYUF/ictS1BlDZcKB+fp4Up0D /9viJ2z0MobG2rSSkso1QeGG6aL83dDiMKXWWa0dInUXWlWLiQJ0TR1iX7DEY4Hn55Xa yPV9DHVqMOYJcdLAk9a8L+b3I11FO2GavLymKAMwWy9mYHHRYaCG0+OWiHwHWadOyl9b BicFmvO3fFO85KGic7j18qxUDO2ptUBv4IdIcXPAfvcftxNMShrSdeKi4BN6YoWf1RPe 9u/A== X-Gm-Message-State: AOAM533COjD1qvlV7BftAI8cXA29dHO96dlJZdIS71ja+QxfNJSR7FJj bpE4eIgtUOTB7X2XbcL8MNg= X-Google-Smtp-Source: ABdhPJztpVk6SlFiyQ8yDN3+GWsA/OmZDXV1kwzei9uMNCDMtwBQaXhI8xlcmVp1MGxAVRol6hBRwQ== X-Received: by 2002:a05:6402:1906:b0:418:ff14:62b8 with SMTP id e6-20020a056402190600b00418ff1462b8mr331019edz.40.1649081980591; Mon, 04 Apr 2022 07:19:40 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id rh26-20020a17090720fa00b006e0da7ef847sm4462196ejb.13.2022.04.04.07.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 07:19:40 -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 v9 07/16] arm: dts: rockchip: fix include rk3xxx-u-boot.dtsi Date: Mon, 4 Apr 2022 16:19:17 +0200 Message-Id: <20220404141926.6085-8-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220404141926.6085-1-jbx6244@gmail.com> References: <20220404141926.6085-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 --- 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