Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754124AbbHRSos (ORCPT ); Tue, 18 Aug 2015 14:44:48 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:35124 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754000AbbHRSoo (ORCPT ); Tue, 18 Aug 2015 14:44:44 -0400 From: Brian Norris To: Heiko Stuebner Cc: , , , Brian Norris , , Brian Norris , Alexandru M Stan , Douglas Anderson Subject: [PATCH 2/2] ARM: dts: rockchip: correct regulator PM properties Date: Tue, 18 Aug 2015 11:44:15 -0700 Message-Id: <1439923455-109818-2-git-send-email-briannorris@chromium.org> X-Mailer: git-send-email 2.5.0.276.gf5e568e In-Reply-To: <1439923455-109818-1-git-send-email-briannorris@chromium.org> References: <1439923455-109818-1-git-send-email-briannorris@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1325 Lines: 43 This DTS file was submitted with non-upstream bindings. I happened across this while reviewing the jaq DTS. Signed-off-by: Brian Norris Cc: Alexandru M Stan Cc: Douglas Anderson --- Tested on jaq, not minnie arch/arm/boot/dts/rk3288-veyron-minnie.dts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts index 0e30bd6bf92b..6f619c154dc6 100644 --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts @@ -128,12 +128,16 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc33_touch"; - regulator-suspend-mem-disabled; + regulator-state-mem { + regulator-on-in-suspend; + }; }; vcc5v_touch: SWITCH_REG2 { regulator-name = "vcc5v_touch"; - regulator-suspend-mem-disabled; + regulator-state-mem { + regulator-on-in-suspend; + }; }; }; }; -- 2.5.0.276.gf5e568e -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/