From patchwork Sun Feb 9 11:05:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 1235421 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YF5kkaag; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 48FmT94XyFz9sP7 for ; Sun, 9 Feb 2020 22:07:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 456EE816FF; Sun, 9 Feb 2020 12:06:28 +0100 (CET) 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="YF5kkaag"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1FC78816D2; Sun, 9 Feb 2020 12:06:26 +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=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (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 08AAA816BB for ; Sun, 9 Feb 2020 12:06:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=linux.amoon@gmail.com Received: by mail-pf1-x443.google.com with SMTP id y73so2206681pfg.2 for ; Sun, 09 Feb 2020 03:06:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=x6DdqKCa1BEbXB4ySfgyK4s0ozsbPwGeQGTP+HnrqjQ=; b=YF5kkaagVJbKi+V6n2+n4lXeSpiCtiE9xPKKRaCUc4sLBGinrK1T1b0h6cOJxujHLA 4BGg4JL7kY9Fh0yeen5B2mvnbZXYLUhpV4n/9sZBZEZMWMVtUrAsifD32rOABYw4OznK 1Ip0Svmm41PMw5DG0ngIjkpOxd9vj/1D8zLJPLUrJGfnv75L/TMuKVpUAGfMwwnFfFBY +xoZ88dzSAEwkArE4RWjSCXtCM79SjExOj8yP5qIkYAsCQ73xAlA0u95euuKQnjHsPL9 AlXuakODuwBEzvdYkgbb7VB86YVfu2bpJUBvoKXxsQYcRquhE6Q2ieZ3BhQQDqoDsr0y HXSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x6DdqKCa1BEbXB4ySfgyK4s0ozsbPwGeQGTP+HnrqjQ=; b=hWzXH0bmUfZvn8DwNf4s8JHraeSQp+GwxrnwVFhgIf+UNlaaL2Dystz85pKR2kV9RS 8cBXnMBopRCjJ9sZJgv3yFwFbq9ctnpM+WLtn6a4m+c2TJnLkDcd0eCNHfUjPY/AGb1Q FDNHK3hX7eZP5g9+lstjPRErghIIYQ0nUBLwokOxZKVz7o07AIvrZJQjwK6yIIY5Vg1N jGrKfNYza1wrWx5tsEfJa67HNOqzJfy31Gu+Bj6PlJjHPAYclT17wmvZP5R7s3vctdjk Ub4Lvy5pGlWHpqA7tqEO8qPqgZ0PRRid4W3c+17hexhB0DRof0bKQ5uPVvPTOPpmF/+e dJzQ== X-Gm-Message-State: APjAAAW/Pg162uxLfP7hHuAyU7OSUpMt30Git/ADTxmRX5AkBTIgxlS4 d72WhWW5jlm59pLKYSwYyNY= X-Google-Smtp-Source: APXvYqzsqM+0RG3w7qPaA6uqk3c2CNZuqecDgPCT5UOOeuNQLlxG6g1XASCfFLaRpmuObUCzHFa8Yw== X-Received: by 2002:a62:b60b:: with SMTP id j11mr8067541pff.255.1581246381387; Sun, 09 Feb 2020 03:06:21 -0800 (PST) Received: from localhost.localdomain ([45.114.62.33]) by smtp.gmail.com with ESMTPSA id fz21sm8238648pjb.15.2020.02.09.03.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2020 03:06:20 -0800 (PST) From: Anand Moon To: Neil Armstrong , Jerome Brunet , Peng Fan , Jaehoon Chung , u-boot-amlogic@groups.io, u-boot@lists.denx.de Subject: [PATCHv6 5/5] arm: dts: s400: Move common nodes to the -u-boot.dtsi Date: Sun, 9 Feb 2020 11:05:57 +0000 Message-Id: <20200209110557.1996-6-linux.amoon@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200209110557.1996-1-linux.amoon@gmail.com> References: <20200209110557.1996-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 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.101.4 at phobos.denx.de X-Virus-Status: Clean Move u-boot specific common nodes in the dts files to meson-axg-s400-u-boot.dtsi. This allows us to keep the basic dts[i] files up-to-date with the ones in kernel, but at the same time allowing the u-boot to add its own properties to the existing nodes. Also add missing mmc alias to dts nodes to avoid below debug warning. mmc_bind: alias ret=-2, devnum=-1 mmc_bind: alias ret=-2, devnum=-1 Signed-off-by: Anand Moon --- no changes from previous changes --- arch/arm/dts/meson-axg-s400-u-boot.dtsi | 16 ++++++++++++++++ arch/arm/dts/meson-axg-s400.dts | 9 --------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/meson-axg-s400-u-boot.dtsi b/arch/arm/dts/meson-axg-s400-u-boot.dtsi index c46eb3f38d..74241e9fcd 100644 --- a/arch/arm/dts/meson-axg-s400-u-boot.dtsi +++ b/arch/arm/dts/meson-axg-s400-u-boot.dtsi @@ -2,6 +2,22 @@ /* * Copyright (c) 2017 Amlogic, Inc. All rights reserved. */ +/ { + soc { + u-boot,dm-pre-reloc; + }; + + aliases { + serial0 = &uart_AO; + serial1 = &uart_A; + mmc1 = &sd_emmc_b; + mmc2 = &sd_emmc_c; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; /* wifi module */ &sd_emmc_b { diff --git a/arch/arm/dts/meson-axg-s400.dts b/arch/arm/dts/meson-axg-s400.dts index 18778ada7b..feb84255ad 100644 --- a/arch/arm/dts/meson-axg-s400.dts +++ b/arch/arm/dts/meson-axg-s400.dts @@ -55,11 +55,6 @@ }; }; - aliases { - serial0 = &uart_AO; - serial1 = &uart_A; - }; - linein: audio-codec@0 { #sound-dai-cells = <0>; compatible = "everest,es7241"; @@ -100,10 +95,6 @@ reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; }; - chosen { - stdout-path = "serial0:115200n8"; - }; - memory@0 { device_type = "memory"; reg = <0x0 0x0 0x0 0x40000000>;