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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 6D365C432C3 for ; Fri, 22 Nov 2019 11:21:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40DB920718 for ; Fri, 22 Nov 2019 11:21:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421715; bh=4ElWsVrVIaG8mM1b7IaApAMRwb0A/8ZhKWfzOuGRZXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=efSRDWZFnefHg51vPVEI9xs/XoaxkxVYTU22T04T2WDr3jVMd499e9u0GlR6SwoY0 kpuOWjTQnnDFtjib7p+n+5YZuUVUEYf+xae2Z1SZmxKcTqC7x9/8LSYRfN2jF0WidJ zkCJj0JjMcF00EZRuHyo/i1b6DlccM+RfpaQ6Rtg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728414AbfKVKok (ORCPT ); Fri, 22 Nov 2019 05:44:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:50666 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728972AbfKVKok (ORCPT ); Fri, 22 Nov 2019 05:44:40 -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 9C339205C9; Fri, 22 Nov 2019 10:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419480; bh=4ElWsVrVIaG8mM1b7IaApAMRwb0A/8ZhKWfzOuGRZXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mvdLM/m7qyuRQ73nsNugyHDngyfSIrBXMQT7Q20zM2BjhqamXk2mlkJHv4iimH0/4 boLboDc/MhWqlS1J8u7MlH6QJQ+m9Q4HrEqgTfb4sXOf5zhgWp92wBV2/B6urJIj4H BR7Qwm7RJ1Ymgxxy6P8UH19VChBk6AXw4Zxx/r08= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Dietrich , Nicolas Chauvet , Thierry Reding , Sasha Levin Subject: [PATCH 4.9 127/222] ARM: dts: paz00: fix wakeup gpio keycode Date: Fri, 22 Nov 2019 11:27:47 +0100 Message-Id: <20191122100912.186113816@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Dietrich [ Upstream commit ebea2a43fdafdbce918bd7e200b709d6c33b9f3b ] The power key is controlled solely by the EC, which only tiggeres this gpio after wakeup. Fixes immediately return to suspend after wake from LP1. Signed-off-by: Marc Dietrich Tested-by: Nicolas Chauvet Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- arch/arm/boot/dts/tegra20-paz00.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts index b4bfa5586c233..23d4c837b87a6 100644 --- a/arch/arm/boot/dts/tegra20-paz00.dts +++ b/arch/arm/boot/dts/tegra20-paz00.dts @@ -521,10 +521,10 @@ gpio-keys { compatible = "gpio-keys"; - power { - label = "Power"; + wakeup { + label = "Wakeup"; gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>; - linux,code = ; + linux,code = ; wakeup-source; }; }; -- 2.20.1