From patchwork Wed Aug 19 22:18:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 7039681 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2283F9F358 for ; Wed, 19 Aug 2015 22:20:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47A48206F2 for ; Wed, 19 Aug 2015 22:20:09 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 7265B206E8 for ; Wed, 19 Aug 2015 22:20:08 +0000 (UTC) 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 1ZSBiK-0004oJ-7E; Wed, 19 Aug 2015 22:20:08 +0000 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZSBiI-0003Xx-2y for linux-rockchip@lists.infradead.org; Wed, 19 Aug 2015 22:20:06 +0000 Received: by paccq16 with SMTP id cq16so12121284pac.1 for ; Wed, 19 Aug 2015 15:19:45 -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; bh=GSu/izXlDV6vPnIvSd2+966PA5FAoeD8heajN+iLs6U=; b=YbIY3yR06TImB31mJcJP5KLGrOe1EDde4ZU6/XbP9sPDJ1TIJOh/5V5s60S5J1fAWO TYziPQLYSdj3i2RT7HRwmtq318V4yoKbNtWxb4+rABU2gG34osE5b8Ap2A378ZDNePOG QE9eFlP4wSNWglGZjNT6XvwUVfukts6jsMLLA= 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:in-reply-to :references; bh=GSu/izXlDV6vPnIvSd2+966PA5FAoeD8heajN+iLs6U=; b=RXSwOoL6T2htGxBT4dKMurK0R0yIGpW/3zh6mx/nkv+JdozLawPX7dB/1kATEELNO1 gh6Cc+xSf6gSdSqWKBYP9/DTzN9DUObT8rKIVxyFrW+t5yeRdFj0ezNacu3HAS7H2NC2 2z6H2NXm4oa7oWU1/b05DScbToRkuEPCtuxvC39FmIly9/h3f9YW39QZzcu9Bx0vHcve gZZqk/yWGmfu2UpnbVhtTqRj1/m+ZahB9634YR4Mbk17vLhNYIRPNmSoBLVvBpkzpZLE 6GGT0Hzf4fjguRlF8nEq8ItPXaiyOl8cgAe0s06cDir004naLcP8AESPnSLsWzQk1+y6 bT9Q== X-Gm-Message-State: ALoCoQm7sx4PY3LeOpsKJH9ZkUatSz28H20q+ZXyy9q0crcr2uBsid9+a17AkwMBQF9mAV+DyAto X-Received: by 10.66.222.103 with SMTP id ql7mr28871669pac.144.1440022785052; Wed, 19 Aug 2015 15:19:45 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id yt9sm1973628pac.32.2015.08.19.15.19.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Aug 2015 15:19:44 -0700 (PDT) From: Brian Norris To: Heiko Stuebner Subject: [PATCH v2 3/3] ARM: dts: rockchip: correct regulator power states for suspend Date: Wed, 19 Aug 2015 15:18:41 -0700 Message-Id: <1440022721-73712-3-git-send-email-briannorris@chromium.org> X-Mailer: git-send-email 2.5.0.276.gf5e568e In-Reply-To: <1440022721-73712-1-git-send-email-briannorris@chromium.org> References: <1440022721-73712-1-git-send-email-briannorris@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150819_152006_172493_686365D7 X-CRM114-Status: GOOD ( 11.13 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Alexandru M Stan , Brian Norris , Douglas Anderson , linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When getting translated from a downstream device tree that used slightly different DT bindings, these regulators got labeled with the "on-in-suspend" state, when they were actually supposed to be turned off for S3 suspend. This was harmless, but not intentional, AFAICT. Let's turn them off to get the optimal power state. Signed-off-by: Brian Norris Cc: Alexandru M Stan Cc: Douglas Anderson Reviewed-by: Javier Martinez Canillas --- New in v2. Tested jaq. arch/arm/boot/dts/rk3288-veyron-jerry.dts | 2 +- arch/arm/boot/dts/rk3288-veyron-pinky.dts | 2 +- arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rk3288-veyron-jerry.dts index 42d724559915..60bd6e91e308 100644 --- a/arch/arm/boot/dts/rk3288-veyron-jerry.dts +++ b/arch/arm/boot/dts/rk3288-veyron-jerry.dts @@ -99,7 +99,7 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-state-mem { - regulator-on-in-suspend; + regulator-off-in-suspend; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts index 25eb4b0c1330..94b56e33d947 100644 --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts @@ -109,7 +109,7 @@ regulator-boot-on; regulator-name = "vcc18_lcd"; regulator-state-mem { - regulator-on-in-suspend; + regulator-off-in-suspend; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi index 788468a48163..b5334ecff13c 100644 --- a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi @@ -93,7 +93,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-state-mem { - regulator-on-in-suspend; + regulator-off-in-suspend; }; }; @@ -102,7 +102,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-state-mem { - regulator-on-in-suspend; + regulator-off-in-suspend; }; }; };