From patchwork Thu Sep 5 07:54:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1158258 X-Patchwork-Delegate: sbabic@denx.de 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=denx.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46PCjG4Yszz9s7T for ; Thu, 5 Sep 2019 17:57:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4D7F0C21DD4; Thu, 5 Sep 2019 07:55:29 +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=none 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 BA41CC21DF8; Thu, 5 Sep 2019 07:55:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BF23EC21DD7; Thu, 5 Sep 2019 07:55:17 +0000 (UTC) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by lists.denx.de (Postfix) with ESMTPS id 3A482C21C50 for ; Thu, 5 Sep 2019 07:55:17 +0000 (UTC) Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 46PCfF0HPpz1rW6C; Thu, 5 Sep 2019 09:55:17 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 46PCfD75nCz1qqkk; Thu, 5 Sep 2019 09:55:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id abYHJQrpPblO; Thu, 5 Sep 2019 09:55:15 +0200 (CEST) X-Auth-Info: VDo9hQhwnIYnLcLm4TupLNrvS5bwcpLLco7/8W5X3KY= Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Thu, 5 Sep 2019 09:55:15 +0200 (CEST) From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de, Peng Fan , Fabio Estevam Date: Thu, 5 Sep 2019 09:54:55 +0200 Message-Id: <20190905075501.11225-2-lukma@denx.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190905075501.11225-1-lukma@denx.de> References: <20190905075501.11225-1-lukma@denx.de> Cc: "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v3 1/7] dts: imx28: Remove #include "imx28.dtsi" from imx28-u-boot.dtsi file 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" After this change it is possible to use imx28--u-boot.dtsi with the imx28-u-boot.dtsi explicitly included without breaking setup from imx28-.dts file. The problem is that the imx28.dtsi included in a wrong place overrides the changes made in imx28-.dts. As a result some devices are "disabled" in the final DTB. Signed-off-by: Lukasz Majewski --- Changes in v3: None Changes in v2: None arch/arm/dts/imx28-u-boot.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/dts/imx28-u-boot.dtsi b/arch/arm/dts/imx28-u-boot.dtsi index d545b402a7..9db72a6be3 100644 --- a/arch/arm/dts/imx28-u-boot.dtsi +++ b/arch/arm/dts/imx28-u-boot.dtsi @@ -5,7 +5,6 @@ * * SPDX-License-Identifier: GPL-2.0+ or X11 */ -#include "imx28.dtsi" &gpio0 { gpio-ranges = <&pinctrl 0 0 29>;