From patchwork Wed Feb 5 14:56:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 3586631 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 73C60C02DC for ; Wed, 5 Feb 2014 14:57:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9546201C8 for ; Wed, 5 Feb 2014 14:57:24 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB81A201B4 for ; Wed, 5 Feb 2014 14:57:23 +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 1WB3uf-0000NE-4X; Wed, 05 Feb 2014 14:57:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WB3ua-0005xs-Lx; Wed, 05 Feb 2014 14:57:12 +0000 Received: from mail-ea0-f177.google.com ([209.85.215.177]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WB3uW-0005xA-Mj for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2014 14:57:09 +0000 Received: by mail-ea0-f177.google.com with SMTP id n15so292446ead.8 for ; Wed, 05 Feb 2014 06:56:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :content-type; bh=Izp2xOwjK/17db5VHr3tPaEUSrAc9cunwnwF2hGsu8Y=; b=a6Gnnmri36TTXItx0Uq0A213rlp3NgzfzlaUr5n5uc7pCEW3IoMTAck/+wLzuaxVmd tiJP6kMEcgLpjZCs848FQ6ugbdRqCTgPFN2r1+rBudrbkW4mSTlQA9ZR2gpwpUnYPZeJ R2cE/h/5KWAfBqY3aXdA3ZsFS74Z08PoSZx4YR/GFJpjX5V54tBLvM2PUHT0OtYNkZQt DMrlZIkAnG1q/l4l4OD2Kojm5bp8ZnBq8uJrS4Rtaepv6HSTSKxNtBMkTKjbb7b3fVxT o25KUm5FcZYLp3ERRANj7F/rG9lHzD69bNQl5gVAuZwobl0sIGoqjiCNC47EysLDfuc1 /5xw== X-Gm-Message-State: ALoCoQkifetuI4QipMMi3RIv/K1MVOD2IqAIxmoCJSiY47Q/i8D4W263+PWyN35Z4zLLU9LF6sRs X-Received: by 10.14.203.197 with SMTP id f45mr2512451eeo.90.1391612206821; Wed, 05 Feb 2014 06:56:46 -0800 (PST) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id y47sm55335025eel.14.2014.02.05.06.56.45 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 05 Feb 2014 06:56:45 -0800 (PST) From: Michal Simek To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: zynq: Move of_clk_init from clock driver Date: Wed, 5 Feb 2014 15:56:37 +0100 Message-Id: <572af6e4eaaaa1c74ea62364f8fa7ac5834cc754.1391612175.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140205_095708_852396_6A68DC83 X-CRM114-Status: GOOD ( 13.44 ) X-Spam-Score: -1.9 (-) Cc: Josh Cartwright , monstr@monstr.eu, James Hogan , Russell King , Stephen Warren , Stephen Boyd , Peter Crosthwaite , linux-kernel@vger.kernel.org, Felipe Pena , Mike Turquette , Steffen Trumtrar , Soren Brinkmann 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.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS, 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 Move of_clk_init() from clock driver to enable options not to use zynq clock driver. Use for example fixed clock setting. Signed-off-by: Michal Simek --- Based on http://www.spinics.net/lists/arm-kernel/msg298287.html series --- arch/arm/mach-zynq/common.c | 1 + drivers/clk/zynq/clkc.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) -- 1.8.2.3 diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 93ea19b..8df35f3 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -68,6 +68,7 @@ static void __init zynq_timer_init(void) zynq_early_slcr_init(); zynq_clock_init(); + of_clk_init(NULL); clocksource_of_init(); } diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c index 03052d6..c812b93 100644 --- a/drivers/clk/zynq/clkc.c +++ b/drivers/clk/zynq/clkc.c @@ -602,8 +602,6 @@ void __init zynq_clock_init(void) of_node_put(slcr); of_node_put(np); - of_clk_init(NULL); - return; np_err: