From patchwork Sat May 11 01:08:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 2552661 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id AE0E23FC5A for ; Sat, 11 May 2013 01:08:53 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UayIq-0006Cu-TI; Sat, 11 May 2013 01:08:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UayIn-0006Pw-HY; Sat, 11 May 2013 01:08:45 +0000 Received: from mail-ee0-f54.google.com ([74.125.83.54]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UayIk-0006OS-3j for linux-arm-kernel@lists.infradead.org; Sat, 11 May 2013 01:08:43 +0000 Received: by mail-ee0-f54.google.com with SMTP id e50so1855523eek.13 for ; Fri, 10 May 2013 18:08:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=gqjSwfPLAK5D+wXKyyf1kWE1qvNWV9QoWErxSGqLW3M=; b=IhWf2nWonokCu3YZFwmzLLXl1PfWJEOFOjhaMaKJO8Jn01m7FlT5ntO7B6Wnp5wHDa QwLAMta+RrXf1HrCKW3+ZCrmtprJqP4WkT95mXNeFe+ACEj4w+9+9JT3pdnYeKYXwv4L AwVQIChHL6Sb9BJdAa8cisoKU43r8uaXhF5QnM/RsArjVEjFLNpLfqvt5xCEJ6pYKqgp 3Aey2dwo8730XdNI7aRVXIQrTCEpKV3YVjCZrfEL/pvKo022/qsDlZ+O1P3gbbatlf/h dQIG7OYScqmF9ys1BaFjQX6bl9oR1ws/nSs//DLVFDqkBH9ofU6IwnspLewGAsbZ1csc QA0w== X-Received: by 10.14.213.67 with SMTP id z43mr47181537eeo.16.1368234502710; Fri, 10 May 2013 18:08:22 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-181.pools.arcor-ip.net. [82.83.251.181]) by mx.google.com with ESMTPSA id x41sm6790583eey.17.2013.05.10.18.08.20 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 May 2013 18:08:21 -0700 (PDT) Received: from edge.lan (magicgate.lan [192.168.1.1]) by topkick.lan (Postfix) with ESMTPSA id 2E4A4605ED; Sat, 11 May 2013 03:07:44 +0200 (CEST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 09/10] ARM: mvebu: move DT boards to SoC-centric clock init Date: Sat, 11 May 2013 03:08:09 +0200 Message-Id: <1368234490-31416-10-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368234490-31416-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1368234490-31416-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130510_210842_278443_28604B0B X-CRM114-Status: GOOD ( 13.04 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.54 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sebastian.hesselbarth[at]gmail.com) -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: Thomas Petazzoni , Andrew Lunn , Russell King , Jason Cooper , linux-kernel@vger.kernel.org, Gregory Clement , Mike Turquette , linux-arm-kernel@lists.infradead.org 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 SoC centric clock init for Armada 370/XP can be used by calling of_clk_init. Use it and get rid of mvebu_clocks_init. Signed-off-by: Sebastian Hesselbarth --- Cc: Jason Cooper Cc: Andrew Lunn Cc: Russell King Cc: Gregory Clement Cc: Thomas Petazzoni Cc: Mike Turquette Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/mach-mvebu/Kconfig | 5 ++--- arch/arm/mach-mvebu/armada-370-xp.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index e11acbb..6512837 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -10,9 +10,6 @@ config ARCH_MVEBU select PLAT_ORION select SPARSE_IRQ select CLKDEV_LOOKUP - select MVEBU_CLK_CORE - select MVEBU_CLK_CPU - select MVEBU_CLK_GATING select MVEBU_MBUS select ZONE_DMA if ARM_LPAE @@ -29,6 +26,7 @@ config MACH_ARMADA_370_XP config MACH_ARMADA_370 bool "Marvell Armada 370 boards" + select ARMADA_370_CLK select MACH_ARMADA_370_XP select PINCTRL_ARMADA_370 help @@ -37,6 +35,7 @@ config MACH_ARMADA_370 config MACH_ARMADA_XP bool "Marvell Armada XP boards" + select ARMADA_XP_CLK select MACH_ARMADA_370_XP select PINCTRL_ARMADA_XP help diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 42a4cb3..1d018e4 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c @@ -14,10 +14,10 @@ #include #include +#include #include #include #include -#include #include #include #include @@ -45,7 +45,7 @@ void __init armada_370_xp_map_io(void) void __init armada_370_xp_timer_and_clk_init(void) { - mvebu_clocks_init(); + of_clk_init(NULL); armada_370_xp_timer_init(); }