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: 9210695 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 2E9E160752 for ; Sat, 2 Jul 2016 04:22:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 179AD286A5 for ; Sat, 2 Jul 2016 04:22:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BA4F286C5; Sat, 2 Jul 2016 04:22:38 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9C201286A5 for ; Sat, 2 Jul 2016 04:22:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bJCQC-0007iy-Sr; Sat, 02 Jul 2016 04:20:48 +0000 Received: from mail-oi0-x22f.google.com ([2607:f8b0:4003:c06::22f]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bJCQ9-0007hk-0i for linux-arm-kernel@lists.infradead.org; Sat, 02 Jul 2016 04:20:46 +0000 Received: by mail-oi0-x22f.google.com with SMTP id r2so135509380oih.2 for ; Fri, 01 Jul 2016 21:20:24 -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=BdbqgZBRZMnSkFPRUtCw+k9+8za07PTGv1UCbuh+vJsS3GzVZ7DVpZXCMrnWhC9VxC 8Q5TMA5x6lFB+BUdDslSlZJMAjJSAonn7Mcn/grXSnf/vf02fG3A9o/UBDjB6hf7NvEG 9czUNnfu0fa3Z0cNqdqo4lFthXiNw2JAhv89lS24nweP0+tlLi48Hru0poD5Yn3iNSZs dU8fyULUw09DlHa4OBOShd2aXfRdLNNAyNdqD+5uqBbuthQbobIS2mp720kmxzSoUnyq LHPfD2OIri8C+ntmaZUdrtlIDS4LKnVY+irRTg47riUjLLP+iP2KUHwIhi1pJpSnLeAa 8yOA== X-Gm-Message-State: ALyK8tLGhLkAH8OCn0oCGTdf4Vw4Fwe9+EBSVk5R77WBFZbUeBJ4SX7R8oMrn6Qj8ugyhj6r 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160701_212045_122735_8B10DB82 X-CRM114-Status: GOOD ( 11.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Hilman , Stephen Boyd , linux-kernel@vger.kernel.org, Bjorn Andersson , Andy Gross , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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) {