From patchwork Sat Aug 17 06:15:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 267947 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3241B2C0270 for ; Sat, 17 Aug 2013 16:16:36 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAZoK-0006AK-Rr; Sat, 17 Aug 2013 06:16:29 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAZoI-0001Gd-Kj; Sat, 17 Aug 2013 06:16:26 +0000 Received: from smtp36.i.mail.ru ([94.100.177.96]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAZoE-0001Eh-GU for linux-arm-kernel@lists.infradead.org; Sat, 17 Aug 2013 06:16:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=Message-Id:Date:Subject:Cc:To:From; bh=RCoVmTFsUqBiOxA+FGa/1hbl9UbevCkqyjfmI9Zhg1w=; b=nd+Ib5jqhLh/PJEUiPbdvc2zQQMhdY/Am/q6AVZCkesV3KARY3qhpYEFjch9x2EfJHoWBmYmGmWFOyEsMOIrOMVhdBOkcbann875p4YbyOtTqUHfCf5KB6XdU7IaDBfvD0Qyvpfya/zsE9P0glULwUFBiQazPqNY0mexiz+UCi4=; Received: from [188.134.40.128] (port=33820 helo=shc.zet) by smtp36.i.mail.ru with esmtpa (envelope-from ) id 1VAZnr-000449-2F; Sat, 17 Aug 2013 10:15:59 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] ARM: i.MX6Q clocks: Fix CKIH clock name Date: Sat, 17 Aug 2013 10:15:53 +0400 Message-Id: <1376720153-19659-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.1.5 X-Spam: Not detected X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130817_021622_831703_DE618375 X-CRM114-Status: UNSURE ( 8.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (shc_work[at]mail.ru) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Shawn Guo , Alexander Shiyan , Sascha Hauer X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org i.MX6Q have only one High-frequency reference clock (CKIH). Patch removes index from CKIH and makes name according datasheet. This is just a cosmetic fix and since this clock currently is not used by any DTS, change should be safe. Signed-off-by: Alexander Shiyan --- arch/arm/boot/dts/imx6qdl.dtsi | 4 ++-- arch/arm/mach-imx/clk-imx6q.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index ccd55c2..d8a2f5fd 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -54,8 +54,8 @@ clock-frequency = <32768>; }; - ckih1 { - compatible = "fsl,imx-ckih1", "fixed-clock"; + ckih { + compatible = "fsl,imx-ckih", "fixed-clock"; clock-frequency = <0>; }; diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index 9181a24..8f2a8b5 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -292,7 +292,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk[dummy] = imx_clk_fixed("dummy", 0); clk[ckil] = imx_obtain_fixed_clock("ckil", 0); - clk[ckih] = imx_obtain_fixed_clock("ckih1", 0); + clk[ckih] = imx_obtain_fixed_clock("ckih", 0); clk[osc] = imx_obtain_fixed_clock("osc", 0); np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop");