From patchwork Tue Jan 16 21:38:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 763401 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AB1235F03; Tue, 16 Jan 2024 21:41:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705441263; cv=none; b=aRy9C7qBozfjrUF3O2Qb7+UB3SZXaLfofm2Q/0TG+BhnWeTLxKP6FsyeQJrR6+K4UAcnqdOCQs663T25m1H2Z6/nps+l0gNzpda1DBw1ooNXbwNPSuYFHmh03Z9J1I2gW9yHY+fWNLdO+avr7x7QJ4TjdywDHKrRpTOINufpoNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705441263; c=relaxed/simple; bh=5s8DRDqJVBVIIn+xD56hZynbIPJpLvIaUigTrdQ0amc=; h=DKIM-Signature:Received:From:Date:Subject:MIME-Version: Content-Type:Content-Transfer-Encoding:Message-Id:X-B4-Tracking:To: Cc:X-Mailer; b=UsLRyOhPc8GX/9nlwxgfK+JoQxNpsaYP8YA14Vsf1Bgl/ZNgtvojU+/2PVzJFE7FGsIlEGK+VSWi7yCu4im4LYFz6dC4BUTFeUgoQLU+RhPbAMTozbJc2iQphFiEJIgXrJP/C+NCLNxfc2OQW3Wz5x4+jE6Hdc2d5r6E6e56S+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=QRqih3UW; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="QRqih3UW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1705441259; bh=5s8DRDqJVBVIIn+xD56hZynbIPJpLvIaUigTrdQ0amc=; h=From:Date:Subject:To:Cc:From; b=QRqih3UWL6XALeYEJ3G3ySQNdQ6DRqtlu4INp/1PR3Ti+VUZiaBL29MQSdn1xwhnu Sb+vCARcXJmIow58sB022+q38ZNuEpUtBdNSXnZiVNz6WZK8ZdiC0xzyVNxkQEut6V uwx2bjhctlJnP7EVCTARg+Dgi51FfMoMsRvtDbSAchYw0XvMPXZhC+etI31NED4cHS KCZr8yYQ+G+Vwlh4c4Yntz68gesABsIA69nFsE/lEjYE6Pc7glZeNc0CZCjb8lbfpY rGl6Ur8VmZktvKcp0xT6LY1DkCdBQvRT0ECKaEVC8vyZ+5UGRI3XuSgYKGduvgnf+1 ogLV6l3RcwKGg== Received: from [192.168.0.47] (zone.collabora.co.uk [167.235.23.81]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nfraprado) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 0E6A1378000A; Tue, 16 Jan 2024 21:40:54 +0000 (UTC) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Tue, 16 Jan 2024 18:38:34 -0300 Subject: [PATCH v3] arm64: dts: mt8183: Move CrosEC base detection node to kukui-based DTs Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240116-mt8183-kukui-cbas-remove-v3-1-055e21406e86@collabora.com> X-B4-Tracking: v=1; b=H4sIAFn3pmUC/03MTQ6CMBBA4auQrh3SHyzoynsYF0MZpIFSMgViQ ri7jSuX3+K9QyRiT0nci0Mw7T75OGeYSyHcgPObwHfZQktdSaUshLVRjYFxGzcPrsUETCHuBPZ at1YjOeqsyPnC1PvPb/18ZfccA6wDE/4Ptaq0NLq8yVttLCiYe8aFsYsPF6cJ28hYuhjEeX4B8 1CA46wAAAA= To: AngeloGioacchino Del Regno , Matthias Brugger Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Enric Balletbo i Serra , Ikjoon Jang , Stephen Boyd , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com X-Mailer: b4 0.12.4 The cbas node is used to describe base detection functionality in the ChromeOS EC, which is used for units that have a detachable keyboard and thus rely on this functionality to switch between tablet and laptop mode. Despite the original commit having added the cbas node to the mt8183-kukui.dtsi, not all machines that include it are detachables. In fact all machines that include from mt8183-kukui-jacuzzi.dtsi are either clamshells (ie normal laptops) or convertibles, meaning the keyboard can be flipped but not detached. The detection for the keyboard getting flipped is handled by the driver bound to the keyboard-controller node in the EC. Move the base detection node from the base kukui dtsi to the dtsis where all machines are detachables, and thus actually make use of the node. Fixes: 4fa8492d1e5b ("arm64: dts: mt8183: add cbas node under cros_ec") Signed-off-by: Nícolas F. R. A. Prado --- Changes in v3: - Instead of deleting the node in jacuzzi, moved the node from kukui to the dtsis including kukui that are detachables Changes in v2: - Moved cbas node removal to jacuzzi dtsi --- arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 4 ++++ arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 4 ++++ arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi | 4 ++++ arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 4 ---- 4 files changed, 12 insertions(+), 4 deletions(-) --- base-commit: 0f067394dd3b2af3263339cf7183bdb6ee0ac1f8 change-id: 20240116-mt8183-kukui-cbas-remove-657b62aeced6 Best regards, diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi index b6a9830af269..bfb9e42c8aca 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi @@ -360,6 +360,10 @@ pen_eject { }; &cros_ec { + cbas { + compatible = "google,cros-cbas"; + }; + keyboard-controller { compatible = "google,cros-ec-keyb-switches"; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi index 306c95166f3f..5c1bf6a1e475 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi @@ -339,6 +339,10 @@ touch_pin_reset: pin_reset { }; &cros_ec { + cbas { + compatible = "google,cros-cbas"; + }; + keyboard-controller { compatible = "google,cros-ec-keyb-switches"; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi index 382e4c6d7191..0f5fa893a774 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi @@ -343,6 +343,10 @@ rst_pin { }; &cros_ec { + cbas { + compatible = "google,cros-cbas"; + }; + keyboard-controller { compatible = "google,cros-ec-keyb-switches"; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index 5506de83f61d..66eb099e15f0 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -937,10 +937,6 @@ usbc_extcon: extcon0 { google,usb-port-id = <0>; }; - cbas { - compatible = "google,cros-cbas"; - }; - typec { compatible = "google,cros-ec-typec"; #address-cells = <1>;