From patchwork Thu Apr 11 23:21:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10897061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7066D1800 for ; Thu, 11 Apr 2019 23:22:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56B1B28B02 for ; Thu, 11 Apr 2019 23:22:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4AD6428E1E; Thu, 11 Apr 2019 23:22:57 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E83E828B02 for ; Thu, 11 Apr 2019 23:22:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=hclpLz7Mp8v7NItd2CwgccF48KefDjEVhqKZd+O9OV8=; b=GF+t5F4yhIywWh CcT6fglBrzRKHi4pWXanznXNgXdqeNno7Quf93DhdteUeGvaWbqXeE9Lyqr7XFepldsxbWdjlAugn ZeI4+MDCjzDyKQKnpoB3TipoP5g3EamcLIxNY4MiqE+cbZ5lVezevNteE93X6BLHoXP4wTE5pQ8D7 wbxtvu28NOEXwsjYEW3dDYVMNluoqUrGvtjVLHWtNr0izw7f9Wc9uLIKrkci3Ri4lXNGcam/EBhj+ kvp/QGMDUi88MfIDOUw4s1A+dwwAd6enxVV/piPxdv2gTMkjg/M6wUl83dB+iCmcJ9MiPfrHleDmW KAOkeK5mmTzbjRZiNKUA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj1y-0006Gk-EE; Thu, 11 Apr 2019 23:22:54 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj1u-0006Cr-7c for linux-arm-kernel@lists.infradead.org; Thu, 11 Apr 2019 23:22:51 +0000 Received: by mail-pf1-x442.google.com with SMTP id 188so4165188pfd.8 for ; Thu, 11 Apr 2019 16:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IkgB2Wu06Pd4z96v65dmkLjB7xuMujb7ajfyz6BRah8=; b=N4REOu2PSJZDy8Il/YjNSGOzdd42AawfVoDMOOt6HZp1ngpPBE6CA/t76JpBEwkXBl cAN8r2SyAJ1bLpt011QPNQ8lZnjDMCSXRqEMDkWXr0wmUKdmTRvB3oPXPk0Lz5Opngui 1WEL9Zwqmou9Zs2xgCH45HTwTWINT+X5NCU3E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IkgB2Wu06Pd4z96v65dmkLjB7xuMujb7ajfyz6BRah8=; b=b5CYNP2UkbmMGf/zfU6LMBSzEicsd+kfAMc27c72t3m4lNrPHFLmPiPUpGxHCK2l7S w7mlT4gv9wW82ZWzPNyEu3zHKTNIqVA4OYbNd/RCEfp7zmfp+shsbMq9PxL045131x5C XgtkNT4di0H/vFo6PRYFh6BJ3ZZgFYrXByozgYVpYTUdJOb5SKKGgV1SABBJSBQmE+g4 AzM7n/aep18n+BxjeZaUDQl8z8vaLdGhbXTdzAnq1XPQ+VEkJ5AedhAF1fiLYB7d+Bh8 EZcvuUFled78Q542uQ4UR/Q06/g5hky3FgP82mch5BwqLZ8H9C9bZBFoZr2y2Ubpl9Yo rWww== X-Gm-Message-State: APjAAAUuY4kwxo1ivY/TZ3IRQEQTqqhv6pLvdJS//7R8MbAdrnTsS8H+ G0qVIrT6o9Z7aCzaqtcTKMSWJg== X-Google-Smtp-Source: APXvYqwIprzlKW2nejCZ3fCZPI0yJSk+LmODFFzKDpPN5QTpEfwTCtsN7TwwhtNqpjpRD3mINi7aMg== X-Received: by 2002:a63:ed48:: with SMTP id m8mr35963091pgk.104.1555024968498; Thu, 11 Apr 2019 16:22:48 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id y20sm37288903pfe.188.2019.04.11.16.22.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 16:22:47 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner , Elaine Zhang Subject: [PATCH 1/5] clk: rockchip: Turn on "aclk_dmac1" for suspend Date: Thu, 11 Apr 2019 16:21:53 -0700 Message-Id: <20190411232157.55125-1-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190411_162250_285947_33E259B4 X-CRM114-Status: GOOD ( 19.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: briannorris@chromium.org, amstan@chromium.org, Stephen Boyd , Michael Turquette , dbasehore@chromium.org, Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, ryandcase@chromium.org, Chris Zhong , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 Experimentally it can be seen that going into deep sleep (specifically setting PMU_CLR_DMA and PMU_CLR_BUS in RK3288_PMU_PWRMODE_CON1) appears to fail unless "aclk_dmac1" is on. The failure is that the system never signals that it made it into suspend on the GLOBAL_PWROFF pin and it just hangs. NOTE that it's confirmed that it's the actual suspend that fails, not one of the earlier calls to read/write registers. Specifically if you comment out the "PMU_GLOBAL_INT_DISABLE" setting in rk3288_slp_mode_set() and then comment out the "cpu_do_idle()" call in rockchip_lpmode_enter() then you can exercise the whole suspend path without any crashing. This is currently not a problem with suspend upstream because there is no current way to exercise the deep suspend code. However, anyone trying to make it work will run into this issue. This was not a problem on shipping rk3288-based Chromebooks because those devices all ran on an old kernel based on 3.14. On that kernel "aclk_dmac1" appears to be left on all the time. There are several ways to skin this problem. A) We could add "aclk_dmac1" to the list of critical clocks and that apperas to work, but presumably that wastes power. B) We could keep a list of "struct clk" objects to enable at suspend time in clk-rk3288.c and use the standard clock APIs. C) We could make the rk3288-pmu driver keep a list of clocks to enable at suspend time. Presumably this would require a dts and bindings change. D) We could just whack the clock on in the existing syscore suspend function where we whack a bunch of other clocks. This is particularly easy because we know for sure that the clock's only parent ("aclk_cpu") is a critical clock so we don't need to do anything more than ungate it. In this case I have chosen D) because it seemed like the least work, but any of the other options would presumably also work fine. Signed-off-by: Douglas Anderson Reviewed-by: Elaine Zhang --- drivers/clk/rockchip/clk-rk3288.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c index 5a67b7869960..b245367393cd 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -859,6 +859,9 @@ static const int rk3288_saved_cru_reg_ids[] = { RK3288_CLKSEL_CON(10), RK3288_CLKSEL_CON(33), RK3288_CLKSEL_CON(37), + + /* We turn aclk_dmac1 on for suspend; this will restore it */ + RK3288_CLKGATE_CON(10), }; static u32 rk3288_saved_cru_regs[ARRAY_SIZE(rk3288_saved_cru_reg_ids)]; @@ -874,6 +877,14 @@ static int rk3288_clk_suspend(void) readl_relaxed(rk3288_cru_base + reg_id); } + /* + * Going into deep sleep (specifically setting PMU_CLR_DMA in + * RK3288_PMU_PWRMODE_CON1) appears to fail unless + * "aclk_dmac1" is on. + */ + writel_relaxed(1 << (12 + 16), + rk3288_cru_base + RK3288_CLKGATE_CON(10)); + /* * Switch PLLs other than DPLL (for SDRAM) to slow mode to * avoid crashes on resume. The Mask ROM on the system will From patchwork Thu Apr 11 23:21:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10897065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CA544922 for ; Thu, 11 Apr 2019 23:23:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFC1728E1D for ; Thu, 11 Apr 2019 23:23:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3A2928E20; Thu, 11 Apr 2019 23:23:12 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 487F828E1D for ; Thu, 11 Apr 2019 23:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2SC8CjMZgUXiXt5ebfwiIIYuCXIdcXfzb2yAj66ZddM=; b=PJlwy//i5lOErY rnnx724tawAF1uZwWu9Y4a9rT8Qo/XBPckfl2m/IUCpb8vKfJmDOpEmffQbwjQm2hYtt17FE2oM+x bPVteOSKcW/Y7eQnJRdXGjkgam17H0pMT40DfH+zBR4+fqa94HF43tCRfEoXcx06j3MVPhT8H5UWf KyPJmDNnhcu22Y5W178YcvFno1J9/8c6ZUxLyJ1+da4CTfuBP9XOlankVnUlurKrtZ2ZICD+aNCwX bJkHVB+KkVHaz+EhOTs2sspZg/KDFpwh/t74PrNz8Jniqgii9bYD5vdx4MK2PRzUfrv5v5ERFsyWm DOe7SDZPo821dnEcngBQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj2A-0006W1-6x; Thu, 11 Apr 2019 23:23:06 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj1u-0006Cx-K2 for linux-arm-kernel@lists.infradead.org; Thu, 11 Apr 2019 23:22:53 +0000 Received: by mail-pg1-x541.google.com with SMTP id q1so4211630pgv.13 for ; Thu, 11 Apr 2019 16:22:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8FKJf/NaqYGyiUvGYru2/2r1FkwEHrLbQS3N/eYB4lI=; b=KS/NfPl8RJldrt8mNhy3MbR0s3XVMRoY1JtQVPa2H5JgXYDmX2Gj5reoKqtC6MPJZo MnntIAMLm0VT6DvXWGY+7IVnisZGpq5PMZB0pjigiJOn5VyXVfCaQap5sZgNyAFp0Wkz N7b4JoVpM4Onl7eGHR3DySurhjWIo/rJxSGrY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8FKJf/NaqYGyiUvGYru2/2r1FkwEHrLbQS3N/eYB4lI=; b=ODYxdhSXwEhqVX9+Dhu3Ry9rxVFuO6MLVFmJeYU6XL4tu8Fm8ZBp/aUiq7Xn2qeFBf 0pJAVGHWodDgKVK0PFIq2JsULwnBOdNY3SgGuKm/dfLdMvCid3Bhf9AE9gpw+414Ntiq AT3apRM1oH4IY8Fta0Tt9vWmKys5SBanbcO9/bmYM7wq377KeUweV+XdHd57jLLMOVly o26zzXf+3gdO6ZmUZbMIcWBV1NPHkEcIxK6viScSBdHzAgPAPpiPWyDXm+P97n4NDM6o X2SYkxliHdTIl1XdBR7LP38lo9Q4VXiUGqS+aVr5AFzlGR40qi7I6OZjD/NCPXc1gdpA zzDg== X-Gm-Message-State: APjAAAVUwTjSJGUb25PNl1+ulQE5x/13ptDI23bIkeQMYWRLFB6zMSnE kaqL4SibvE9x3z5I7IeF8evasQ== X-Google-Smtp-Source: APXvYqzF6EMcdmnX13ucI/Kyu+YMU4DSuvUyYP7dA+WAWkBpVu3DEO/SrCvvL0Esyk6oCZIVsOY/ZQ== X-Received: by 2002:a63:c302:: with SMTP id c2mr50588843pgd.235.1555024969853; Thu, 11 Apr 2019 16:22:49 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id y20sm37288903pfe.188.2019.04.11.16.22.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 16:22:49 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner , Elaine Zhang Subject: [PATCH 2/5] ARM: rockchip: pm: Mark init functions __init Date: Thu, 11 Apr 2019 16:21:54 -0700 Message-Id: <20190411232157.55125-2-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190411232157.55125-1-dianders@chromium.org> References: <20190411232157.55125-1-dianders@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190411_162250_656859_67A7E5F3 X-CRM114-Status: GOOD ( 12.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: briannorris@chromium.org, amstan@chromium.org, linux-kernel@vger.kernel.org, dbasehore@chromium.org, Douglas Anderson , Russell King , linux-rockchip@lists.infradead.org, mka@chromium.org, ryandcase@chromium.org, Chris Zhong , linux-arm-kernel@lists.infradead.org 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 functions rk3288_config_bootdata() and rk3288_suspend_init() are only called in the context of rockchip_suspend_init() which is already marked __init. We can mark them __init too. Signed-off-by: Douglas Anderson --- arch/arm/mach-rockchip/pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c index 0592534e0b88..065b09e6f1eb 100644 --- a/arch/arm/mach-rockchip/pm.c +++ b/arch/arm/mach-rockchip/pm.c @@ -59,7 +59,7 @@ static inline u32 rk3288_l2_config(void) return l2ctlr; } -static void rk3288_config_bootdata(void) +static void __init rk3288_config_bootdata(void) { rkpm_bootdata_cpusp = rk3288_bootram_phy + (SZ_4K - 8); rkpm_bootdata_cpu_code = __pa_symbol(cpu_resume); @@ -230,7 +230,7 @@ static void rk3288_suspend_finish(void) pr_err("%s: Suspend finish failed\n", __func__); } -static int rk3288_suspend_init(struct device_node *np) +static int __init rk3288_suspend_init(struct device_node *np) { struct device_node *sram_np; struct resource res; From patchwork Thu Apr 11 23:21:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10897069 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6641E17EF for ; Thu, 11 Apr 2019 23:23:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A78828B02 for ; Thu, 11 Apr 2019 23:23:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E8EC28E1E; Thu, 11 Apr 2019 23:23:24 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E1DED28B02 for ; Thu, 11 Apr 2019 23:23:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZnuhQREV9KjAAcheXVmz8N/7u9y1qFtmQxw0SOFbje0=; b=inF3NDA+obiGo3 tlHVBbwW7dPQybSEvgdV8KPGxCJ1yEU3hfsXPzw93KYXGZ5/i8K4uq/TAs4RVUjhLaUKNZil0MJ/F qyLlOYXmsd+D0J2NNld4I83BrLKQr/ew9iMKMP6HE0yJfIS26vQwiP/uselTvAOKBScV6On2UMLZf rLYVjdifbxtgJbm9XRkuDes2IiGrQK58gxEu4xSUx4nB2yml0jMdUG7FPRs3OBExTl+HQif6GHsL7 dczNiZjm5YWzy5plPyLe9ZEDCsvPg6XSX2dpKm8lxXzadnbcXgZQqhvj8XOMNIXxxx8MID0ERxjDs rsgdmSmd65Nhq6loHnNQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj2L-0006pC-Pt; Thu, 11 Apr 2019 23:23:17 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj1v-0006Dl-Mt for linux-arm-kernel@lists.infradead.org; Thu, 11 Apr 2019 23:22:53 +0000 Received: by mail-pl1-x641.google.com with SMTP id w23so4136363ply.4 for ; Thu, 11 Apr 2019 16:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nFRL7YQcOP+54+XtyuurGi/h9kYH21q/4YonKxFfN48=; b=mtoQdtYdv/A6dVYfHotuBCeIUtbyDJ8QnSoJHmF2egOvgYBi2quA5A2rqVHRmLi+q6 ooffBxjq9ebY6p5spGRew+2qrtZvsCRwsRFUDZhgFYTRWVfBDpmirEnzdGSyZbjwSRpw jPd3gVaKf/sAQMJEA6kzSp0779qcfGB2pQJ7g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nFRL7YQcOP+54+XtyuurGi/h9kYH21q/4YonKxFfN48=; b=mbIJb3czh/GFfzwB29SVEosLZJtQhRvO5PYlsdQl80U9PQnXX34GaMMbB5LtU43tfA InOJrJdSTzDj2iXP5+zLPgPqIEYvVPWMtFn1GV6sfgbaTj0gzUIY/KKvku21DFVI2TA2 THFbOwDUUF1IaQF7Guway3ikeMUDmSHzoEZcohlrTQu950uABYqNjX9QucjdqKEc7+kK 6ATAL4ih41+RLaNjs9mHGbIQ7yLq5sEP27v2gMtACog+OAXfVYaIVwAZEYreXXmXunCJ BSaPOxZR/SF0FoGz4K79niTnAxRPPDeO5SiCykNLPD7Mvxa8O0TzWcFbYEJ8+kcAsN9L SaIQ== X-Gm-Message-State: APjAAAXYY5I2gK/Wot95MwC+KkoWYfzHontXb2CKsIIZG1t+Zv1chI4B i1S+7/FOA4S60SbtYKOTZ4vKFw== X-Google-Smtp-Source: APXvYqw7aAMpX9Ku6JhGdnv7ENn2RP8AbEIfD/ZttHWgz8+ulfZ4g1HN8piQntu0ujz0VpdwcKBY/w== X-Received: by 2002:a17:902:9a95:: with SMTP id w21mr51217464plp.74.1555024970982; Thu, 11 Apr 2019 16:22:50 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id y20sm37288903pfe.188.2019.04.11.16.22.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 16:22:50 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner , Elaine Zhang Subject: [PATCH 3/5] ARM: dts: rockchip: Add DDR retention/poweroff to rk3288-veyron hogs Date: Thu, 11 Apr 2019 16:21:55 -0700 Message-Id: <20190411232157.55125-3-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190411232157.55125-1-dianders@chromium.org> References: <20190411232157.55125-1-dianders@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190411_162251_885265_F2E4F5CB X-CRM114-Status: GOOD ( 12.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, briannorris@chromium.org, amstan@chromium.org, dbasehore@chromium.org, Douglas Anderson , Rob Herring , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, ryandcase@chromium.org, Chris Zhong , linux-arm-kernel@lists.infradead.org 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 Even though upstream Linux doesn't yet go into deep enough suspend to get DDR into self refresh, there is no harm in setting these pins up. They'll only actually do something if we go into a deeper suspend but leaving them configed always is fine. Signed-off-by: Douglas Anderson --- arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 4 ++++ arch/arm/boot/dts/rk3288-veyron.dtsi | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi index 72c4754032e9..b9cc90f0f25c 100644 --- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi @@ -229,6 +229,8 @@ &pinctrl { pinctrl-0 = < /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff &global_pwroff /* Wake only */ @@ -236,6 +238,8 @@ >; pinctrl-1 = < /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff &global_pwroff /* Sleep only */ diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 5c67acc3e6d8..279d7f4ecce0 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -451,10 +451,14 @@ pinctrl-names = "default", "sleep"; pinctrl-0 = < /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff &global_pwroff >; pinctrl-1 = < /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff &global_pwroff >; From patchwork Thu Apr 11 23:21:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10897071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7DF61922 for ; Thu, 11 Apr 2019 23:23:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 602FF28B02 for ; Thu, 11 Apr 2019 23:23:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5317328E1E; Thu, 11 Apr 2019 23:23:34 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EBFEF28B02 for ; Thu, 11 Apr 2019 23:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SovLznTSX7IqSxKgj3wUXOzBVl47n2XwZjeL7cxrSHI=; b=SJHXyv96JdQubr HJ167gYZYR9tNWfLwC4zwVZM6ufs+l3VUEoiVl7AS6wS6bNTpd0ssO0vw/Bprj6FnL0xgug4nnIBQ gpyvNUyeYVmSnVTIdDORN9EkL2QIaE4Jq3OiewVnLSSc5OXGCCfIVRkhTpQDk0Wpocd9pEKHcASoh b2a09dBUIox8dC9aapdLTpY0AuK0o3IWmU4MNrwqsJVZUrbJ3foBtIY9vvzDkINKJwyRZyDzZfOSX TInN/Azd1k8PgL9bbzd+xz6AqsNyU2SW4bRd/csDKuG3G3+z8iUUX0cBGywgBgAX6Rro0cmpJs4S6 E7HJr1mOhacEJgVowt+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj2U-000724-TY; Thu, 11 Apr 2019 23:23:26 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj1w-0006EQ-J0 for linux-arm-kernel@lists.infradead.org; Thu, 11 Apr 2019 23:22:54 +0000 Received: by mail-pg1-x541.google.com with SMTP id i2so4215905pgj.11 for ; Thu, 11 Apr 2019 16:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wyUtO6FBL1xGO1LJ/Cb0qrWJLFLRp1Daf+h1sPg+o68=; b=TPS/dpoQuEcPL74mFmY5Uu60oJSHdAOiKPcubSb51l+oOx9K6r+U5YweUjegwXEhNk Ak+ZDNB5BJbm2Dwp5VgYogWw3aqICJd/kHSUrL/fEc0SKuJbzjOtBFUEJ+kiljE4vK5e FMpSlLeSusSGvEg82D+uwsy5EklfJ/Gm9EAJo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wyUtO6FBL1xGO1LJ/Cb0qrWJLFLRp1Daf+h1sPg+o68=; b=DwIUB2UInTmUg+RyNusX1QYiOSqO5rhg0C0EyUQbhfG1WpXBSfk852ozXdoXhCGdcf mV7gFHLfnnVI1Jf3dapHJ8iRhq10RPdAKTwVHAbt/ZvA/zgeklSU+VXj6K8beEEzzwTK HGs7nDLBBdZNuYLHD4FD9AMqNoqqF2hZq38m25H2Hlalq6eF8JJK0hQVDvdBz/mt9uJ/ 1UV5LEx2bMbnjHUJeQu+bvEZaEB9+h90cnA7Z2j3Ev6GYNmd8UnMEh2p4WspfELlQIP/ bflW3B3O9PTcaH2NsatR3rU6WvvPQbyyGvFn54jOuMFEq5lgMX2r5dT9B3r4gkzy9PvY RR6A== X-Gm-Message-State: APjAAAU451/jqRNKiQZrKyP8/UHW62RwbfqBpqk4mkUJFHIZ80syqr5w VlXt3yvCUdarEZLG5Gxdkpxanw== X-Google-Smtp-Source: APXvYqzs4AKfNFevOdhKmdg8KcOTyRngwms5IiA0+9tyh468oqtIH4NxO2YYemeRS8vq4ZNVmBoUdQ== X-Received: by 2002:a62:2fc7:: with SMTP id v190mr51345536pfv.10.1555024972090; Thu, 11 Apr 2019 16:22:52 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id y20sm37288903pfe.188.2019.04.11.16.22.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 16:22:51 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner , Elaine Zhang Subject: [PATCH 4/5] ARM: dts: rockchip: vcc33_ccd off in suspend for rk3288-veyron-chromebook Date: Thu, 11 Apr 2019 16:21:56 -0700 Message-Id: <20190411232157.55125-4-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190411232157.55125-1-dianders@chromium.org> References: <20190411232157.55125-1-dianders@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190411_162252_748883_29C3BEC8 X-CRM114-Status: GOOD ( 16.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, briannorris@chromium.org, amstan@chromium.org, dbasehore@chromium.org, Douglas Anderson , Rob Herring , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, ryandcase@chromium.org, Chris Zhong , linux-arm-kernel@lists.infradead.org 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 As per my comments when the device tree for rk3288-veyron-chromebook first landed: > Technically I think vcc33_ccd can be off since we have > 'needs-reset-on-resume' down in the EHCI port (this regulator is for > the USB webcam that's connected to the EHCI port). > > ...but leaving it on for now seems fine until we get suspend/resume > more solid. It's probably about time to do it right. [1] https://lore.kernel.org/linux-arm-kernel/CAD=FV=U37Yx8Mqk75_x05zxonvdc3qRMhqp8TyTDPWGHqSuRqg@mail.gmail.com/ Signed-off-by: Douglas Anderson Reviewed-by: Elaine Zhang --- arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi index b9cc90f0f25c..fbef34578100 100644 --- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi @@ -176,8 +176,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <3300000>; + regulator-off-in-suspend; }; }; }; From patchwork Thu Apr 11 23:21:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10897077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0183A922 for ; Thu, 11 Apr 2019 23:23:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA04228B02 for ; Thu, 11 Apr 2019 23:23:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE1CC28E1E; Thu, 11 Apr 2019 23:23:46 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7ACF128B02 for ; Thu, 11 Apr 2019 23:23:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=L08er+4XZhZObUEaPvlcgd896YuRkd3YD4WvVrwCr2M=; b=V4u3AaoCU8pdKQ cAAfIiyn/xu0LZza6g9okbmC2c4Rfd3CrLPhZfyxNmNnpDtXxAKVkmnYTlXHpBqyuq17V3o0hNC+U ry7JYMOqRz+2PDsttTh/OPpIA46eC529xnDdqVSIooBk5eaWRhqV2IrsXFVdudcD+ddLEO+qLi3lV SHHWQt7lF0o43cUYpgFQdVE+wJbi05tqbe2Zg5QtFZ9DZ9cVM3tVP3NAYubpIJbzBMCl0hP4+xi/P QJeRJmkfm94kY72omk9ERQw5I42uYGSTYn9SmktpioTAAujlsKuxYpzFMI9Jc5JY6E/jgCwKRBAya vopAXriVxxwDiWLri8yw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj2j-0007Kh-Aj; Thu, 11 Apr 2019 23:23:41 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEj1x-0006Fc-Tn for linux-arm-kernel@lists.infradead.org; Thu, 11 Apr 2019 23:22:55 +0000 Received: by mail-pl1-x643.google.com with SMTP id w23so4136400ply.4 for ; Thu, 11 Apr 2019 16:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dL9JtcZ92ryYmPw47PdDoJyrwRFQyhVA65jTVCpTryA=; b=Sr77n9xkvP4TmRJRlFx+/1VN6Dgqc6UfpixQ1GSApsVFnAs2CAIlHTRNhdSholz9gh E0W/+rxbcVE4Sk0kKEJSjJpEwqo5SmT4ONkdLlVl5L8LcEwOiD3OcJKhzY3/nbzjJaM3 2T1pIxq/6DDdtBkR22oAPqRH86BRG7IpZdKSs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dL9JtcZ92ryYmPw47PdDoJyrwRFQyhVA65jTVCpTryA=; b=neFC/Ny/zsPJiKmJEii4D37BmU/QuaWQHKZJgohDJyIMIYDRrFzt7oYAd6xu6KAjpi i88Pgz5tZIXbDCyaJUZ9QLCnp/xBxMSGkAbQnFIiQGBJYpZ8Jinzz2vsSwUz4P3SDeNU 4rl6NgfujcKCqw7jq2vdiHKiPn+vFVc6v52nbsBA4ehKUe4kw6K/fwh1R/N+9W+4+6SM kgYJikru2Ij4S8tiWaf475lBHFi/w0r0UfAY3e3ynGSlsWpHp8QahJIkZVjKfdpqNu/L DOwoklv94RhUgrj7BNVJN74GS8s3CLeohOoIVTskAgFfxnYqsiNcWlesiLfNv4VIt1wS qtnw== X-Gm-Message-State: APjAAAWihXG0ItQzlp6zX+HDNcxWpHiGljpQj8Qa9+WcidvgfXwbfxMl 8Tnlp66bd3pKKDeiHNjWYHK01w== X-Google-Smtp-Source: APXvYqxR3xzpG4aO7AHfUFf+3SjHVnPXZxk4DrkkC1n22Mku+W8I6WVCHkI9MtZMNBQwKnm8EptMEA== X-Received: by 2002:a17:902:e684:: with SMTP id cn4mr51769749plb.71.1555024973170; Thu, 11 Apr 2019 16:22:53 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id y20sm37288903pfe.188.2019.04.11.16.22.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 16:22:52 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner , Elaine Zhang Subject: [PATCH 5/5] ARM: dts: rockchip: vdd_gpu off in suspend for rk3288-veyron Date: Thu, 11 Apr 2019 16:21:57 -0700 Message-Id: <20190411232157.55125-5-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190411232157.55125-1-dianders@chromium.org> References: <20190411232157.55125-1-dianders@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190411_162254_048653_61764FA9 X-CRM114-Status: GOOD ( 14.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, briannorris@chromium.org, amstan@chromium.org, dbasehore@chromium.org, Douglas Anderson , Rob Herring , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, ryandcase@chromium.org, Chris Zhong , linux-arm-kernel@lists.infradead.org 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 At some point long long ago the downstream GPU driver would crash if we turned the GPU off during suspend. For some context you can see: https://chromium-review.googlesource.com/#/c/215780/5..6/arch/arm/boot/dts/rk3288-pinky-rev2.dts At some point in time not too long after that got fixed. It's unclear why the GPU is left enabled during suspend on the mainline kernel. Everything seems fine if I turn this off, so let's do it. Signed-off-by: Douglas Anderson Reviewed-by: Elaine Zhang --- arch/arm/boot/dts/rk3288-veyron.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 279d7f4ecce0..1252522392c7 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -217,8 +217,7 @@ regulator-max-microvolt = <1250000>; regulator-ramp-delay = <6001>; regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <1000000>; + regulator-off-in-suspend; }; };