From patchwork Mon Nov 19 16:52:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1766221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 5FD6A3FCDE for ; Mon, 19 Nov 2012 16:57:21 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaUcM-0003VJ-0Q; Mon, 19 Nov 2012 16:54:42 +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 1TaUar-0002xr-3V for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2012 16:53:13 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 87B85289; Mon, 19 Nov 2012 17:52:59 +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 75434261; Mon, 19 Nov 2012 17:52:43 +0100 (CET) From: Thomas Petazzoni To: Andrew Lunn Subject: [PATCH 5/7] clk: mvebu: rename *-core-clocks to *-core-clock Date: Mon, 19 Nov 2012 17:52:41 +0100 Message-Id: <1353343963-23034-6-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_115309_462933_64E23DBF X-CRM114-Status: GOOD ( 13.58 ) 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 compatible strings of the mvebu clk-core.c driver to not have the final 's' in '*-core-clocks'. Signed-off-by: Thomas Petazzoni --- .../devicetree/bindings/clock/mvebu-core-clock.txt | 12 ++++++------ arch/arm/boot/dts/armada-370.dtsi | 2 +- arch/arm/boot/dts/armada-xp.dtsi | 2 +- arch/arm/boot/dts/dove.dtsi | 2 +- arch/arm/boot/dts/kirkwood.dtsi | 2 +- drivers/clk/mvebu/clk-core.c | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt index ffb3d69..1e66294 100644 --- a/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt +++ b/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt @@ -19,11 +19,11 @@ The following is a list of provided IDs and clock names on Kirkwood and Dove: Required properties: - compatible : shall be one of the following: - "marvell,armada-370-core-clocks" - For Armada 370 SoC core clocks - "marvell,armada-xp-core-clocks" - For Armada XP SoC core clocks - "marvell,dove-core-clocks" - for Dove SoC core clocks - "marvell,kirkwood-core-clocks" - for Kirkwood SoC (except mv88f6180) - "marvell,mv88f6180-core-clocks" - for Kirkwood MV88f6180 SoC + "marvell,armada-370-core-clock" - For Armada 370 SoC core clocks + "marvell,armada-xp-core-clock" - For Armada XP SoC core clocks + "marvell,dove-core-clock" - for Dove SoC core clocks + "marvell,kirkwood-core-clock" - for Kirkwood SoC (except mv88f6180) + "marvell,mv88f6180-core-clock" - for Kirkwood MV88f6180 SoC - reg : shall be the register address of the Sample-At-Reset (SAR) register - #clock-cells : from common clock binding; shall be set to 1 @@ -34,7 +34,7 @@ Optional properties: Example: core_clk: core-clocks@d0214 { - compatible = "marvell,dove-core-clocks"; + compatible = "marvell,dove-core-clock"; reg = <0xd0214 0x4>; #clock-cells = <1>; }; diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index d4fac86..1ed9e5c 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -83,7 +83,7 @@ }; coreclk: mvebu-sar@d0018230 { - compatible = "marvell,armada-370-core-clocks"; + compatible = "marvell,armada-370-core-clock"; reg = <0xd0018230 0x08>; #clock-cells = <1>; }; diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index a3824ac..d05515c 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -55,7 +55,7 @@ }; coreclk: mvebu-sar@d0018230 { - compatible = "marvell,armada-xp-core-clocks"; + compatible = "marvell,armada-xp-core-clock"; reg = <0xd0018230 0x08>; #clock-cells = <1>; }; diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 8c8ab621..b524ee3 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -32,7 +32,7 @@ }; core_clk: core-clocks@d0214 { - compatible = "marvell,dove-core-clocks"; + compatible = "marvell,dove-core-clock"; reg = <0xd0214 0x4>; #clock-cells = <1>; }; diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 46bfa3c..0e94750 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -24,7 +24,7 @@ #size-cells = <1>; core_clk: core-clocks@10030 { - compatible = "marvell,kirkwood-core-clocks"; + compatible = "marvell,kirkwood-core-clock"; reg = <0x10030 0x4>; #clock-cells = <1>; }; diff --git a/drivers/clk/mvebu/clk-core.c b/drivers/clk/mvebu/clk-core.c index 7e715ae..69056a7 100644 --- a/drivers/clk/mvebu/clk-core.c +++ b/drivers/clk/mvebu/clk-core.c @@ -634,28 +634,28 @@ static const struct core_clocks mv88f6180_core_clocks = { static const __initdata struct of_device_id clk_core_match[] = { #ifdef CONFIG_MACH_ARMADA_370_XP { - .compatible = "marvell,armada-370-core-clocks", + .compatible = "marvell,armada-370-core-clock", .data = &armada_370_core_clocks, }, { - .compatible = "marvell,armada-xp-core-clocks", + .compatible = "marvell,armada-xp-core-clock", .data = &armada_xp_core_clocks, }, #endif #ifdef CONFIG_ARCH_DOVE { - .compatible = "marvell,dove-core-clocks", + .compatible = "marvell,dove-core-clock", .data = &dove_core_clocks, }, #endif #ifdef CONFIG_ARCH_KIRKWOOD { - .compatible = "marvell,kirkwood-core-clocks", + .compatible = "marvell,kirkwood-core-clock", .data = &kirkwood_core_clocks, }, { - .compatible = "marvell,mv88f6180-core-clocks", + .compatible = "marvell,mv88f6180-core-clock", .data = &mv88f6180_core_clocks, }, #endif