From patchwork Thu Jul 6 20:40:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 785259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3x3V4H3cnLz9s76 for ; Fri, 7 Jul 2017 06:40:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mbi1zivf"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752327AbdGFUka (ORCPT ); Thu, 6 Jul 2017 16:40:30 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36603 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751878AbdGFUk3 (ORCPT ); Thu, 6 Jul 2017 16:40:29 -0400 Received: by mail-wr0-f195.google.com with SMTP id 77so3022685wrb.3; Thu, 06 Jul 2017 13:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=X9WS/EYvhKkBiDoYzaNT6UvWOoVYgf+bowg2E5AbsjI=; b=mbi1zivfTngbPoXM1PFO9xzzvsswhG1eHBMjG48ceWzrdm4ziEG43yoCrkNUEXTeH/ nlIVmkSevKQxtepEKuxmq9UMDYobT1okkjhub4Wd8A29souIu/+3hE7XGVxiRy7GtxJl kmu2T+2gnZZjhsdq6emvB4AJhE7cCZrRz7HQ1a2goTaXiIxIa92YDu6HspYAXXo3gLWJ f8lvIMKOAjGu+jjFRsgjdp5q0A/HcPKd1H49fmSva7wBTOv65LO9OfloUVmRbWyXJjvl m7SnsWz0zThO8RB/TQGMb0lGJOZ82YpUkDt7DAHYB4p6j7yeIaoIl406OiGVCRR70Kgp MaOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=X9WS/EYvhKkBiDoYzaNT6UvWOoVYgf+bowg2E5AbsjI=; b=r+9FjGLNrRih1xvEWeAeaSIKe9jG6r6tDvz8OkEDin8HbIyd2/+t3Hhz3o1cnyh67k NJppdu7bbWPzxaiYPK5HCX1QzK5aGhXjevfHSIjtSjt2ugsw4SL6DDc/pGCMd42fBVxT 2lufIRJN9LpyHcoSJdmiY4XWe/TzOLVRN4vI7MuD7nr0kIRRlj0lrLdtkmBJBfSK4SLt htI5o/mkD3jqLixYnK1fIkeU/qU+9t96MBFvwYqIIOWsLICvgFHmMl7ysb4FrNt6Iql9 LSgdjJQ8sYupkQwyJznGqjW86tdzl0Q5JJGR+g6CSqobQzg3BTl3KVg+r7kdU0wN8XUy 3ukA== X-Gm-Message-State: AIVw1111e1d0fNK0qeU+omWvmSotESSUq3VZlL9Pg5wloHS7GvJBtQlP MXpVemUf1W55yGpJ X-Received: by 10.28.66.67 with SMTP id p64mr654162wma.93.1499373627798; Thu, 06 Jul 2017 13:40:27 -0700 (PDT) Received: from ?IPv6:2003:c6:ebc1:e200:3441:621c:2955:bada? (p200300C6EBC1E2003441621C2955BADA.dip0.t-ipconnect.de. [2003:c6:ebc1:e200:3441:621c:2955:bada]) by smtp.googlemail.com with ESMTPSA id c203sm1907715wme.12.2017.07.06.13.40.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 13:40:27 -0700 (PDT) To: Alexandre Belloni Cc: linux-rtc@vger.kernel.org, "devicetree@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH] rtc: ds1307: remove legacy check for "isil,irq2-can-wakeup-machine" property Message-ID: Date: Thu, 6 Jul 2017 22:40:03 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org Commit 8b44f5be20fd ("ARM: dts: armada: replace isil,irq2-can-wakeup-machine with wakeup-source property") removed the last usage of "isil,irq2-can-wakeup-machine" almost two years ago. So I think we can get rid of supporting this legacy binding. Signed-off-by: Heiner Kallweit Acked-by: Rob Herring --- Documentation/devicetree/bindings/power/wakeup-source.txt | 9 ++++----- Documentation/devicetree/bindings/rtc/isil,isl12057.txt | 1 - drivers/rtc/rtc-ds1307.c | 8 +------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/power/wakeup-source.txt b/Documentation/devicetree/bindings/power/wakeup-source.txt index 963c6dfd..3c81f78b 100644 --- a/Documentation/devicetree/bindings/power/wakeup-source.txt +++ b/Documentation/devicetree/bindings/power/wakeup-source.txt @@ -20,13 +20,12 @@ List of legacy properties and respective binding document 1. "enable-sdio-wakeup" Documentation/devicetree/bindings/mmc/mmc.txt 2. "gpio-key,wakeup" Documentation/devicetree/bindings/input/gpio-keys{,-polled}.txt 3. "has-tpo" Documentation/devicetree/bindings/rtc/rtc-opal.txt -4. "isil,irq2-can-wakeup-machine" Documentation/devicetree/bindings/rtc/isil,isl12057.txt -5. "linux,wakeup" Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt +4. "linux,wakeup" Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt Documentation/devicetree/bindings/mfd/tc3589x.txt Documentation/devicetree/bindings/input/ads7846.txt -6. "linux,keypad-wakeup" Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt -7. "linux,input-wakeup" Documentation/devicetree/bindings/input/samsung-keypad.txt -8. "nvidia,wakeup-source" Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt +5. "linux,keypad-wakeup" Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt +6. "linux,input-wakeup" Documentation/devicetree/bindings/input/samsung-keypad.txt +7. "nvidia,wakeup-source" Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt Examples -------- diff --git a/Documentation/devicetree/bindings/rtc/isil,isl12057.txt b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt index cf83e094..fbbdd92e 100644 --- a/Documentation/devicetree/bindings/rtc/isil,isl12057.txt +++ b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt @@ -24,7 +24,6 @@ Optional properties: - "wakeup-source": mark the chip as a wakeup source, independently of the availability of an IRQ line connected to the SoC. - (Legacy property supported: "isil,irq2-can-wakeup-machine") - "interrupt-parent", "interrupts": for passing the interrupt line of the SoC connected to IRQ#2 of the RTC chip. diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 18b6a6af..37720242 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -1396,14 +1396,8 @@ static int ds1307_probe(struct i2c_client *client, * This will guarantee the 'wakealarm' sysfs entry is available on the device, * if supported by the RTC. */ - if (of_property_read_bool(client->dev.of_node, "wakeup-source")) { + if (of_property_read_bool(client->dev.of_node, "wakeup-source")) ds1307_can_wakeup_device = true; - } - /* Intersil ISL12057 DT backward compatibility */ - if (of_property_read_bool(client->dev.of_node, - "isil,irq2-can-wakeup-machine")) { - ds1307_can_wakeup_device = true; - } #endif switch (ds1307->type) {