Received: by 2002:a17:90a:88:0:0:0:0 with SMTP id a8csp39698pja; Fri, 22 Nov 2019 03:10:30 -0800 (PST) X-Google-Smtp-Source: APXvYqzicj6hzRi4D1TrSrBvL4FTnTgmikS6UR0glBprFu/B1stEicZ+wODLU0rnxzaQCWBEhrkh X-Received: by 2002:a50:c3c5:: with SMTP id i5mr345861edf.137.1574421029877; Fri, 22 Nov 2019 03:10:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574421029; cv=none; d=google.com; s=arc-20160816; b=WmW9hg1vZHhuhWAR+x2llLXXUcm5T2URul1Wnak1PT8wBBJFfp3d9lYjhq1krFv0AB CItqW1rcNyfh6GvDEqrqxGCPo1G+DUNqMv/Z/V+0C+tYDOfK3wB48H04UAbnG7tYK94B OJsnV/pAG9ZeVUX6CvVHbDD7jyiVIpaTaj1gSq6fh7rF7G+A9FwLsrNuLSIZKrG+3xU+ lqUC4wI617ltpvXgCURemJzoUJ9ddyw9funaQwJ9lSOwyOCKShHJ0mb7jInsmTJzp0Sr /tE/Tg9j7pzbQxDTCDf9P6VcR8bInLsAghmPVKNWLziwq0UDAYaBMSL+kMez5z0FU8n8 3PPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lR8iENtxVEN26SzgI2Cbodd6DXgeAIwIV8ixpa1vWi0=; b=kPm4Yx57Pf2pdbSw4XX0omCWdNL3GPjMDtNN9zIRRlxJsr2lyYNclbYOZRWfIWjaXH SXS5xENCfT7vVnIPUUO4YtNtnlJWBGi/T1Ri0f/bmVV/r67OWdw7eWmtbWNMlile5C/p +pTX3jq23DUG3veNMQPm5NtU9TnR2ksNV+YWYy4sJijW5VFWdl0tWOlGxargFnJgU1Re p70/ZUnBinzmB4POVFjFl6j+WJpl0a4qoC/foIDfrrWILSuvtcnM+hgN4+uk6AF83UlE L+YwAHbGfWyGl16ZseFEs51vccYSwvpfAnVf40UAFEBkUf7peb5lBIQ94N4htKpKKNRf zRhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yOZbt6fP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 5si4024666ejz.59.2019.11.22.03.10.06; Fri, 22 Nov 2019 03:10:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yOZbt6fP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731792AbfKVLGA (ORCPT + 99 others); Fri, 22 Nov 2019 06:06:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:33882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730559AbfKVLF7 (ORCPT ); Fri, 22 Nov 2019 06:05:59 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5469D2084D; Fri, 22 Nov 2019 11:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420758; bh=oucbaIwMQWF2MuPnamtCAdOmq+gx0EtrQoYGxAWcjzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yOZbt6fPgtjbtwisLY9klmL8wAyQv4Kk46OejhkSvXASDnsxcMH2zm0u0IMD+JVGd BZrhka+aAI/ZYHLBTWXj8rlQWmOTgDY/Myhhq2cEG4LsKRCVHoqIJeq4VNnaqtuzHV VdTsVzrDGN8qQfzB7smM64GYXYRzVo5CGBC95lho= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vignesh R , Lee Jones , Sasha Levin Subject: [PATCH 4.19 172/220] mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup capable Date: Fri, 22 Nov 2019 11:28:57 +0100 Message-Id: <20191122100925.213032982@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100912.732983531@linuxfoundation.org> References: <20191122100912.732983531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 fe8d335a4d74d..4660ad90ef556 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c @@ -295,11 +295,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