From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4C1BC17441 for ; Wed, 13 Nov 2019 01:59:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 737482053B for ; Wed, 13 Nov 2019 01:59:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610340; bh=oeUILCoYnzNn+H2vA7zbnS+k6R6CH4wMXcGBPruayWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OeRqFZo/34hdpK4lyG27uGg/nikVSEjRAn+eW0rkC8NE25FlbYlxYaq6hqIl+nJnD cSQajb26TUum5V8/Kq4qHgODA7s4XwZzwfpYWedZrRvswhxXAK+ZAb3Iuzi7CZKylD anDI305eIMpoH2yHgqQ4FDgKdu9w8+IZ3xAHDA0Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730167AbfKMB67 (ORCPT ); Tue, 12 Nov 2019 20:58:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:52936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729070AbfKMB6x (ORCPT ); Tue, 12 Nov 2019 20:58:53 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 592FF222D3; Wed, 13 Nov 2019 01:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610332; bh=oeUILCoYnzNn+H2vA7zbnS+k6R6CH4wMXcGBPruayWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bEySVSWH2eYuSsjK5q/s1IOzKC7xbUxl4vyOlvgvK/U2uraXtJNPqJhPVuK5pEEKW UUZZxeWALnnRJd4BL6gbV7aTDw0veuVtu/h+gccJaTdtb4u9Dr8AQlksan+ohb8rWK x7BdUJ7WKm+6YFS6OpanZHGEp9YDRmYcFbfqqlGQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vignesh R , Lee Jones , Sasha Levin Subject: [PATCH AUTOSEL 4.14 090/115] mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup capable Date: Tue, 12 Nov 2019 20:55:57 -0500 Message-Id: <20191113015622.11592-90-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015622.11592-1-sashal@kernel.org> References: <20191113015622.11592-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vignesh R [ Upstream commit c974ac771479327b5424f60d58845e31daddadea ] If a child device like touchscreen is wakeup capable, then keep ADC interface on, so that a touching resistive screen will generate wakeup event to the system. Signed-off-by: Vignesh R Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/ti_am335x_tscadc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c index 5894d6c16fab8..ca9f0c8d1ed0f 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c @@ -296,11 +296,24 @@ static int ti_tscadc_remove(struct platform_device *pdev) return 0; } +static int __maybe_unused ti_tscadc_can_wakeup(struct device *dev, void *data) +{ + return device_may_wakeup(dev); +} + static int __maybe_unused tscadc_suspend(struct device *dev) { struct ti_tscadc_dev *tscadc = dev_get_drvdata(dev); regmap_write(tscadc->regmap, REG_SE, 0x00); + if (device_for_each_child(dev, NULL, ti_tscadc_can_wakeup)) { + u32 ctrl; + + regmap_read(tscadc->regmap, REG_CTRL, &ctrl); + ctrl &= ~(CNTRLREG_POWERDOWN); + ctrl |= CNTRLREG_TSCSSENB; + regmap_write(tscadc->regmap, REG_CTRL, ctrl); + } pm_runtime_put_sync(dev); return 0; -- 2.20.1