From patchwork Sat Jul 2 04:20:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 9210691 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AAA8660752 for ; Sat, 2 Jul 2016 04:20:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F87A2839C for ; Sat, 2 Jul 2016 04:20:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81AF4286C5; Sat, 2 Jul 2016 04:20:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 113212839C for ; Sat, 2 Jul 2016 04:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750735AbcGBEUZ (ORCPT ); Sat, 2 Jul 2016 00:20:25 -0400 Received: from mail-oi0-f43.google.com ([209.85.218.43]:32802 "EHLO mail-oi0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750703AbcGBEUY (ORCPT ); Sat, 2 Jul 2016 00:20:24 -0400 Received: by mail-oi0-f43.google.com with SMTP id u201so135261875oie.0 for ; Fri, 01 Jul 2016 21:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Gj1ygULBbletWw7O85b1f47YxmxRKL0A9xkAImzW/2s=; b=kc/s6bmGq0PwcmJJMHvSpF4adLfNLvI55xyz5kvzLHRig4IpRNqj9oSv7SgMtCxX9q +g7QbwE+jmum5hRJ3hxr8ow3C1vzvlH3/yg/HtV2tIHT1M98wkNTjXXwY7qyZz/mNcNn Uo+tZRPRSALdKz55Cc2i65mJDC7Ap3cppwSt8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Gj1ygULBbletWw7O85b1f47YxmxRKL0A9xkAImzW/2s=; b=fbykCERDLn0LNjgqBQCCE7eaTTHaugT3kF5GrlDFoY1GKhZ571yk31b6cG31Q/SmcK SkCXfRpP4Y6YNuUQkfA5FDecqSWPNnp4pqBEYvAmfKnd2PMe/OlU4G/lBtobzfCBV5px +0gDSciLEjoZ0kMY3vQJoXbeRMtFdDwAOaV+yX1zBlaBXhIjSHjvIhiCFvkbOGRQMpGC gh4WhuUCUFTXoJWoB5VymOMXjbX4XbsCKTY21z9UD9b+T9/4ycdabQUmJU/Mvx27PFbL OnMtxM1OmAWnFaiayopCXe249LdhJJzZJga6+9jMiKofMSe54VUJvdXZibB0JdXWMkUM if/g== X-Gm-Message-State: ALyK8tLX8PM/RfP/FbZde/IyIWHbfxv0JXhU+tVltKHsFr2jdUsckji5t+EOnX7NVRClOZjj X-Received: by 10.157.32.234 with SMTP id x97mr1108070ota.28.1467433223281; Fri, 01 Jul 2016 21:20:23 -0700 (PDT) Received: from localhost ([2602:306:c558:19b0:a5b0:dacf:9f25:745d]) by smtp.gmail.com with ESMTPSA id 35sm4464244otb.25.2016.07.01.21.20.22 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 01 Jul 2016 21:20:22 -0700 (PDT) From: Andy Gross To: linux-arm-msm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bjorn Andersson , Stephen Boyd , Kevin Hilman , Andy Gross Subject: [PATCH] firmware: qcom: scm: Change initcall to subsys Date: Fri, 1 Jul 2016 23:20:14 -0500 Message-Id: <1467433214-7667-1-git-send-email-andy.gross@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch changes the initcall for SCM to use subsys_initcall instead of arch_initcall. This corrects the order so that we don't probe defer when trying to get clks which causes issues later when the spm driver makes calls to qcom_set_warm_boot_addr(). The order became an issue due to the changes to use arch_initcall_sync for of_platform_default_populate_init(). Signed-off-by: Andy Gross Reviewed-by: Stephen Boyd Tested-by: Stephen Boyd --- drivers/firmware/qcom_scm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 89c3775..e64a501 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -415,7 +415,7 @@ static int __init qcom_scm_init(void) return platform_driver_register(&qcom_scm_driver); } -arch_initcall(qcom_scm_init); +subsys_initcall(qcom_scm_init); static void __exit qcom_scm_exit(void) {