From patchwork Mon Sep 7 06:52:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaoyang Huang X-Patchwork-Id: 7132941 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 118B6BEEC1 for ; Mon, 7 Sep 2015 06:52:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F053206E9 for ; Mon, 7 Sep 2015 06:52:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B92E205ED for ; Mon, 7 Sep 2015 06:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751257AbbIGGw0 (ORCPT ); Mon, 7 Sep 2015 02:52:26 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35819 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751240AbbIGGw0 (ORCPT ); Mon, 7 Sep 2015 02:52:26 -0400 Received: by pacfv12 with SMTP id fv12so89961625pac.2 for ; Sun, 06 Sep 2015 23:52:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OvCFohinPhd/WJvTRVsuPWwskdz52waw9QbZHqa9b4s=; b=c6n1Y20qG1RsNdmh8NfzeKzBzFseuhBnuRdGECvfr8rnXUMiGWW5FHlI7s22HBV9rx ZXhiwUIKwmlWEOJfGlz/04hozvNRSnYCVvkNshFQqYVPiEEvzffTIjwdq8Nd0vOybINI HTsmnKWZ4g2GMVqd8efyaDFeFEffUCuugIQ3MmNDlnpQ1eobk5VGNdEm2/wmBNZ6DtDC Q1x2QXaTavBDKliYO05v8pxMJ+GurWlP76uFw+UFAA+/b7LivzwTocMMwNn2j4Sau7XP +jn3/1Uoh4is49iLpEdyKvsOnod8QtcOK/Je4NVaJSP2E7fcC834WU2tiCo/L7PwuWrT v1lw== X-Gm-Message-State: ALoCoQnZ10C/9p7xYIYUzuTgLNtR1nRqm+vYjo1nTNWEpCnToVFaYrX05yUHBrElm9RkiXTQp7Bd X-Received: by 10.68.244.34 with SMTP id xd2mr41890118pbc.50.1441608745609; Sun, 06 Sep 2015 23:52:25 -0700 (PDT) Received: from zyhuangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id xs7sm10707870pab.4.2015.09.06.23.52.23 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Sep 2015 23:52:25 -0700 (PDT) From: Zhaoyang Huang To: linux-pm@vger.kernel.org Cc: amit.kucheria@linaro.org Subject: [Resend PATCH v3] modify pl011 driver to work as wakeup source Date: Mon, 7 Sep 2015 14:52:03 +0800 Message-Id: <1441608723-2234-1-git-send-email-zhaoyang.huang@linaro.org> X-Mailer: git-send-email 1.7.9.5 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 the commit use the latest dev_pm_set_wake_irq API instead of the enable_irq_wake and IRQF_NO_SUSPEND to configure the ttyAMA device to work as the wakeup source Signed-off-by: Zhaoyang Huang --- drivers/tty/serial/amba-pl011.c | 42 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index fd27e98..26d2902 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -59,6 +59,11 @@ #include #include #include +#include +#include +#include + +static struct device *uart_dev; #define UART_NR 14 @@ -2353,11 +2358,29 @@ static int pl011_register_port(struct uart_amba_port *uap) return ret; } +struct uart_match { + struct uart_port *port; + struct uart_driver *driver; +}; + +static int match_uart_port(struct device *dev, void *data) +{ + struct uart_match *match = data; + + dev_t devt = MKDEV(match->driver->major, match->driver->minor) + + match->port->line; + + pr_info("the match data of ttyAMA0 is %d %d\n", + (int)devt, (int)dev->devt); + + return dev->devt == devt; /* Actually, only one tty per port */ +} static int pl011_probe(struct amba_device *dev, const struct amba_id *id) { struct uart_amba_port *uap; struct vendor_data *vendor = id->data; int portnr, ret; + struct uart_match match; portnr = pl011_find_free_port(); if (portnr < 0) @@ -2387,13 +2410,30 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) amba_set_drvdata(dev, uap); - return pl011_register_port(uap); + ret = pl011_register_port(uap); + + match.port = &uap->port; + match.driver = &amba_reg; + + uart_dev = device_find_child(&dev->dev, &match, match_uart_port); + + if (uart_dev) { + device_init_wakeup(uart_dev, true); + dev_pm_set_wake_irq(uart_dev, uap->port.irq); + } + + return ret; } static int pl011_remove(struct amba_device *dev) { struct uart_amba_port *uap = amba_get_drvdata(dev); + if (uart_dev) { + dev_pm_clear_wake_irq(uart_dev); + device_init_wakeup(uart_dev, false); + } + uart_remove_one_port(&amba_reg, &uap->port); pl011_unregister_port(uap); return 0;