From patchwork Thu Jun 11 14:18:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 6588971 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 37AD6C0020 for ; Thu, 11 Jun 2015 14:21:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37444205E8 for ; Thu, 11 Jun 2015 14:21:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6643120555 for ; Thu, 11 Jun 2015 14:21:37 +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 1Z33K5-0004YL-Cl; Thu, 11 Jun 2015 14:19:13 +0000 Received: from mail-lb0-x22d.google.com ([2a00:1450:4010:c04::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z33K0-0004Ls-M7 for linux-arm-kernel@lists.infradead.org; Thu, 11 Jun 2015 14:19:09 +0000 Received: by lbcue7 with SMTP id ue7so4762651lbc.0 for ; Thu, 11 Jun 2015 07:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7sFEWRLyuYXqMGd0wAFwATxJsm1Xxicnq0fwixf10f8=; b=ps+pauZHMhsId4UvWqjdrPcsw0lS5sd+NN4H5qWnvRNP3n1qtDdNf3SHfw/ejqkl4G vX9NmKFwwbJ+FmyY0JTv89xJD2xIIrpexG3mDZFhrbG4kq9iP7pZOJKmBV5ysD+Di+/k iR2rjowTYEaB5de+RjOjCJxiYS9b3lTtRa1pYCfp54DGTzYuNEzLqnpbQ0BzwoQwRkBD lehBJpjN9M0zwYKzjbkxbhdcrjXXrv5jvWDCby1/KnWKY4ecRp+KPyoLbYSgULKliZp2 OvoryZVbK3W6SoPTXdcNl6Ectxe0bJY48bcCMLlUEqR5dT9pzwncE2xyXeZpOLQq5UoS Lk2Q== X-Received: by 10.152.88.5 with SMTP id bc5mr10258983lab.45.1434032325505; Thu, 11 Jun 2015 07:18:45 -0700 (PDT) Received: from xi.terra (c-ed8ee655.013-278-6d6c6d10.cust.bredbandsbolaget.se. [85.230.142.237]) by mx.google.com with ESMTPSA id t15sm199106lbk.0.2015.06.11.07.18.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jun 2015 07:18:44 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.85) (envelope-from ) id 1Z33Jk-0000w2-79; Thu, 11 Jun 2015 16:18:52 +0200 From: Johan Hovold To: Tony Lindgren Subject: [PATCH] Revert "ARM: dts: am335x-boneblack: disable RTC-only sleep" Date: Thu, 11 Jun 2015 16:18:38 +0200 Message-Id: <1434032318-3557-1-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.3.6 In-Reply-To: <20150601200137.GC30984@atomide.com> References: <20150601200137.GC30984@atomide.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150611_071908_937973_41E1B81E X-CRM114-Status: GOOD ( 10.14 ) X-Spam-Score: -0.7 (/) Cc: devicetree@vger.kernel.org, Matthijs van Duin , Johan Hovold , Felipe Balbi , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , linux-omap@vger.kernel.org, robertcnelson@gmail.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 This reverts commit 3d76be5b933e2a66d85a2f7444e68e99e8a48ad4. The latest revision of Beaglebone Black does not support RTC-only mode. To avoid potential hardware damage, RTC-only mode was disabled by default by commit 7a6cb0abe1aa ("ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage"). Unfortunately, an incorrect fix had already been applied, which instead of just disabling RTC-only mode, prevents the Beaglebone from powering down at all. Revert this patch to fix the power-off regression. Signed-off-by: Johan Hovold --- The offending patch was incorrectly applied after Matthijs initial fix was posted and before the final fix (which only added some comments) was applied. Note that the final version of the fix 7a6cb0abe1aa ("ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage") indicates that it should be backported to 3.12 even though RTC-only mode was first enabled in 3.19. Johan arch/arm/boot/dts/am335x-boneblack.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 901739fcb85a..5c42d259fa68 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -80,3 +80,7 @@ status = "okay"; }; }; + +&rtc { + system-power-controller; +};