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 7D8ACC433EF for ; Mon, 25 Jul 2022 16:48:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0AAD8845E7; Mon, 25 Jul 2022 18:42:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1658767352; bh=56c0KpzIaSx4hOwQDat4+RpsYzmJZeQeQemRq77fSkA=; h=From:To:Subject:In-reply-to:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From; b=tqFoV1i6DBmnZWgiBuTIcs5ziarACztrkUk3MAYQi73g9/vwq22wQLaggGdQLoGp8 6oUCP58Hvs64S2Y4Z9AbYclCyNiOT5YnKE9ZkLT3M341j2cQR2L0GgKlhewOoDhDC+ dq9THq7Y7EDGKkhvC2BWAUUm0wAJ2ZrkgTFHYmrAI9AdzSjIuG8YWCLHf+baT2RTiM +7qFKS9EQwomJsmXIpR7dSzUiYjd79BRj7bICFim5JguOv/Yi+2sR3xXciUYSshHIx Tg2HO+L1UNfMnTX8zRDS8IGzJ3Bgnz717GzLxNb1lD8AUhlxcSzP3RuwLvgYSvsu5s +UQDkNG8IeWvA== Received: by phobos.denx.de (Postfix, from userid 109) id B3742845E5; Mon, 25 Jul 2022 18:42:29 +0200 (CEST) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3F8A3845EF for ; Mon, 25 Jul 2022 18:42:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sbabic@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4Ls5S20BJ6z1r15m; Mon, 25 Jul 2022 18:42:26 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4Ls5S204nlz1qqkH; Mon, 25 Jul 2022 18:42:26 +0200 (CEST) X-Amavis-Alert: BAD HEADER SECTION, Missing required header field: "Date" 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 lgKLCdEp_qPV; Mon, 25 Jul 2022 18:42:25 +0200 (CEST) Received: from papero (host-88-217-136-221.customer.m-online.net [88.217.136.221]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 25 Jul 2022 18:42:25 +0200 (CEST) From: sbabic@denx.de X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1659040 X-Patchwork-Delegate: sbabic@denx.de To: Marcel Ziswiler ,u-boot@lists.denx.de Subject: [PATCH v1 07/26] imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux In-reply-to: <20220721132748.1052244-8-marcel@ziswiler.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit MIME-Version: 1.0 Message-Id: <20220725164229.B3742845E5@phobos.denx.de> Date: Mon, 25 Jul 2022 18:42:26 +0200 (CEST) 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.6 at phobos.denx.de X-Virus-Status: Clean > From: Marcel Ziswiler > As a preparatory step remove the qspi node with its flash0 label as this > is already in the Linux upstream device tree. > This avoids the following error once synchronised: > +arch/arm/dts/imx6ul-14x14-evk.dtb: ERROR (duplicate_label): > /soc/bus@2100000/spi@21e0000/n25q256a@0: Duplicate label 'flash0' on > /soc/bus@2100000/spi@21e0000/n25q256a@0 and > /soc/bus@2100000/spi@21e0000/flash@0 > Signed-off-by: Marcel Ziswiler Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de =====================================================================