From patchwork Thu Nov 8 09:51:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10673867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EBF4B13BF for ; Thu, 8 Nov 2018 09:52:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA5802CB2F for ; Thu, 8 Nov 2018 09:52:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE8F42CFAA; Thu, 8 Nov 2018 09:52:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 153642CB2F for ; Thu, 8 Nov 2018 09:52:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bcD0TjTSV0THhJ3QShShcM8thtkcQ+zf+agAl2nWZpY=; b=is3kF2/IbgRjv+ Hvn9Jo6f0C8daDi8lJIwPbi4SZmJLSzwUPFniPZuwW8HG8+a5whm95Ah2eURSatjOwZJqBnHpoq+q byO6jks1h6RLejbedeK8cUscNxFVijWozvDlXcAMJdaD18uQuPxgM8nOrw9YlSpTiajrdbEfsuk30 vhXX5K7i/DHf6eXKhtkolCHhcuaLKkJZObj4Zk2+72H0kDsZoKLXtrarm5Y819WxuDEi15c4CDtPr AKNhHzI+VNkl2xPXvWsuSOczs0dBwUVWlZJnCOwJT7oxb2nuhAIF9qv/kaT1RNnLUpmnvNv/iR1oN EZSDsPV5coehaDTeHkbQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKgz7-0001xO-LA; Thu, 08 Nov 2018 09:52:21 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKgz4-0001vx-Mw for linux-amlogic@lists.infradead.org; Thu, 08 Nov 2018 09:52:20 +0000 Received: by mail-wm1-x344.google.com with SMTP id f2-v6so548508wme.3 for ; Thu, 08 Nov 2018 01:52:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dv6+ypt/7tiC1ngVmV/3dvmkAFc1LE6861Dc6rzEnD0=; b=BtEG0nf4mI5iq+gwzd8ZMx79DNHKanMWxS5V91iRH7Uf39gFgnyHV3P3eyQeIKOEF/ mimKk7KnzauDQsEOBm2MYnxcA2K+f+wobNoX8TDClFBuuwZlPfa9A7S+EsoCwIKuLC5X 8Cxtdr3mFssfUKnK29Oj8t8KdvOn+HU+McprTUTT/lBTc33H2dRrpGac+y3J+CBL0byh E+dHHF2F3R/r4GNgsqJs/A0Bu9qeTtYELASJuiX4A7gdX1fOC1C1jzc4GMGhNYo43bsy 05WfvjqqKcCo2t+nu/gBGKL7iaoHzmlCkIT2uvU+4+KFszmhXgwSrboUGPPVhISMbk59 MnCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dv6+ypt/7tiC1ngVmV/3dvmkAFc1LE6861Dc6rzEnD0=; b=Oamfxh/qMhzTYrnlPUuXVTqA72lGZasf9T3eQ6YJG7gW5yQ2Mf1lIKtO0MhVbqXqLL miq1YAj80/qLFjHtnqnyc1MI+hSLgIgfvBHVlo872qENMlLXYTOM2oEmXfcThQxZ7ODo CdGUFfzGgve2pHlfOtBr1mxkc0jhn1Y1ARfpwvBDyl3/YysvvyMJKpk0LFiHlY1M7g// KctZ0ryv4ZToFxcqYExukSN31xouVbE9pAq7Z1bpfhcP7vJGbTrZRnHEKrEJXLL9kG7s DviuFZML2MGIbQyiYI81DxrgPUomz6tpjcSRdzIQzaEeYNpW0qNA2RemM71dVWMoXHQS lLSg== X-Gm-Message-State: AGRZ1gJYhSarmClvshLWayTSpjgzvEAo1OXu1N3TcTnqU42aXwiqbd+q bvdfeXmSAkHNThsOvPVMD0cqUA== X-Google-Smtp-Source: AJdET5dCU4z71ViorlGXHHy32Dla44pI4bFS+KkFkCZygkXx8XQccu41faKCmlo9xlXYkV4tnIuQfA== X-Received: by 2002:a1c:85c5:: with SMTP id h188-v6mr539602wmd.59.1541670725547; Thu, 08 Nov 2018 01:52:05 -0800 (PST) Received: from boomer.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id x142-v6sm6898421wmd.20.2018.11.08.01.52.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 01:52:04 -0800 (PST) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH RESEND] arm64: dts: meson-axg: fix dtc warning about unit address Date: Thu, 8 Nov 2018 10:51:56 +0100 Message-Id: <20181108095156.26810-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181030150614.19461-1-jbrunet@baylibre.com> References: <20181030150614.19461-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181108_015218_746441_EE8AED6E X-CRM114-Status: GOOD ( 12.75 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, Fabio Estevam , Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP section 2.2.1 of the DT specs says: " If the node has no reg property, the @unit-address must be omitted and the node-name alone differentiates the node from other nodes at the same level in the tree" Simply replace the '@' with a '-' to fix this warning. Cc: Fabio Estevam Cc: Martin Blumenstingl Signed-off-by: Jerome Brunet Reviewed-by: Neil Armstrong --- Hi Kevin, I'm resending this change because I noticed the previous patch I sent had references to spdif input which has not been merged yet. This would have triggered a conflict in your tree. Hopefully, this new version will apply correctly Cheers Jerome .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 26 +++++++++---------- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index 18778ada7bd3..ba44b0419404 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -60,7 +60,7 @@ serial1 = &uart_A; }; - linein: audio-codec@0 { + linein: audio-codec-0 { #sound-dai-cells = <0>; compatible = "everest,es7241"; VDDA-supply = <&vcc_3v3>; @@ -70,7 +70,7 @@ sound-name-prefix = "Linein"; }; - lineout: audio-codec@1 { + lineout: audio-codec-1 { #sound-dai-cells = <0>; compatible = "everest,es7154"; VDD-supply = <&vcc_3v3>; @@ -79,14 +79,14 @@ sound-name-prefix = "Lineout"; }; - spdif_dit: audio-codec@2 { + spdif_dit: audio-codec-2 { #sound-dai-cells = <0>; compatible = "linux,spdif-dit"; status = "okay"; sound-name-prefix = "DIT"; }; - dmics: audio-codec@3 { + dmics: audio-codec-3 { #sound-dai-cells = <0>; compatible = "dmic-codec"; num-channels = <7>; @@ -272,31 +272,31 @@ <393216000>; status = "okay"; - dai-link@0 { + dai-link-0 { sound-dai = <&frddr_a>; }; - dai-link@1 { + dai-link-1 { sound-dai = <&frddr_b>; }; - dai-link@2 { + dai-link-2 { sound-dai = <&frddr_c>; }; - dai-link@3 { + dai-link-3 { sound-dai = <&toddr_a>; }; - dai-link@4 { + dai-link-4 { sound-dai = <&toddr_b>; }; - dai-link@5 { + dai-link-5 { sound-dai = <&toddr_c>; }; - dai-link@6 { + dai-link-6 { sound-dai = <&tdmif_c>; dai-format = "i2s"; dai-tdm-slot-tx-mask-2 = <1 1>; @@ -317,7 +317,7 @@ }; - dai-link@7 { + dai-link-7 { sound-dai = <&spdifout>; codec { @@ -325,7 +325,7 @@ }; }; - dai-link@8 { + dai-link-8 { sound-dai = <&pdm>; codec { diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index df017dbd2e57..eb46db001ce0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -20,7 +20,7 @@ #address-cells = <2>; #size-cells = <2>; - tdmif_a: audio-controller@0 { + tdmif_a: audio-controller-0 { compatible = "amlogic,axg-tdm-iface"; #sound-dai-cells = <0>; sound-name-prefix = "TDM_A"; @@ -31,7 +31,7 @@ status = "disabled"; }; - tdmif_b: audio-controller@1 { + tdmif_b: audio-controller-1 { compatible = "amlogic,axg-tdm-iface"; #sound-dai-cells = <0>; sound-name-prefix = "TDM_B"; @@ -42,7 +42,7 @@ status = "disabled"; }; - tdmif_c: audio-controller@2 { + tdmif_c: audio-controller-2 { compatible = "amlogic,axg-tdm-iface"; #sound-dai-cells = <0>; sound-name-prefix = "TDM_C";