From patchwork Fri May 4 00:57:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 10379563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E9BEA6038F for ; Fri, 4 May 2018 01:01:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2582292AB for ; Fri, 4 May 2018 01:01:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3E3F292D5; Fri, 4 May 2018 01:01:31 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 1453C292AB for ; Fri, 4 May 2018 01:01:31 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=nMN2i9CDl2/smaJVh2/IbCYzAvhzrf8/sY6v/bm4z3I=; b=kUdNvR7W8dAUjd0bTmRjGeA/mA Ggt+hjNmtsV8aJWTAK7RZX7h0Cp4dp/txJjz5wpRopnI0Ay2oR3BbzbaktcDdzU3V7Qp8TAzT0BrL QuQ+hKq/wys8zzpJaHHZm4tFVrjV2QZO9wxnj4FrIMbhjezSea1sPhneS8S7xvCmSk0tjcwGTjsvT IvaIyNoBW93WzNvbWOHzA2DptYNcCU4KnccdfZ7Rm8ewyzvlBAGMV706vVJYorZEd0TZHYf/9sdsf 93mLt0n7iBCrLXenHUHkJsqmqIfvQw3VBUPupG6jMcoF6kfMqclSiIutg7jXaaZAnLrVF2/gmzVpX U46gA5Pg==; 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 1fEP69-0005Xh-QT; Fri, 04 May 2018 01:01:21 +0000 Received: from mail-pg0-f68.google.com ([74.125.83.68]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fEP3H-00030z-LS for linux-arm-kernel@lists.infradead.org; Fri, 04 May 2018 00:58:25 +0000 Received: by mail-pg0-f68.google.com with SMTP id i29-v6so14299340pgn.12 for ; Thu, 03 May 2018 17:58:13 -0700 (PDT) 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; bh=LSkPXbXEM5dRENRS3uLEUPREdg5lbmgVhV+WxtXPlgo=; b=IdHBdWhKFH3vQPNkil0SftCf8hIi7PoNIkR4xVhanq0qJEPZXcXPhlpMQuFvDmY/kb RB6usuHA1aokNfesUN6INGqTZjGBznyAAOmzeyG5AapEZn9Q+pCnaiAQESogM4gmNOql +taooTp+NH7c/ZGSbYS/UbAVdfCem7wd4qxr/ZgpjxPxFN12pT7GKPcXF9sszbDk04ng qPNk3QVzitEfRV6NWwpbhchEmVyAx28mOUf5yAq+6CSW8MKHFRyPy7dZJTQj/CnCdJFy X7rqrI7NdmNHaO9kTNUvgB+TmwzhLNUd5NEM/rHbMSBFZ/+kCw7/jU9/VuP9ctJu2mKh GT+Q== X-Gm-Message-State: ALQs6tDa8y69VS2TYfSzPy3eoeRxhey3Xz4djCFWYK4UvT2iKUtJ9wj0 KiK8ZuIgtLaa8JxmgvppN4kERw== X-Google-Smtp-Source: AB8JxZqTwhUFA5eDD5dfcgiEvjfMfovpvHY4YF60NLW/CI6NvZdgewJupjELessRGPz2zYKSYvlQmA== X-Received: by 10.98.127.145 with SMTP id a139mr24979512pfd.25.1525395492530; Thu, 03 May 2018 17:58:12 -0700 (PDT) Received: from localhost.localdomain ([180.106.220.129]) by smtp.gmail.com with ESMTPSA id b89sm33948109pfd.85.2018.05.03.17.58.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 May 2018 17:58:11 -0700 (PDT) From: Shawn Guo To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/4] ARM: dts: imx: drop 'clocks' container for board level clocks Date: Fri, 4 May 2018 08:57:26 +0800 Message-Id: <1525395446-1953-5-git-send-email-shawnguo@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1525395446-1953-1-git-send-email-shawnguo@kernel.org> References: <1525395446-1953-1-git-send-email-shawnguo@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180503_175823_749171_6A8F1BE1 X-CRM114-Status: GOOD ( 13.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , Rob Herring , Shawn Guo , linux-imx@nxp.com, kernel@pengutronix.de MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP For soc level of clocks which are input to Clock Control Module, clock driver expects them to be under 'clocks' container node. But for board level clocks, this container is not really necessary. Let's drop it and use an unique name for fixed rate clock, so that 'reg' property can be saved as well. Signed-off-by: Shawn Guo Acked-By: Lothar Waßmann --- arch/arm/boot/dts/imx28-tx28.dts | 13 ++++--------- arch/arm/boot/dts/imx53-tx53.dtsi | 11 +++++------ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++--------- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 11 ++++------- 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts index 687186358c18..e4f19f9be6d0 100644 --- a/arch/arm/boot/dts/imx28-tx28.dts +++ b/arch/arm/boot/dts/imx28-tx28.dts @@ -140,15 +140,10 @@ regulator-boot-on; }; - clocks { - #address-cells = <1>; - #size-cells = <0>; - mclk: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <26000000>; - }; + mclk: clock-mclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; }; sound { diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi index 77f2ce9f1e41..5dd3dd3a2fd0 100644 --- a/arch/arm/boot/dts/imx53-tx53.dtsi +++ b/arch/arm/boot/dts/imx53-tx53.dtsi @@ -67,13 +67,12 @@ ckih1 { clock-frequency = <0>; }; + }; - mclk: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <26000000>; - }; + mclk: clock-mclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; }; gpio-keys { diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index ea184d108491..3dee3af1a4c1 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -72,15 +72,12 @@ stdout-path = "serial0:115200n8"; }; - clocks { - /* Fixed crystal dedicated to mcp251x */ - clk16m: clk@1 { - compatible = "fixed-clock"; - reg = <1>; - #clock-cells = <0>; - clock-frequency = <16000000>; - clock-output-names = "clk16m"; - }; + /* Fixed crystal dedicated to mcp251x */ + clk16m: clock-16m { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <16000000>; + clock-output-names = "clk16m"; }; gpio-keys { diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi index d0e7dab4d72b..d3cba09be0cb 100644 --- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi +++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi @@ -43,13 +43,10 @@ #include "imx6q-ba16.dtsi" / { - clocks { - mclk: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <22000000>; - }; + mclk: clock-mclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <22000000>; }; gpio-poweroff {