From patchwork Thu Oct 3 21:21:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Trumtrar X-Patchwork-Id: 2986151 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2FE3C9F288 for ; Thu, 3 Oct 2013 21:30:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 643E6202C8 for ; Thu, 3 Oct 2013 21:30:21 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4A996201EA for ; Thu, 3 Oct 2013 21:30:20 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRqSW-0003Bo-80; Thu, 03 Oct 2013 21:29:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRqMJ-00017c-Lj; Thu, 03 Oct 2013 21:22:55 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRqMC-000140-Fu for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2013 21:22:50 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1VRqLY-0005VM-NF; Thu, 03 Oct 2013 23:22:08 +0200 Received: from str by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1VRqLX-00041o-B8; Thu, 03 Oct 2013 23:22:07 +0200 From: Steffen Trumtrar To: devicetree@vger.kernel.org Subject: [PATCH v2 5/5] ARM: socfpga: dts: fix s2f_* clock name Date: Thu, 3 Oct 2013 23:21:41 +0200 Message-Id: <1380835301-26512-6-git-send-email-s.trumtrar@pengutronix.de> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1380835301-26512-1-git-send-email-s.trumtrar@pengutronix.de> References: <1380835301-26512-1-git-send-email-s.trumtrar@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: str@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131003_172249_096443_2695E68C X-CRM114-Status: GOOD ( 11.72 ) X-Spam-Score: -2.6 (--) Cc: Mark Rutland , Ian Campbell , Pawel Moll , Stephen Warren , Rob Herring , linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Steffen Trumtrar , Dinh Nguyen X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The s2f_* clocks are called h2f_* in the datasheets. Rename them accordingly in the socfpga.dtsi. Signed-off-by: Steffen Trumtrar Acked-by: Dinh Nguyen --- arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 587096e..e245924 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -147,7 +147,7 @@ reg = <0x58>; }; - cfg_s2f_usr0_clk: cfg_s2f_usr0_clk { + cfg_h2f_usr0_clk: cfg_h2f_usr0_clk { #clock-cells = <0>; compatible = "altr,socfpga-perip-clk"; clocks = <&main_pll>; @@ -198,7 +198,7 @@ reg = <0x98>; }; - s2f_usr1_clk: s2f_usr1_clk { + h2f_usr1_clk: h2f_usr1_clk { #clock-cells = <0>; compatible = "altr,socfpga-perip-clk"; clocks = <&periph_pll>; @@ -235,7 +235,7 @@ reg = <0xD0>; }; - s2f_usr2_clk: s2f_usr2_clk { + h2f_usr2_clk: h2f_usr2_clk { #clock-cells = <0>; compatible = "altr,socfpga-perip-clk"; clocks = <&sdram_pll>; @@ -335,14 +335,14 @@ cfg_clk: cfg_clk { #clock-cells = <0>; compatible = "altr,socfpga-gate-clk"; - clocks = <&cfg_s2f_usr0_clk>; + clocks = <&cfg_h2f_usr0_clk>; clk-gate = <0x60 8>; }; - s2f_user0_clk: s2f_user0_clk { + h2f_user0_clk: h2f_user0_clk { #clock-cells = <0>; compatible = "altr,socfpga-gate-clk"; - clocks = <&cfg_s2f_usr0_clk>; + clocks = <&cfg_h2f_usr0_clk>; clk-gate = <0x60 9>; }; @@ -400,10 +400,10 @@ div-reg = <0xa8 0 24>; }; - s2f_user1_clk: s2f_user1_clk { + h2f_user1_clk: h2f_user1_clk { #clock-cells = <0>; compatible = "altr,socfpga-gate-clk"; - clocks = <&s2f_usr1_clk>; + clocks = <&h2f_usr1_clk>; clk-gate = <0xa0 7>; };