From patchwork Wed Nov 27 20:30:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 180317 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6629438ilf; Wed, 27 Nov 2019 12:41:57 -0800 (PST) X-Google-Smtp-Source: APXvYqxb/2J7DiWRj4igEz6cdoF46Szr1vEF0EQfXfIzq+UAh8gK6CO8xw/NQE5hYHfO/zCZMzIW X-Received: by 2002:a05:6402:602:: with SMTP id n2mr35125941edv.23.1574887317451; Wed, 27 Nov 2019 12:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574887317; cv=none; d=google.com; s=arc-20160816; b=Dg1ljUchvX9mxucciHsi/aW+o0V0e66QeclMAsDZCQq/cBrYKsVt2aftn9hkHDTRrQ unpLLZ7HqidxOjTJHP4r5L1NyUIZipd3jn7AWIQb/6GSOZgFECnPkzzQtAfs+DJEEMhW MtN7FTQ3tI/rdRCE2OHq73maPO3jSZHj0NommQxFyY/0fzVQm0OMenWdrUmelJgTzgAA Pdk/wOU7Se1mBRvKeBPfMLOeseUDxDUKMZlDB7qGZbAuC9LWAnxXTDB5/dosp5Mnawd+ DdlixzXIffuJzV4Ykq9FlG5mCeSiftjPWhcLFYt+NZwGqTCSTldiLZjNurUwGjSnQj+I XGkA== 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=7VNXWGWCtE8Fm8Zz5q2L5LPZ1Mt6kOsnGIcD9S9rjhY=; b=d8YPt5HMVqxQVMVjPYi8p/Vs2HnhxGOI8CI7EpsuNbe/wGOenuaw5BheWJjAZPoVt7 oqNOFALW2gOVUX0s9pvz+rOcmCa/YHOw0oiWKlKkb5dtnLSuJdmFlbyioIPE/KRXPAYo 8yTxX/0TjRoXgvhaRWbpWrddOsK3fX7DdHMKiYk9hNhGmN2zzGbzv74nJuz2gaMy5XE+ Pgy1XyYvZkR2CsBdJeeYAt133KonqEIIPv74+MeXs7gExM0l5F8MrcsI8sYAfaOgKVp9 0f9NlyL+75flm4AjopN9n9od8Vw+G/lJ4xgjeumREubwUb1AJwbau9vUu9ng4kh73py5 Wyaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MBt4vf84; 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 f2si11075447ejf.231.2019.11.27.12.41.57; Wed, 27 Nov 2019 12:41:57 -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=MBt4vf84; 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 S1729262AbfK0Uly (ORCPT + 26 others); Wed, 27 Nov 2019 15:41:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:47472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729234AbfK0Ulu (ORCPT ); Wed, 27 Nov 2019 15:41:50 -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 DF36B20863; Wed, 27 Nov 2019 20:41:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887310; bh=dG+zSrw7iEHZfFQEuCJ+9sfjj9LTzYBKGyDmPJzLAbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MBt4vf84RYxRNfeWCIVApsLOgdQBE8YUN/dvQ5JPGtUcNY4PeLVXfnkXkXWibukd+ fBmQe3viJ81LxYdniE0wju96O9CPRW+LYmHIqZRiVHAvP6AWb5PjvGFaoqtDp9ELan lj/jDTASENU/q3pkvp+CvARzCdLixmuSbFASWP/I= 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.9 059/151] mfd: max8997: Enale irq-wakeup unconditionally Date: Wed, 27 Nov 2019 21:30:42 +0100 Message-Id: <20191127203032.846787093@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203000.773542911@linuxfoundation.org> References: <20191127203000.773542911@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 2d6e2c3927862..4a2fc59d59016 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c @@ -155,12 +155,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; } @@ -248,7 +242,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;