From patchwork Fri Nov 21 11:00:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 5354281 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DA13DC11AC for ; Fri, 21 Nov 2014 11:00:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0096D201B9 for ; Fri, 21 Nov 2014 11:00:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 332102017E for ; Fri, 21 Nov 2014 11:00:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754778AbaKULAg (ORCPT ); Fri, 21 Nov 2014 06:00:36 -0500 Received: from mail-la0-f47.google.com ([209.85.215.47]:47759 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbaKULAf (ORCPT ); Fri, 21 Nov 2014 06:00:35 -0500 Received: by mail-la0-f47.google.com with SMTP id hz20so3910997lab.20 for ; Fri, 21 Nov 2014 03:00:34 -0800 (PST) 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=5/bhUkiWtXPgK1/VK2BU5+c7c2IumTLikJHZnn4jAuU=; b=q8PNtvi0afl1v3dxoCXIaIJf2q30fBO9ThwokidyKFzzuysx2aWOv+ESJLJAJWtB1e WIsndS8eIHRBHCLQdD6VWYh2yqnUZ23FjQBy7ge2O+D58mS0NQOV/NWTfBdGgE/hm3s5 E0esb3uCs+YXjqoomBKfy3u4PSt6MNN/+BUxWZ+ow5JXPHNBfu9FBkXogbv2dT0tWgvH B+0mNIeCsRVuTFCq9h10uuIguHAbXs9ri6e7gZhRHMOFphpaxmezjB2lUgiDmrwpGh+A 7rBPU/Xo522+Y+OzSo72AezESeNbhvoS1Ma2hUETv4zycqULu2xgBigyqxvC6Oy+zjs/ 9xhw== X-Received: by 10.152.7.193 with SMTP id l1mr3564281laa.57.1416567634150; Fri, 21 Nov 2014 03:00:34 -0800 (PST) Received: from xi.terra (s83-177-171-8.cust.tele2.se. [83.177.171.8]) by mx.google.com with ESMTPSA id jq16sm1105950lab.14.2014.11.21.03.00.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Nov 2014 03:00:32 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.84) (envelope-from ) id 1Xrlx4-0002lM-Ju; Fri, 21 Nov 2014 12:00:34 +0100 From: Johan Hovold To: Lee Jones Cc: Samuel Ortiz , heiko@sntech.de, grant.likely@linaro.org, robh@kernel.org, devicetree@vger.kernel.org, lgirdwood@gmail.com, broonie@kernel.org, mark.rutland@arm.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, balbi@ti.com, Romain Perier , Johan Hovold Subject: [PATCH] Revert "mfd: tps65910: Convert ti, system-power-controller DT property to poweroff-source" Date: Fri, 21 Nov 2014 12:00:16 +0100 Message-Id: <1416567616-10582-1-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.4 In-Reply-To: <20141121105951.GA20679@localhost> References: <20141121105951.GA20679@localhost> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 25f833c1171d ("mfd: tps65910: Convert ti,system-power-controller DT property to poweroff-source"), which switched to a new device-tree property name for configuring the device as a power-off controller, but failed to update the affected device-tree sources and neither provided backward compatibility with the old property name. This fixes broken power-off functionality for all boards relying on tps65910 to power off the system. Signed-off-by: Johan Hovold --- drivers/mfd/tps65910.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index b8dca8a0db41..7612d89850dd 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c @@ -423,7 +423,8 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, board_info->irq = client->irq; board_info->irq_base = -1; - board_info->pm_off = of_system_has_poweroff_source(np); + board_info->pm_off = of_property_read_bool(np, + "ti,system-power-controller"); return board_info; }