From patchwork Wed Nov 26 09:33:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 5384541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F24669F319 for ; Wed, 26 Nov 2014 09:36:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E8E420108 for ; Wed, 26 Nov 2014 09:36:59 +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 66F79200E1 for ; Wed, 26 Nov 2014 09:36:58 +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 1XtYzp-0005MT-AR; Wed, 26 Nov 2014 09:34:49 +0000 Received: from mail-lb0-x233.google.com ([2a00:1450:4010:c04::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XtYzn-0004yx-53 for linux-arm-kernel@lists.infradead.org; Wed, 26 Nov 2014 09:34:47 +0000 Received: by mail-lb0-f179.google.com with SMTP id z11so2089221lbi.10 for ; Wed, 26 Nov 2014 01:34:24 -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; bh=glWQJWnjQ+/HUB3UNgV1dgHX7n4nxL9OGtkRQNO2zxQ=; b=RcpqbgztydHSJF1+VeMMkWuBy0nQBm3wiksDowlbw9+4K1SeGw2ijQlmZlNw41uafA q66y86peS14kuZ7o69vVzqlVRRvqOioOVV2DWl1VfcykiYaG+dgg4itAcBHlgaR8Qd2Q oi6WMsnt8LkyG6XLfshkJn6meit/wyOrVedKJcxLG5hemEU2oUmKcIzkMmd28N4vBSpJ o65UvoOTXVQzJiYV2z62NTzkph//C8JBxfzu7WT3u0Zy+/wr4j2fCjMonHdbvUP+hRD3 L7EQW/ZytcVN8O+RIcy1Bps+sW277XaFJQutD7qiIhc0obwPJcjTRXeAvXSuGt6+TLHd NDTA== X-Received: by 10.112.17.101 with SMTP id n5mr32881711lbd.83.1416994464657; Wed, 26 Nov 2014 01:34:24 -0800 (PST) Received: from xi.terra (s83-177-171-8.cust.tele2.se. [83.177.171.8]) by mx.google.com with ESMTPSA id q9sm1047977lah.12.2014.11.26.01.34.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Nov 2014 01:34:23 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.84) (envelope-from ) id 1XtYzP-0005pQ-Oi; Wed, 26 Nov 2014 10:34:23 +0100 From: Johan Hovold To: Andrew Morton , Tony Lindgren , =?UTF-8?q?Beno=C3=AEt=20Cousson?= Subject: [PATCH] rtc: omap: drop vendor-prefix from power-controller dt property Date: Wed, 26 Nov 2014 10:33:35 +0100 Message-Id: <1416994415-22367-1-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141126_013447_381875_9AB8FAD6 X-CRM114-Status: GOOD ( 12.12 ) X-Spam-Score: -0.7 (/) Cc: Alessandro Zummo , rtc-linux@googlegroups.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Felipe Balbi , Johan Hovold , linux-omap@vger.kernel.org, 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=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Drop the vendor-prefix from the "ti,system-power-controller" device-tree property name. It has been agreed to make "system-power-controller" a standard property and to drop the vendor-prefix that is currently used by several drivers. Note that drivers that have used ",system-power-controller" in a released kernel will need to support both versions. Signed-off-by: Johan Hovold --- Documentation/devicetree/bindings/rtc/rtc-omap.txt | 4 ++-- arch/arm/boot/dts/am335x-boneblack.dts | 2 +- drivers/rtc/rtc-omap.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/rtc/rtc-omap.txt b/Documentation/devicetree/bindings/rtc/rtc-omap.txt index 750efd40c72e..4ba4dbd34289 100644 --- a/Documentation/devicetree/bindings/rtc/rtc-omap.txt +++ b/Documentation/devicetree/bindings/rtc/rtc-omap.txt @@ -13,7 +13,7 @@ Required properties: - interrupt-parent: phandle for the interrupt controller Optional properties: -- ti,system-power-controller: whether the rtc is controlling the system power +- system-power-controller: whether the rtc is controlling the system power through pmic_power_en Example: @@ -24,5 +24,5 @@ rtc@1c23000 { interrupts = <19 19>; interrupt-parent = <&intc>; - ti,system-power-controller; + system-power-controller; }; diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 0c8cdc9520b7..d4affb7e3b61 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -77,5 +77,5 @@ }; &rtc { - ti,system-power-controller; + system-power-controller; }; diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index fba13e53c278..4f1c6ca97211 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -502,7 +502,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev) rtc->type = of_id->data; rtc->is_pmic_controller = rtc->type->has_pmic_mode && of_property_read_bool(pdev->dev.of_node, - "ti,system-power-controller"); + "system-power-controller"); } else { id_entry = platform_get_device_id(pdev); rtc->type = (void *)id_entry->driver_data;