From patchwork Mon Nov 19 16:52:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1766231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 913BFDF264 for ; Mon, 19 Nov 2012 16:57:33 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaUce-0003fL-8P; Mon, 19 Nov 2012 16:55:01 +0000 Received: from mail.free-electrons.com ([88.190.12.23]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaUax-0002zx-9e for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2012 16:53:16 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 7296618D; Mon, 19 Nov 2012 17:53:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-3.5 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham version=3.3.1 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id AC025268; Mon, 19 Nov 2012 17:52:44 +0100 (CET) From: Thomas Petazzoni To: Andrew Lunn Subject: [PATCH 6/7] clk: mvebu: rename armada-xp-cpu-clockctrl to armada-xp-cpu-clock Date: Mon, 19 Nov 2012 17:52:42 +0100 Message-Id: <1353343963-23034-7-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1353343963-23034-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1353343963-23034-1-git-send-email-thomas.petazzoni@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121119_115315_940218_E26CBD5C X-CRM114-Status: GOOD ( 12.14 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Gregory Clement , Lior Amsalem , Jason Cooper , linux-arm-kernel@lists.infradead.org, Maen Suleiman X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Most of the existing clock drivers have a compatible string that ends with "-clock", so change the "armada-xp-cpu-clockctrl" compatible strings of the mvebu clk-cpu.c driver to "armada-xp-cpu-clock". Signed-off-by: Thomas Petazzoni --- .../devicetree/bindings/clock/mvebu-cpu-clock.txt | 4 ++-- arch/arm/boot/dts/armada-xp.dtsi | 2 +- drivers/clk/mvebu/clk-cpu.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt index 1fb5a64..feb8301 100644 --- a/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt +++ b/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt @@ -2,14 +2,14 @@ Device Tree Clock bindings for cpu clock of Marvell EBU platforms Required properties: - compatible : shall be one of the following: - "marvell,armada-xp-cpu-clockctrl" - cpu clocks for Armada XP + "marvell,armada-xp-cpu-clock" - cpu clocks for Armada XP - reg : Address and length of the clock complex register set - #clock-cells : should be set to 1. - clocks : shall be the input parent clock phandle for the clock. cpuclk: clock-complex@d0018700 { #clock-cells = <1>; - compatible = "marvell,armada-xp-cpu-clockctrl"; + compatible = "marvell,armada-xp-cpu-clock"; reg = <0xd0018700 0xA0>; clocks = <&coreclk 1>; } diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index d05515c..781127e 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -62,7 +62,7 @@ cpuclk: clock-complex@d0018700 { #clock-cells = <1>; - compatible = "marvell,armada-xp-cpu-clockctrl"; + compatible = "marvell,armada-xp-cpu-clock"; reg = <0xd0018700 0xA0>; clocks = <&coreclk 1>; }; diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c index 3d7c9f1..44f541a 100644 --- a/drivers/clk/mvebu/clk-cpu.c +++ b/drivers/clk/mvebu/clk-cpu.c @@ -156,7 +156,7 @@ bail_out: static const __initconst struct of_device_id clk_cpu_match[] = { { - .compatible = "marvell,armada-xp-cpu-clockctrl", + .compatible = "marvell,armada-xp-cpu-clock", .data = of_cpu_clk_setup, }, {