From patchwork Wed Mar 12 10:43:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 14013284 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 48ABD241129 for ; Wed, 12 Mar 2025 10:44:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741776246; cv=none; b=Co6zLDdCRWLJwju8X3Dp/ve+zsmxLkHWih7WKSQa8kT0tllgEJsXfPdyFwAAxey4bYVxqFxXQdWNManUvTA8llFpSl9/btdahuM0CRNreG8Ei5Fmb+OfQo7e6mvzq0vS9B60phNSBa/AB4lYhkuVvbLYL8mp2izPgADluIYwMq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741776246; c=relaxed/simple; bh=005DS8QRrzpQdoXyb+W7Av4A9bD2sm0mlAHOBLREaMk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rPgEGydRmIf6k2fqDq+Jj9uL5WXwQ5X68F5yEFKPQjekwusmPpUsxpKkiRX8H6wNzw9inwG5P+scX+W0j8RAKxBB/jKLDWB+M3fEen/kleAIWI3jfBhETK3Wy3GxS+p9cz2Ymf436/OfsdAZ5NqHJ4CWU6LZgZuGvfdSe2LCHJs= 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=b6LqZD8D; arc=none smtp.client-ip=209.85.216.47 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="b6LqZD8D" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2feb91a25bdso10163354a91.1 for ; Wed, 12 Mar 2025 03:44:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741776244; x=1742381044; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=g9Hi6z01W79t89Yzzjz+Av4u/k4zBkYFE5hgZtEL7TA=; b=b6LqZD8DvadWFUJlOWAOej3+1XbCeMGfUyE5AsPIR2S7QAXi4tPz8aC4CpDCkAc9Xp miVYZdP7xjh/QD806xK37FO5bP77Ur+tepOuv/wX0R7YaqZMxOPBFauf1Kaoy+uNeqqg x+z/vOf2joRXDzhMP0yHyyfAbaUe2BREKEyJs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741776244; x=1742381044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g9Hi6z01W79t89Yzzjz+Av4u/k4zBkYFE5hgZtEL7TA=; b=d47MA6+I/PGjam8R1swXX+Wqy6v4oPAQ+a+41Er/btcqtXkRNNeMhINFhUYAdxkHdn BkAr4kge99K3G6NiLcRfXP8cF3ZXyxlGHD+/NyiBsozmNaJkElazJkUY9/8uvEYJQmU4 PTtip6iEkY1kon8giL4ogXk1u7zshmLypbpjNMfKhMW1N3GlVt1dZ5rOi2IucmoFGdIP cVWoS6QzMmgk6kF/9m0nTMpdmNCVX0QZUQf2FA041WzfvUEuB3yDCj45N5ihZAhIl98/ NS5O/EyKGLpGustJRdrSW8pe/vm8k9lJcthgWCn+4cv51d5bf5EsMN+d93GusufiMoat 3S4Q== X-Forwarded-Encrypted: i=1; AJvYcCXwasHhX7lITruqeew7I9aOGI9CWH2bQA4o1RW4IctA9d/yGLu2lPpXJMZu/MlkbUIbW3VtzOmxaWgZRQ==@vger.kernel.org X-Gm-Message-State: AOJu0YyiLSuHV5rhfMmzbbpDvnkRLGYRUTMTP1PyfJt43BzS817A3sQC Xmiyyg4VZcI2IxKR14O9ZY29VYopZB7U9KM5RmQETMk90WwcXjg5S+/VKw4g7Q== X-Gm-Gg: ASbGncsQMgWf3d7EOR7/kxuww10TsQisXYN7ttiprPQvR4zADjdnQtHDe32Hgq0f36e pF59DFlWOmmWih56G+eRluTxRTeodB1t/d+n3blVree6pRyeRYokSjz1i372wArK+CTAVzBr/Kn KmJ8tAwjErakLaBEmkrA4r7bvOEnnglJS1+SLjdia4bPdsMnWoZ6OVfaTdOcl+IaJJmbZt/CT88 AI5PKxepBOLSvuGVUZL+MLWFGcNtIlGs5e345qFxjpXTDZsp/mIG4e95tuD9zkZnpdOVR7TIsPi KhdtDRRcxi6TVN1ZKpsijoV/r+QnncYW+8rsWIk8hS8ENCR+0vLjE6Wq3vEknSg= X-Google-Smtp-Source: AGHT+IHJj3ClCl0G4w7uRfbh34yNw6y58jNADTnvGcCG6MJZbH+QLxVptAl9mfKjSGMGz6TiuUUEtA== X-Received: by 2002:a17:90a:d88d:b0:2ff:6788:cc67 with SMTP id 98e67ed59e1d1-300ff368043mr8303305a91.34.1741776244552; Wed, 12 Mar 2025 03:44:04 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:b5ed:b71c:fb14:a696]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3011926599csm1405675a91.35.2025.03.12.03.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 03:44:04 -0700 (PDT) From: Chen-Yu Tsai To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Benson Leung , Tzung-Bi Shih , Dmitry Torokhov Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, chrome-platform@lists.linux.dev, linux-input@vger.kernel.org, Douglas Anderson , stable+noautosel@kernel.org Subject: [PATCH 4/8] arm64: dts: mediatek: mt8186-steelix: Mark second source components for probing Date: Wed, 12 Mar 2025 18:43:38 +0800 Message-ID: <20250312104344.3084425-5-wenst@chromium.org> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog In-Reply-To: <20250312104344.3084425-1-wenst@chromium.org> References: <20250312104344.3084425-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Steelix design has two possible trackpad component sources. Currently they are all marked as available, along with having workarounds for shared pinctrl muxing and GPIOs. Instead, mark them all as "fail-needs-probe" and have the implementation try to probe which one is present. Also remove the shared resource workaround by moving the pinctrl entry for the trackpad interrupt line back into the individual trackpad nodes. Cc: # Needs accompanying new driver to work Signed-off-by: Chen-Yu Tsai --- .../boot/dts/mediatek/mt8186-corsola-steelix.dtsi | 7 +++++++ .../mediatek/mt8186-corsola-tentacool-sku327683.dts | 2 ++ .../mediatek/mt8186-corsola-tentacruel-sku262148.dts | 2 ++ arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 10 ++++------ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi index e74e886a00cb..822a177e7c19 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi @@ -123,8 +123,11 @@ trackpad@2c { reg = <0x2c>; hid-descr-addr = <0x20>; interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&trackpad_pin>; vdd-supply = <&pp3300_s3>; wakeup-source; + status = "fail-needs-probe"; }; }; @@ -197,3 +200,7 @@ pins-vreg-en { }; }; }; + +&trackpad { + status = "fail-needs-probe"; +}; diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts index c3ae6f9616c8..4dbf2cb73a81 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts +++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts @@ -17,6 +17,8 @@ trackpad@15 { compatible = "hid-over-i2c"; reg = <0x15>; interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&trackpad_pin>; hid-descr-addr = <0x0001>; vdd-supply = <&pp3300_s3>; wakeup-source; diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts index 447b57b12b41..ee5bc2cd9e9f 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts +++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts @@ -19,6 +19,8 @@ trackpad@15 { compatible = "hid-over-i2c"; reg = <0x15>; interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&trackpad_pin>; hid-descr-addr = <0x0001>; vdd-supply = <&pp3300_s3>; wakeup-source; diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi index cebb134331fb..918f17385ba5 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi @@ -390,19 +390,17 @@ &i2c1 { &i2c2 { pinctrl-names = "default"; - /* - * Trackpad pin put here to work around second source components - * sharing the pinmux in steelix designs. - */ - pinctrl-0 = <&i2c2_pins>, <&trackpad_pin>; + pinctrl-0 = <&i2c2_pins>; clock-frequency = <400000>; i2c-scl-internal-delay-ns = <10000>; status = "okay"; - trackpad@15 { + trackpad: trackpad@15 { compatible = "elan,ekth3000"; reg = <0x15>; interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&trackpad_pin>; vcc-supply = <&pp3300_s3>; wakeup-source; };