From patchwork Wed Jan 31 08:40:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 194581 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1750626dyb; Wed, 31 Jan 2024 00:41:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IFTs1xooGsa2AXu7uio2YGw24KQIktGZ3HvL06alVX9AjRWwnTWmJd6f0qRbxal+Rry379X X-Received: by 2002:a05:6214:2507:b0:681:781f:6781 with SMTP id gf7-20020a056214250700b00681781f6781mr1216983qvb.1.1706690470273; Wed, 31 Jan 2024 00:41:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706690470; cv=pass; d=google.com; s=arc-20160816; b=MC7osISW44DEVdMlEGUpKQobUaDVYGMrth/GpEV6HZs3A/Uw335VNUs1JJeazqs9kr wgxaZFQZSVo98gEhT2xMGSQcoT0zJdadg8F/rIbL/5yVvWHNSbesYrQVZeogGmUGYQUY bih/OhXAhYlRXZeKBjYdgfrC7nNLQf9GIHSRokaHb41a/Z3icOyZRDktzYy8f4CDX6jg 9bnb8qfvyEdMJUUbDfZMi3ayVyqDn4TdL03vdvpFZZz8FruXiQXa5k7twTYuQjb+W2nW ueAA8mO9eeggCyZf8an2NAoBuvXT3LwAMDtAgUzEth7Hwaadyp4cWGRsUaiyVS800RrO tGDA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=TxqUCZUmsP7DgZniUm0/38xJfKfkBwtdPc5aQ25lcnU=; fh=NvRSMob7y+V8r8gVviy31Ak/IM8FO+SGzWcNI5GQnGQ=; b=Ek3HKZmGcnz8h3+n7mysYPNMjNQ307cCxoL/xKGW46OIClQbFxLhudVK1VFR4Q9ONC Qtabu6TerEuGkVEXm5ZtCAJVsH2wbhSyR5Ch+yXQHctYLhiocmPSMoQ/R/rWPmIIhGQS 5BY/RNOKFQ1hW4MzqLERBNBBHr2DppEoAhYJiE5vSuWukKwbasV04RZlJdh5RmVu4Dnx jgWTGqF8kyZbZMHkXunz2gjV+JIJS/M/1s8ytqUa32ldzFpiwOzpON2BeiPk1xLAILS3 nCJy0xrE7qQ9vqcy8qlRp+CJrs7EDGXPTIuAQ2Lu92zGzmWzMP60P8IsG8CE+zqPS1T8 E70A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=l3L0xY+0; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-46015-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46015-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org X-Forwarded-Encrypted: i=1; AJvYcCUX/ON5O/L9neQOvn5cIXQ/QmRq7I1B5mJdWVFnB3d6Y3DGcWCFE8WP1DpTaTJTLiJNK+PEssEdiXG8T8sylB1eZDnIaw== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id z1-20020a0ce601000000b0068c36441386si9970513qvm.468.2024.01.31.00.41.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 00:41:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-46015-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=l3L0xY+0; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-46015-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46015-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id B51301C25632 for ; Wed, 31 Jan 2024 08:41:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3D5535A0E4; Wed, 31 Jan 2024 08:40:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="l3L0xY+0" Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D34F855C2D for ; Wed, 31 Jan 2024 08:40:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706690451; cv=none; b=GiMbv5/2kmVvRAxK1p/CxjB5elaixS1IMDFEd8dDuYV6XQeDaOqLRIGrpAlfaJ1uRkL25DCP77t5An2XcnxMIHQIv43JkgKaNr3H301qNPpbJO9Ue7ekSC8mUIXDIsijKkE5JBOlDApogSGgklOLDm+GHTPL2l5/9p4/y+FiPY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706690451; c=relaxed/simple; bh=0N7Vv617AZpS/lhgQ1jLWXz9N9LwcNRliNpAe3N+rPI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=If+iMHPGnWX74msgUFJVzeKANWHD8C0nROlNZkF0Oj2+lBCjQdd4LxprpKlEj7jofXmVwVra+8tbDC2OsRbb2BAJvw7AntpKmYy9p+0qWMybS6v/FjK5DOQlW8eM54uzlBbjkvEEjkZqO7v16foK4+d0bBGk053zYeu4yA8B1/s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=l3L0xY+0; arc=none smtp.client-ip=209.85.167.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3bba50cd318so3986983b6e.0 for ; Wed, 31 Jan 2024 00:40:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1706690449; x=1707295249; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TxqUCZUmsP7DgZniUm0/38xJfKfkBwtdPc5aQ25lcnU=; b=l3L0xY+0IqBB9tw5snD2MssywSjV7o6XAIzK8Vc+4zN+VZdAkGMXUuf2sF7TIFGGaM BfTcgcX4fR9vPmnIcU6BxcsFzw9mdI3v5FqxBiNgk6TzlTxDW13UPYUhyqCYROMbqVoL dw6xD41PjObUIQq2ygdfjPrWvuyxzYuXlWrcM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706690449; x=1707295249; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TxqUCZUmsP7DgZniUm0/38xJfKfkBwtdPc5aQ25lcnU=; b=Lvf6cxGqUyae4oFDVWt6iAMAIq1/Srr9pfl4aQ8AtteEZ4OfRvEeEpHBcVu601D+UN 8fH+ppW/H2sIBiSBNxQ7i8ItukHJi9B/J3/vaaLddj/W9GxlOt9ctP07Pzz1l8Cg4Z5p fLW8aK0gYv+UIWbHWIrM863Ry/NUJtUII89eWq9w99DLiCNz0FeqfuFzEyp/4ZUf6BVW /MfLyx1wswF748qJNqLvrdcAX/sZkHZMljuTbH8TK0C1Mn4kE2eZBsV18PCG08IE3KLM YOPWBVg8n9tc1hvo/ojalSkSFw3KXf7YjWtwh3qnalKoU0ao311QOxlRi1ID1b8kZWrU 464A== X-Gm-Message-State: AOJu0YyjRtB+7tai+CeVSEwqa3csNl8oXhRvh8TNGvs82ZBTqPFRAKOU jwceW1q8i4fKXnZi+pxxRIi2xhPoOEmNuo1o5QHJDaLmeZqSFxO4uOLoKmgp3Q== X-Received: by 2002:a05:6808:bd4:b0:3be:453d:7654 with SMTP id o20-20020a0568080bd400b003be453d7654mr1106395oik.48.1706690448802; Wed, 31 Jan 2024 00:40:48 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:74d3:dadd:270b:194a]) by smtp.gmail.com with ESMTPSA id k1-20020aa788c1000000b006de3ffa19f4sm3343454pff.0.2024.01.31.00.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 00:40:48 -0800 (PST) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley Subject: [PATCH] arm64: dts: mediatek: mt8183-pico6: Fix wake-on-X event node names Date: Wed, 31 Jan 2024 16:40:41 +0800 Message-ID: <20240131084043.3970576-1-wenst@chromium.org> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789594666284206834 X-GMAIL-MSGID: 1789594666284206834 The wake-on-bt and wake-on-wlan nodes don't have a button- or event- prefix that the gpio-keys binding requires. Fix up the node names to satisfy the binding. While at it, also fix up the GPIO overriding structure for the wake-on-wlan node. Instead of referencing the gpio-keys node and then open coding the node, add a label for the event node, and use that to reference and override the GPIO settings. Fixes: 055ef10ccdd4 ("arm64: dts: mt8183: Add jacuzzi pico/pico6 board") Signed-off-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- .../boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 8 +++----- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts index 6a7ae616512d..0d5a11c93c68 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts @@ -17,7 +17,7 @@ bt_wakeup: bt-wakeup { pinctrl-names = "default"; pinctrl-0 = <&bt_pins_wakeup>; - wobt { + event-wobt { label = "Wake on BT"; gpios = <&pio 42 GPIO_ACTIVE_HIGH>; linux,code = ; @@ -47,10 +47,8 @@ trackpad@2c { }; }; -&wifi_wakeup { - wowlan { - gpios = <&pio 113 GPIO_ACTIVE_LOW>; - }; +&wifi_wakeup_event { + gpios = <&pio 113 GPIO_ACTIVE_LOW>; }; &wifi_pwrseq { diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index a241bb70cd76..89932984889d 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -142,7 +142,7 @@ wifi_wakeup: wifi-wakeup { pinctrl-names = "default"; pinctrl-0 = <&wifi_pins_wakeup>; - button-wowlan { + wifi_wakeup_event: event-wowlan { label = "Wake on WiFi"; gpios = <&pio 113 GPIO_ACTIVE_HIGH>; linux,code = ;