From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A3C0C433EF for ; Mon, 20 Sep 2021 23:45:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA22661222 for ; Mon, 20 Sep 2021 23:45:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CA22661222 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=gJCAWWnIRLsachrhjX1F9GQeHRnqBSh4PeTk2QcJ4KI=; b=erlEMXW7T/0hDw yQ0wQfTXLrcg/Us9rgkH9Dyy7qy4NkQplcgbpL0qB8LSkWrgAm9UpHf0krjEVebpI39/G5ApfzxL9 apwXCndq7ZfE+Jge0rDbhT0MAKR82juEzDe43u28fDsFxWEbQ6tOdMhv3DPBbnvPR7+dtWFnRQJpa bsA/iYrlW7znuPNP1C3wUazE8h2TeDHXSczwxD8y7r719Z3ehmhrEmEwUihWqX0Fzq7Op5r72UccE XcQJI/XzXJS8Obl4U5AuV79rEEYGPRO+ILGXOt9rEDIHvVUPtxcn98A9Hs4l7CK3ZZfFZXKvWhf2B UeowP07wR/vdxWh1NSTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mSSwX-003KpG-TX; Mon, 20 Sep 2021 23:43:26 +0000 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mSSwU-003Kox-AK for linux-arm-kernel@lists.infradead.org; Mon, 20 Sep 2021 23:43:23 +0000 Received: by mail-qt1-x835.google.com with SMTP id x9so4782603qtv.0 for ; Mon, 20 Sep 2021 16:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MjcIxwLGpuWlV5sBMWzGdiilrJIH0VyjT2mEd87OWzE=; b=RiEn9rJKGLRxU5L2+xMnznjxfTyP5ZQSIgKxRFIITja89c7Wcl7k/c7d6yMj2VzbQX uZA6XekF6rOp/38zvDKkwqdqlK0GWmXmqAqMTVcS0rulpfcCvoNIuStK1szoofmTFO3B pAYSgsLjkCd8l9hHFfi6NpAzSW7z1xldUKx15PN5vwCXIi0VMfvsgOE6uIzzf/fis89F h8FR8kAvSQNPHP+L9Xf2pOBHek6kJ5ojJKKJ/du6sJ9gN4paRsPagoU4mwJ4aFZDDVvh rQV0flBu8UlTkSrAMP+bfpOyansaxEEZvkh9rcO8RPnjC0qQPGdODLA8CTOgI/fT85yY kVdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MjcIxwLGpuWlV5sBMWzGdiilrJIH0VyjT2mEd87OWzE=; b=fKShXmNoJHUB3qHHUjEkuw0OWucE3av13UlYeCOUV1LY7l3CfJW5VbfkeQtjSv6BRu dPjMnMv4IcbsCthFSYU+BQCL0Hc8UoWuuxNVHbp1lGzmFDzxMH2QBnAhMAOMpLxdrMiu eATcsjAtUOrEVZhInHZ5FynR5o71WfsJxqtonN1Ylotcwx5kbY0Pu1bMalyHbHJrfpdd +Ncx417dnl1eikbPjVWTiWnQu0b3Y2LsaeKZ8JoLe/fVn8HGDnV+wlXDJuZCNszJCT2q Gx3sGGBDrcETjIEEo3+YdMlJpnh/7jXYKkNmojEb0E28EmLJbjq+8vUY4sl9sr01W6pF 7W+w== X-Gm-Message-State: AOAM530QVLt7vs6jkq0UIYbvusANBiun51VpUc3aGjyVV7dUda+5LGDl C++OHSYdq6x60Bw7hNoEdlE= X-Google-Smtp-Source: ABdhPJzmRQnelIozIxUOWEjCsnPh6xhMdv4/OWjaPEXW6cdMnKd/Aw29EH/84BWQKlxGqvxhqCL9Hg== X-Received: by 2002:a05:622a:1350:: with SMTP id w16mr3429371qtk.354.1632181401124; Mon, 20 Sep 2021 16:43:21 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:485:504a:ec78:bbc7:c220:a982]) by smtp.gmail.com with ESMTPSA id p10sm8312657qkk.10.2021.09.20.16.43.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 16:43:20 -0700 (PDT) From: Fabio Estevam To: shawnguo@kernel.org Cc: linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org, m.felsch@pengutronix.de, tharvey@gateworks.com, Fabio Estevam , stable@vger.kernel.org Subject: [PATCH] Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine" Date: Mon, 20 Sep 2021 20:43:11 -0300 Message-Id: <20210920234311.682163-1-festevam@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210920_164322_398319_C96F4973 X-CRM114-Status: GOOD ( 10.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit cc8870bf4c3ab0af385538460500a9d342ed945f. Since commit cc8870bf4c3a ("ARM: imx6q: drop of_platform_default_populate() from init_machine") the following errors are seen on boot: [ 0.123372] imx6q_suspend_init: failed to find ocram device! [ 0.123537] imx6_pm_common_init: No DDR LPM support with suspend -19! , which break suspend/resume on imx6q/dl. Revert the offeding commit to avoid the regression. Thanks to Tim Harvey for bisecting this problem. Cc: stable@vger.kernel.org Fixes: cc8870bf4c3a ("ARM: imx6q: drop of_platform_default_populate() from init_machine") Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/mach-imx6q.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 11dcc369ec14..c9d7c29d95e1 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -172,6 +172,9 @@ static void __init imx6q_init_machine(void) imx_get_soc_revision()); imx6q_enet_phy_init(); + + of_platform_default_populate(NULL, NULL, NULL); + imx_anatop_init(); cpu_is_imx6q() ? imx6q_pm_init() : imx6dl_pm_init(); imx6q_1588_init(); -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel