From patchwork Thu May 1 14:05:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 29495 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9649D203F3 for ; Thu, 1 May 2014 14:07:50 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id hw13sf1476253qab.7 for ; Thu, 01 May 2014 07:07:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=QVGPI19jC8oiC98VV6ELpxSDRi9mjpIVt53jelXzrVg=; b=XLPV8w0cEi8MU0SypHivIYzRmxf3yF8QYjAWLgErMwt9d7rdoj4GfudfJG3RS7MasA uO2WYW2MplXcWCH3G193Zk1798vXb6CEfnZ2vxKASdxTMf6oPceeDaCZO0GxKxQNv59D qw24GYM+j+qDRFu2iwmZPwk2vK6iK/9lVjgo7S4TdeBOv5ZUu7RA3Zg1nNZmtFh4aUkb I1m6/cwqJGD5BqTe/fhkezEFBLNNuAWPbj47p7+tDogyYPVP2gOkGQIfeyUClRdf9B/p Jsby0ONNizhpm1oXVR50UP074O+egDcpoHcYNvG5GXW0LcJTpfQbOiJtkyH1w+DOexi+ 0D2w== X-Gm-Message-State: ALoCoQnMA9I63WGu+xX5MSIH0CjP1267LFRfhffY5rA/LTxw/Y4uE7aqJgNG8J+dIhurVlUCmGjF X-Received: by 10.236.35.33 with SMTP id t21mr5093079yha.11.1398953270378; Thu, 01 May 2014 07:07:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.68 with SMTP id q62ls1167531qgd.27.gmail; Thu, 01 May 2014 07:07:50 -0700 (PDT) X-Received: by 10.221.74.200 with SMTP id yx8mr8859755vcb.3.1398953270280; Thu, 01 May 2014 07:07:50 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id v14si6069507vco.111.2014.05.01.07.07.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 May 2014 07:07:50 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id lh4so3916889vcb.6 for ; Thu, 01 May 2014 07:07:50 -0700 (PDT) X-Received: by 10.58.38.40 with SMTP id d8mr240575vek.61.1398953270189; Thu, 01 May 2014 07:07:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp26952vcb; Thu, 1 May 2014 07:07:49 -0700 (PDT) X-Received: by 10.224.10.195 with SMTP id q3mr9322829qaq.65.1398953269853; Thu, 01 May 2014 07:07:49 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id f10si2095229qab.222.2014.05.01.07.07.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 May 2014 07:07:49 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wfrcp-00041b-ET; Thu, 01 May 2014 14:06:11 +0000 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21] helo=cam-smtp0.cambridge.arm.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wfrcm-0003vu-Rn for linux-arm-kernel@lists.infradead.org; Thu, 01 May 2014 14:06:10 +0000 Received: from e102109-lin.cambridge.arm.com (e102109-lin.cambridge.arm.com [10.1.203.182]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id s41E5cZ6022401; Thu, 1 May 2014 15:05:38 +0100 From: Catalin Marinas To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] vexpress: Initialise the sysregs before setting up the clocks Date: Thu, 1 May 2014 15:05:07 +0100 Message-Id: <1398953107-29426-1-git-send-email-catalin.marinas@arm.com> X-Mailer: git-send-email 1.7.12.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140501_070609_321221_0576BE6C X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [217.140.96.21 listed in list.dnswl.org] -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: Mike Turquette 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: catalin.marinas@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Following arm64 commit bc3ee18a7a57 (arm64: init: Move of_clk_init to time_init()), vexpress_osc_of_setup() is called via of_clk_init() long before initcalls are issued. Initialising the vexpress oscillators requires the vespress sysregs to be already initialised, so this patch adds an explicit call to vexpress_sysreg_of_early_init() in vexpress oscillator setup function. In addition, vexpress_sysreg_init() is changed to a device_initcall() as the core_initcall() is no longer required. Signed-off-by: Catalin Marinas Tested-by: Will Deacon Acked-by: Will Deacon Tested-by: Pawel Moll Acked-by: Pawel Moll Cc: Mike Turquette --- Mike, I'd like to get this in for 3.15 and I'm happy to push it via the arm64 tree. Are you ok with this? Thanks. drivers/clk/versatile/clk-vexpress-osc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c index a535c7bf8574..422391242b39 100644 --- a/drivers/clk/versatile/clk-vexpress-osc.c +++ b/drivers/clk/versatile/clk-vexpress-osc.c @@ -100,6 +100,8 @@ void __init vexpress_osc_of_setup(struct device_node *node) struct clk *clk; u32 range[2]; + vexpress_sysreg_of_early_init(); + osc = kzalloc(sizeof(*osc), GFP_KERNEL); if (!osc) return;