Message ID | 887e8758e665bd8640d27b035f12dee893d4196a.1582028304.git.michal.simek@xilinx.com |
---|---|
State | Accepted |
Commit | 0546b1ab06b22fc3cc2c5b23be351ae671a58f82 |
Delegated to: | Michal Simek |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=DmQ8PP8Y; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48MKkt6qxQz9sRG for <incoming@patchwork.ozlabs.org>; Tue, 18 Feb 2020 23:23:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 90789813D5; Tue, 18 Feb 2020 13:21:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="DmQ8PP8Y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A788F813B4; Tue, 18 Feb 2020 13:21:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (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 9BAB9813B2 for <u-boot@lists.denx.de>; Tue, 18 Feb 2020 13:21:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wr1-x442.google.com with SMTP id e8so1175073wrm.5 for <u-boot@lists.denx.de>; Tue, 18 Feb 2020 04:21:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mkog6nQgH+QVpxkWU8b/nb1AjCB5gYewF81wppLVluE=; b=DmQ8PP8YoSfNqodP/4VA8RUgizMJavSXbDBZNE+sILhdzGPQaDBFLJR6lBUTy6cKnc 9jg2iKNcAyNG2l7YemXryk1uIdLHDN0Jad1nJhG6syXH1+iLO+JcI9qBVJdRmlkZi8MB QMwvF0MCyrw9e2zVV9WR1e5CX5xh0wqK3AYVeWY7OBZ0jQn32wVIouGywazroQbVLSLo 9ryj5rwsxmUOHeFlINzcNCKUFsT9hOZcOdd85RhW1gbYwnAiAOEYTjiSfDU2NXH1o295 QlliQiHaXXvCnuMajfgJ0R5fT0yoDZTvys4i1ssTe8YWDEWK4JuV7RGZ569htpbEGSYv QphQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Mkog6nQgH+QVpxkWU8b/nb1AjCB5gYewF81wppLVluE=; b=rqdblkhhWBtG5dL5yVoiYVWAfPvVdCfTfy+dYjOni4KvExZJugKC+/VdWI4/993OMA L5kjCuZdLO6C/+KKNwtkopZ/G+167A9d6QvTDLID5psEl4BhNDGtfZE79FJt+zdqkax8 Ks27Tf1EI76H4HuuOaGi9H0wU/3qKnp3lP2WK3LFAobEKytB5JddWDbzJXj2VTfiAMa1 V0+Ue7dlw2pfmKLvvfmiZm6pP56BWU1Ng6iZUQ3ByvwgRsS5Mwf4IeuizHKhSVKnDOq3 JNILuZ7k6uQVihsLhIkVPC/rdatiYa3r4HXEcf+bXnzes/CqrfdWBR5NnRXAdGrydA07 2t2A== X-Gm-Message-State: APjAAAWFl+bpFy62KQ8GMflcHUKtMfTLoNUsEdNJwXCnBstkAl1KvXCc Rv3tYlHxvig2ntkCW24tWaMJ0hHHXJIh6g== X-Google-Smtp-Source: APXvYqzdKLyKZuVuxClfn/fUhDjbZrCM9pkc/cUoB1ddyFOpCyepRwBvtjOpG2VPZQdpHZz1Jwpl5g== X-Received: by 2002:adf:f182:: with SMTP id h2mr28292169wro.364.1582028468946; Tue, 18 Feb 2020 04:21:08 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id g2sm5653632wrw.76.2020.02.18.04.21.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Feb 2020 04:21:08 -0800 (PST) From: Michal Simek <michal.simek@xilinx.com> To: u-boot@lists.denx.de Cc: git@xilinx.com, Amit Kumar Mahapatra <amit.kumar-mahapatra@xilinx.com> Subject: [PATCH 11/16] arm64: zynqmp: Do not duplicate flash partition label property Date: Tue, 18 Feb 2020 13:20:41 +0100 Message-Id: <887e8758e665bd8640d27b035f12dee893d4196a.1582028304.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <cover.1582028304.git.michal.simek@xilinx.com> References: <cover.1582028304.git.michal.simek@xilinx.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.1 at phobos.denx.de X-Virus-Status: Clean |
Series |
xilinx: DT sync up
|
expand
|
diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts index 2ff7952e70e5..92d938d665d2 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts @@ -197,7 +197,7 @@ reg = <0>; partition@0 { - label = "data"; + label = "spi0-data"; reg = <0x0 0x100000>; }; }; @@ -214,7 +214,7 @@ reg = <0>; partition@0 { - label = "data"; + label = "spi1-data"; reg = <0x0 0x84000>; }; };