From patchwork Wed Feb 10 17:18:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12081323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 836F2C433E6 for ; Wed, 10 Feb 2021 17:20:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1CAE264E7E for ; Wed, 10 Feb 2021 17:20:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CAE264E7E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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=Ur3RX/JUNApMYwMAhpxPgxdlzxu2ebuOJA/1tPgiOc0=; b=bpvT5UVK4Oa8/oJEQazVrsmgT 0n27XLu1YoYR8Jt4AKkq7haG1ELPJnzenijoSUD/e8JjZPkpQ66HJaiHCf9VS3Kn3fC/hsy7OKxoG KKaAIeAZk+N32is+1vAwt7YIAfZPECMtdTlbkOvX2l3CBVsJiQVJnWn7ZJ50EcCc5Zo5XCsdJZdxm H/vMTtuca6YiTvhdnzn8Wzy8csHtyyZ675PCwloc0aGvCgA3oTA16gHUXrtlE19NSZNgeVa6jyTgn UF/66cYmUXTrGtJs+f05VWfO6zk+Zfrql1Nc+bZZMyuJaqjizKnkNnKTuulubXReHklAealVVdYx5 xFwBprzBw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9t8u-00084e-JC; Wed, 10 Feb 2021 17:19:08 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9t8o-000837-Jz for linux-arm-kernel@lists.infradead.org; Wed, 10 Feb 2021 17:19:03 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6BB3464EAA; Wed, 10 Feb 2021 17:18:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612977541; bh=ttjPRouIOPlSkyqjYj/ltvyLuVoeWCC/qc6EwvnywPw=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=DuT9+Ip683GFvV2jF7y5QdbomjYOsXM3OkgrtjcbtFatjEsE9WssJV/fdDjDBWTWd Op6NzThGXPjQUm1rXATv90+BiTA1K28fbXa5ILBXSQEwqp4vdOB/fXB4/Et+fhlxtn It+5yD6OdI+ULdADTQUi6m0i2TaEz4FT9tm/N23QSk80vhVTC67SyeTtlqancV0JmY Ym0kRF/JuyQOYnchclYGRE0dHddY/gEwRrd8QMFCu95J8viC3JaHltMeMCWFVRVTzy 9/Jh48QKuJypAvJ2CA9ugNftRvwrYboTe57uaQr0g7GNPJRDGSRDXOM8Cg3TtNkGxQ z/5sJvsiCY3ow== From: Krzysztof Kozlowski List-Id: To: "Paul J. Murphy" , Daniele Alessandrelli , Rob Herring , Catalin Marinas , Will Deacon , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm@kernel.org, soc@kernel.org, Arnd Bergmann , Olof Johansson Subject: [PATCH 03/11] arm64: dts: intel: socfpga: override clocks by label Date: Wed, 10 Feb 2021 18:18:15 +0100 Message-Id: <20210210171823.333802-3-krzk@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210210171823.333802-1-krzk@kernel.org> References: <20210210171823.333802-1-krzk@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210210_121902_815613_7732BFDC X-CRM114-Status: GOOD ( 13.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Krzysztof Kozlowski Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Using full paths to extend or override a device tree node is error prone. If there was a typo error, a new node will be created instead of extending the existing node. This will lead to run-time errors that could be hard to detect. A mistyped label on the other hand, will cause a dtc compile error (during build time). Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 12 ++++-------- .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 12 ++++-------- arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts index a7a83f29f00b..f14a89ca8784 100644 --- a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts +++ b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts @@ -41,14 +41,6 @@ memory { /* We expect the bootloader to fill in the reg */ reg = <0 0 0 0>; }; - - soc { - clocks { - osc1 { - clock-frequency = <25000000>; - }; - }; - }; }; &gpio1 { @@ -92,6 +84,10 @@ &mmc { bus-width = <4>; }; +&osc1 { + clock-frequency = <25000000>; +}; + &uart0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts index 979aa59a6bd0..58a827a5e83f 100644 --- a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts +++ b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts @@ -41,14 +41,6 @@ memory { /* We expect the bootloader to fill in the reg */ reg = <0 0 0 0>; }; - - soc { - clocks { - osc1 { - clock-frequency = <25000000>; - }; - }; - }; }; &gpio1 { @@ -121,6 +113,10 @@ partition@4280000 { }; }; +&osc1 { + clock-frequency = <25000000>; +}; + &uart0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts b/arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts index 5f56e2697fee..01f1307ce4ac 100644 --- a/arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts +++ b/arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts @@ -23,14 +23,6 @@ memory { /* We expect the bootloader to fill in the reg */ reg = <0 0 0 0>; }; - - soc { - clocks { - osc1 { - clock-frequency = <25000000>; - }; - }; - }; }; &clkmgr { @@ -44,6 +36,10 @@ &mmc { bus-width = <4>; }; +&osc1 { + clock-frequency = <25000000>; +}; + &uart0 { status = "okay"; };