From patchwork Wed Nov 27 20:30:10 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: 180353 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6692778ilf; Wed, 27 Nov 2019 13:46:19 -0800 (PST) X-Google-Smtp-Source: APXvYqzY5YZwLCJbPcdj8KHVgQHnm/7qbySNnq4M+OhKqZYNsZfuBk1FXr9qXrqepr6EyxHrZGKC X-Received: by 2002:a50:f299:: with SMTP id f25mr2694647edm.280.1574891179391; Wed, 27 Nov 2019 13:46:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574891179; cv=none; d=google.com; s=arc-20160816; b=tNfO+61VD8xb6DmPdcfICpLBxusFAxEIu6I2lgykKMXgBXGUBSicTbjr3cYeR1B3L+ yCfnwX5sxO3qNoysjOKHoSn8CMbSgDwpCRJnUuD2l8tqxm94JKoLdngfwtRmWAMSl56O KR6PnQsWi5RbIkngJvVcb5pnXbwYVErdiw9K6UpZTLnPSVzxAO7R5W+SiDR1SKX/Rsre Sn7/NukXIToB/+meEKuKf6Jk2yykUPpByKpKu/xhCPafswEOUpiEknPo5zT4P5ZC5W6f bqX6MvbmwEsTpu8AdHj/FZSsSvOUg34dIRfAbWMOgtykW7stI+h56uCs2En4PK+5IleX xaBQ== 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=jKxkRs6e0iXyoG4MOHMdyFONa9/hqxYk8xVYkrfVHnA=; b=VjqWpVC8R45Mn6jeQnDIUz8JYbvr/C2BcFO+7BlN4IIcpp9buJBpbXUNToKJzRdB5q nSlZV7v/t8/46nKeTHUGYEwC+/YDriZYlc91MkJ4X6+jeJOCeBS+Te4H8Uw4cjA5CvD3 rGW5BDSXZSVwt5d7umNoRUkldBrBhEmXZf+RkV06VaMLZaTDH+np+guc+bA0gJPWeYIw KlVxb5Tc0m2t4JMxYtQSxNHEVzc2uuNpE3/LQCEbNe3VGXJUA3dZI6+qP1mqIw4/dLNi bWnR97CVnaZfRuFPw3OJzpm4eVM28aLjgslkzCoJgkMU72hnvhWgy0U1QxENEKs/EO+C dSQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ge5uplF8; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 n15si10421592ejr.94.2019.11.27.13.46.19; Wed, 27 Nov 2019 13:46:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=ge5uplF8; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727718AbfK0VqS (ORCPT + 15 others); Wed, 27 Nov 2019 16:46:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:34502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727538AbfK0UeO (ORCPT ); Wed, 27 Nov 2019 15:34:14 -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 73D7D207DD; Wed, 27 Nov 2019 20:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574886853; bh=7ELU8Vu6+GPSxNfHPinOpipkeIGoboas9zgz5lzP99o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ge5uplF8zj8dD4hO+K+xABl7+6vdj5DPF1WFPWEdHNISm1CzE3EEgPYvz+mhjWgPF EP7YxnNieHAenISYM3rqVWXhOEj1p65tagYz8JRoKjHcnJrCbW47jY0dsxcfPN3eZX 3KMqNvtEtikx9COz/1bhgMg7KhUvD695HwC6YwpM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Darren Hart , Sasha Levin Subject: [PATCH 4.4 019/132] platform/x86: asus-wmi: add SERIO_I8042 dependency Date: Wed, 27 Nov 2019 21:30:10 +0100 Message-Id: <20191127202916.307387184@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202857.270233486@linuxfoundation.org> References: <20191127202857.270233486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit ea893695ec1131a5fed0523ff8094bc6e8723bbe ] A recent bugfix added a call to i8042_install_filter but did not add the dependency, leading to possible link errors: drivers/platform/built-in.o: In function `asus_nb_wmi_quirks': asus-nb-wmi.c:(.text+0x23af): undefined reference to `i8042_install_filter' This adds a dependency on SERIO_I8042||SERIO_I8042=n to indicate that we can build the driver when the i8042 driver is disabled, but it cannot be built-in when that is a loadable module. Fixes: b5643539b825 ("platform/x86: asus-wmi: Filter buggy scan codes on ASUS Q500A") Signed-off-by: Arnd Bergmann Signed-off-by: Darren Hart Signed-off-by: Sasha Levin --- drivers/platform/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 953974b5a9a95..6487453c68b59 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -566,6 +566,7 @@ config ASUS_WMI config ASUS_NB_WMI tristate "Asus Notebook WMI Driver" depends on ASUS_WMI + depends on SERIO_I8042 || SERIO_I8042 = n ---help--- This is a driver for newer Asus notebooks. It adds extra features like wireless radio and bluetooth control, leds, hotkeys, backlight... From patchwork Wed Nov 27 20:30:48 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: 180314 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6623931ilf; Wed, 27 Nov 2019 12:36:01 -0800 (PST) X-Google-Smtp-Source: APXvYqy0aNU5oeKRynK0dM+1kui4tmq3G3MRPk8TgbjGQ/+WQQ1lHm99/F59h0VhNJXcj7HnXTEK X-Received: by 2002:a17:906:4019:: with SMTP id v25mr52115366ejj.11.1574886960896; Wed, 27 Nov 2019 12:36:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574886960; cv=none; d=google.com; s=arc-20160816; b=Z4UfReW8TqFUILihqvq6jkp387LrGkF24s3eDWYeaALo5dyfrLru/TXZ4i6SXtq1hF hu/I7C46stg5Y1NDlKDy+O4ldrJ4EPO95xWEN04rxnkR1278Gmn4bTtThAEWtbAv+zGW 0tqj5H7PvvqIJbB+IN44zedH76FaUtooBNqP9k9IrcFGSVirYGKJdYnr+vLLD5/EHdkc GXVLwqND93aU2SXoYTNqdmKmk8JEQlFpI2hpMGhczx5qzXy07Dl00CU5O9q4In6xU+3Y bOz6F0k1MAInOMaFDBHQL9XFJpbeXzCxQrkU6/wRx8EZmoFmqfQ4PhvfXx5UclQI3dgu za+g== 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=L5O8uUHhCsmwkoUCnGPT2tuyryr4qVUOyYHiyiumcM0=; b=z/mE5yDsWMQ0/m2+5KJ12EclElFQmWOzEsKgrk8s9hlTgCfTDOpFghocFLtItzGFm4 yviNn+vq4hSga8fD2cAQ4NFPUKs8VAtfGb2wQcBGpxmP3eigNtRyxaTnArzl+VtHJHyD 6yZ6RvXunO+IH8jgeBcHQx3sRHW/w42ySkDoNo7GlDB+twTro6UVdp+PxOVjywI0uV7s C0celLX5EoqlfQFNvvUQeWPjWf0WEK0sSLFPGr7lGnE0ddhm4IBEbuXfA6kdLCko+kFn f7X2N8ypp8ik6l14Q4s2ZP8/3xC7AbvgqjYCttMzkHJenE0pDModJjYopzWZVfRyWpAK 4qfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UB8zYSp4; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 e5si9933680ejq.399.2019.11.27.12.36.00; Wed, 27 Nov 2019 12:36:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=UB8zYSp4; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728012AbfK0Uf7 (ORCPT + 15 others); Wed, 27 Nov 2019 15:35:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:37676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727987AbfK0Uf6 (ORCPT ); Wed, 27 Nov 2019 15:35:58 -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 C2400207DD; Wed, 27 Nov 2019 20:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574886958; bh=QE+CGNDNhKU+qrVEKrUF0e4RK3I+KMAovBbubBxCR/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UB8zYSp4ZbuWoD9jerk9r+P2EuPscnyU5rvKpRHV0O4T0l1hCAAR8+xU8ew4hegFi 9/tY/1j3UZePdRch07JVT/r/O6htzkWU3WINRPxkKTeIjNqMojFsH4gZT9k9m8PwHO UCtnCQI9hIo5whQi+8vDCWXeBYXkOIXWG0tIF+jo= 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.4 057/132] mfd: max8997: Enale irq-wakeup unconditionally Date: Wed, 27 Nov 2019 21:30:48 +0100 Message-Id: <20191127202957.096742863@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202857.270233486@linuxfoundation.org> References: <20191127202857.270233486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 156ed6f92aa32..2d9ae7cf948f8 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c @@ -156,12 +156,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; } @@ -249,7 +243,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;