From patchwork Mon Mar 8 16:22:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12122909 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=-18.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 EA66EC433E0 for ; Mon, 8 Mar 2021 16:22:41 +0000 (UTC) Received: by mail.kernel.org (Postfix) id BCA216522E; Mon, 8 Mar 2021 16:22:41 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id D849365226; Mon, 8 Mar 2021 16:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615220561; bh=ttjPRouIOPlSkyqjYj/ltvyLuVoeWCC/qc6EwvnywPw=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=DiajB48UxAbLJpD+KQsgalkZq/PsHAA/Kt1GC2tSjfncWbMkrJWhLfK8nzumSFKTb HgCjIz/9Q3CxmX2T3JcJPgO2s7RAB0IddZY8SVu28UutzzRofWakcZTHU7QylnmzRc CVYBkuuXnAqiJZY+JH2UE+iRFUrpVA7Gb7K6VMg85TY4JA2/EMOEDCdQ8UY3LcRCBa NyC/B6QuoCnxyN44iqnhYPZQwr+cKkX0mLmz3rIonHH24WeMUB0RSpkgUjYcjtbxtC Xf1rX6INGaksgtzKzVWjRwwAOO8jCxxwzuWZLvrg+MkWs+awPhMAqHEnQ5E1wwmjeM Altlss4GdPmjA== From: Krzysztof Kozlowski List-Id: To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, arm@kernel.org, soc@kernel.org, Arnd Bergmann , Olof Johansson Cc: "Paul J. Murphy" , Daniele Alessandrelli , Rob Herring , Krzysztof Kozlowski Subject: [RESEND PATCH 02/10] arm64: dts: intel: socfpga: override clocks by label Date: Mon, 8 Mar 2021 17:22:20 +0100 Message-Id: <20210308162228.62614-3-krzk@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308162228.62614-1-krzk@kernel.org> References: <20210308162228.62614-1-krzk@kernel.org> MIME-Version: 1.0 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"; };