From patchwork Wed Oct 29 07:35:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Perier X-Patchwork-Id: 404445 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AC6B914003E for ; Wed, 29 Oct 2014 18:32:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754748AbaJ2Hc0 (ORCPT ); Wed, 29 Oct 2014 03:32:26 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:46416 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753956AbaJ2Hc0 (ORCPT ); Wed, 29 Oct 2014 03:32:26 -0400 Received: by mail-wi0-f179.google.com with SMTP id h11so3746848wiw.6 for ; Wed, 29 Oct 2014 00:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Sgvo3u66qmFX48unQNtd6bFLw1kF8PeGywSI6vSiNqk=; b=Y0Tf4zCMsLPwq86xa2UbPhknYDi1NdvbeUoTxQf7sl/g/o8sleJkl2v5CIlOucylDF XkdBMw75ul6vINLkpg2ljvwM9Gxve5x+9k8BRz0f3T1qjgTMeGVm7J977mMQUL/UvE5U sGZ4RFf2gdpnHJSByFkJaKYwy+SKWjcb4Wer3hbYA+tU4FiLle/OqpwytOp6DDxoMiCs JmGek3OVvYUcCvaIk4UyaLz69gPM6cdCFnqS51JZIYa6vDF5+Wra27k0TOlzapCS+cQc L8AlAFumR4iw/ej4P4M5w8jtcgA4zMdMs2R30jsW0cIPGFvb+LxNZreoPMoZPMGtYPi7 T/6A== X-Received: by 10.180.219.106 with SMTP id pn10mr10762611wic.63.1414567944699; Wed, 29 Oct 2014 00:32:24 -0700 (PDT) Received: from localhost.localdomain (AToulouse-554-1-48-253.w92-149.abo.wanadoo.fr. [92.149.239.253]) by mx.google.com with ESMTPSA id pn4sm4206564wjc.38.2014.10.29.00.32.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 00:32:24 -0700 (PDT) From: Romain Perier To: heiko@sntech.de Cc: grant.likely@linaro.org, robh+dt@kernel.org, devicetree@vger.kernel.org, lgirdwood@gmail.com, broonie@kernel.org, johan@kernel.org, mark.rutland@arm.com, linux-pm@vger.kernel.org Subject: [PATCH v2 2/4] regulator: act8865: Convert poweroff-source DT property to system-power-controller Date: Wed, 29 Oct 2014 07:35:33 +0000 Message-Id: <1414568135-8311-3-git-send-email-romain.perier@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414568135-8311-1-git-send-email-romain.perier@gmail.com> References: <1414568135-8311-1-git-send-email-romain.perier@gmail.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Signed-off-by: Romain Perier --- Documentation/devicetree/bindings/regulator/act8865-regulator.txt | 4 ++-- drivers/regulator/act8865-regulator.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt index 01a5b07..dad6358 100644 --- a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt @@ -6,8 +6,8 @@ Required properties: - reg: I2C slave address Optional properties: -- poweroff-source: Telling whether or not this pmic is controlling - the system power. See Documentation/devicetree/bindings/power/poweroff.txt . +- system-power-controller: Telling whether or not this pmic is controlling + the system power. See Documentation/devicetree/bindings/power/power-controller.txt . Any standard regulator properties can be used to configure the single regulator. diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index 76301ed..435aba1 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -365,7 +365,7 @@ static int act8865_pmic_probe(struct i2c_client *client, return ret; } - if (of_system_has_poweroff_source(dev->of_node)) { + if (of_is_system_power_controller(dev->of_node)) { if (!pm_power_off) { act8865_i2c_client = client; act8865->off_reg = off_reg;