From patchwork Mon Jan 6 14:36: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: 3438521 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 88025C02DC for ; Mon, 6 Jan 2014 14:38:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F60D2017A for ; Mon, 6 Jan 2014 14:38:17 +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 B1E4920170 for ; Mon, 6 Jan 2014 14:38:12 +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 1W0BJE-0005g0-8g; Mon, 06 Jan 2014 14:37:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0BJ8-0003fM-AR; Mon, 06 Jan 2014 14:37:34 +0000 Received: from mail-ee0-f51.google.com ([74.125.83.51]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0BJ5-0003dc-Vd for linux-arm-kernel@lists.infradead.org; Mon, 06 Jan 2014 14:37:33 +0000 Received: by mail-ee0-f51.google.com with SMTP id b15so7949565eek.38 for ; Mon, 06 Jan 2014 06:37:10 -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 :in-reply-to:references:in-reply-to:references:content-type; bh=ztjLyhs9dip0XobwqgaHGR+NNcCyShM6WepZWH6KpyY=; b=O6H0bgq3T+Rp3VvNhu8FKaG//a/zpd5L11sD4UNvKmIuUc+N/BHL+mzqMYbFq6d2VA Oz2qQVe2B5XaSC465YXecxEjWdFENCP0kQaOwVOyRz8E2tsLmolVzkdSGbsYcBzbH3Kv fReDQA1cvrsIyFsAW+KaW1hxPIGcOBSmRtyhW6NLQeSnFA3QXMt2JuJrgoMDzeTxssMc 4g0xNYQwatWzsSh+LG3F9n2Eg3G+VW/WBfo3HLU7IPm4mjwfH3Hj5jWtSxacUc1UylGm Eb41D8bDYreBi9eICW997dDwEeZkhqym4LkKWwHZ1hfUdXj2m3MSiubkvFRGOLekkU2j pfGg== X-Gm-Message-State: ALoCoQn1Mj4oEobJQKPTAZioIMHHt05l+LCJj1hDgN+r6J0BMJEkQVq3+zziOVsuy9fBU3u4cvWA X-Received: by 10.14.225.2 with SMTP id y2mr17103120eep.62.1389019029611; Mon, 06 Jan 2014 06:37:09 -0800 (PST) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id o47sm171510537eem.21.2014.01.06.06.37.01 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 06 Jan 2014 06:37:06 -0800 (PST) From: Michal Simek To: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Soren Brinkmann , Steffen Trumtrar Subject: [PATCH 1/7] ARM: zynq: Move clock_init from slcr to common Date: Mon, 6 Jan 2014 15:36:37 +0100 Message-Id: <3374e74f85daade60ec31b3aa05151bbe39759d0.1389018985.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140106_093732_122265_55B2FA91 X-CRM114-Status: GOOD ( 15.81 ) X-Spam-Score: -1.9 (-) Cc: Josh Cartwright , monstr@monstr.eu, Russell King , Peter Crosthwaite , linux-kernel@vger.kernel.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 X-Spam-Status: No, score=-4.5 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 From: Steffen Trumtrar Preparation step for next changes. Signed-off-by: Steffen Trumtrar Signed-off-by: Michal Simek --- arch/arm/mach-zynq/common.c | 2 ++ arch/arm/mach-zynq/slcr.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.8.2.3 diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 1db2a5ca..bf6717f 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -64,6 +64,8 @@ static void __init zynq_init_machine(void) static void __init zynq_timer_init(void) { zynq_slcr_init(); + + zynq_clock_init(zynq_slcr_base); clocksource_of_init(); } diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index 1836d5a..59ad09f 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c @@ -106,8 +106,6 @@ int __init zynq_slcr_init(void) pr_info("%s mapped to %p\n", np->name, zynq_slcr_base); - zynq_clock_init(zynq_slcr_base); - of_node_put(np); return 0;