From patchwork Wed Nov 27 20:29:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 180332 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6646153ilf; Wed, 27 Nov 2019 13:00:36 -0800 (PST) X-Google-Smtp-Source: APXvYqxJ8v80dOaTNqQa+g45j95aqjTjRdITYME8MCFM3qLqs7+sfyAs58LVpqAzm8mrtKm8NCL8 X-Received: by 2002:a17:906:bb03:: with SMTP id jz3mr28052415ejb.314.1574888436725; Wed, 27 Nov 2019 13:00:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574888436; cv=none; d=google.com; s=arc-20160816; b=F1LiDtZ/rGRJLVAqOZiuvmu21U1hLqd4RC7x/7ofHks0eXetFntFUKUqsS46mU2fiN EMd8ShUVz2/GmHU1I5ZAdGw8I407MvNn3h9J9xKyO25X2xwwvbrf2Wsw0cGNZW9HMVv0 0+3HVoqA9iXeLHy+8ZewUxAAFt+YrXCqb8hu8Jye3fjN0XlsyqHK2Q3Z/Q1RGPxesQQi s/5KdQ2lJ7zxXK0bemWe2KLSaUDSg+ry4bVH7dGCa/V10rnCCaLHSYXYZguD1dbYSYzc IJnuFQCa2/xigGWn0Ram6XkA5jtjBYDc9CVx+9vf7B6irkO7PziFZpx+y9EnO0hie4DB Tm4A== 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=f2LyFBNTq0/ASJIFRkSwESDb/8lyB3wt0LBLTpBMUTo=; b=K99pGCrwRSHd/es6tcXk8tz1kIOXcVr4iLn0rLNhOiYN4IV6YzspX6wJd0GmSru0w+ uYv7tsw6Z6/KD2COCWB64yBxl2Bm9+l8bg1dsbiCckHLeVD9/e+1rli/nT39EnP+jznW iIvD+DzaWH/IjwtTkv4cIH6ulTxAVCam/Ukf6Rw+GpIpWQsduB1H81w3KugCQgF2tLKE g3LinNASOm+hBMPW5r76jNTYOUE1+j3Uh6Axns1sm8W5QyMVDwSl7Ksyciw1rcl8j/uw ACzb6yDcdIHWfvt0ZVBVpS2tfBQZ6DSDSNqthaSPoll7DY+jgKK/oys0EjlT9a9Vakgy /7ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xlfTblkX; 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 jx9si10518258ejb.32.2019.11.27.13.00.36; Wed, 27 Nov 2019 13:00:36 -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=xlfTblkX; 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 S1731012AbfK0VAf (ORCPT + 26 others); Wed, 27 Nov 2019 16:00:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:52426 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729481AbfK0VAb (ORCPT ); Wed, 27 Nov 2019 16:00:31 -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 50AF82084B; Wed, 27 Nov 2019 21:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888430; bh=Wux2/6xePSbFE+QWcjf/7uQCjFGCFXhh9IaB2o/078A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xlfTblkXM8+sUZwRAhUtlW4LMTk39yeALtC7zwmDL7GGw0G7LQdC4Zw733oWDeH5I vBTSCWVk7ATkMbvsYQIJarAfWVWMSsbFU7vyQdbVyHCUzqNkPAVi6wlPsvbIZZoaAJ +J+Lde6aVK9nttZs26xY8Sx/L2l61EmR/im42FhM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Krzysztof Kozlowski , Lee Jones , Sasha Levin Subject: [PATCH 4.19 130/306] mfd: max8997: Enale irq-wakeup unconditionally Date: Wed, 27 Nov 2019 21:29:40 +0100 Message-Id: <20191127203124.588678023@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Szyprowski [ Upstream commit efddff27c886e729a7f84a7205bd84d7d4af7336 ] IRQ wake up support for MAX8997 driver was initially configured by respective property in pdata. However, after the driver conversion to device-tree, setting it was left as 'todo'. Nowadays most of other PMIC MFD drivers initialized from device-tree assume that they can be an irq wakeup source, so enable it also for MAX8997. This fixes support for wakeup from MAX8997 RTC alarm. Signed-off-by: Marek Szyprowski Reviewed-by: Krzysztof Kozlowski Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/max8997.c | 8 +------- include/linux/mfd/max8997.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) -- 2.20.1 diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c index 3f554c4475218..d1495d76bf2c3 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c @@ -153,12 +153,6 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( pd->ono = irq_of_parse_and_map(dev->of_node, 1); - /* - * ToDo: the 'wakeup' member in the platform data is more of a linux - * specfic information. Hence, there is no binding for that yet and - * not parsed here. - */ - return pd; } @@ -246,7 +240,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c, */ /* MAX8997 has a power button input. */ - device_init_wakeup(max8997->dev, pdata->wakeup); + device_init_wakeup(max8997->dev, true); return ret; diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h index cf815577bd686..3ae1fe743bc34 100644 --- a/include/linux/mfd/max8997.h +++ b/include/linux/mfd/max8997.h @@ -178,7 +178,6 @@ struct max8997_led_platform_data { struct max8997_platform_data { /* IRQ */ int ono; - int wakeup; /* ---- PMIC ---- */ struct max8997_regulator_data *regulators;