From nobody Tue Nov 26 17:20:02 2024 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 594681DB940 for ; Thu, 17 Oct 2024 09:42:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729158179; cv=none; b=I9p5oTE6yla1WOLtu5E55+2muYAPARxmjNZ2rYZeF4nErdV6Fh1M1uKPGdH7PXWBRsEJ9LEDA2TAoUJq04ZqcJf3+0yB9udGN5uz6rtq266tIGB1kh/YWET3/m9P/nQN16Fhp6dnAaYyxwpZVt9FBfURIPkBcLZQJZhQHesT3T8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729158179; c=relaxed/simple; bh=V9z/vaLUXaKLZjuP3iq+CpCGEU1lqT/fL6h6m6KfjHU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hLbxsJNab1RTV7MS2JDWxzXVm1kL9DI5Yt1rUnK3UaTOonWdrgUcK2/NJXgutGNN78kaBuoaGrA0XRgm0vpkmaDJdYChGuwgX7m1wjQFACfqRbSVEDii1TiPIAvBchLQPGsFsoq9xMPTws+CNQZDwWYXn935gjDV4GwuMz4QNvY= 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=fRb5TCW/; arc=none smtp.client-ip=209.85.214.177 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="fRb5TCW/" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-20cbcd71012so7012385ad.3 for ; Thu, 17 Oct 2024 02:42:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729158175; x=1729762975; 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=bgdGGrdxh1yrmxMi7ELq+GCDozx5PI/JXUv/P9EgGw8=; b=fRb5TCW/VnGDn0mcjyahteJ5ckrR25E9/rHVYpgAR5dSpZrnW+dZfhwXjIr1gViVcX XOlzzPcT8V+z+sPK3+QbyKMdcqfOkHNjlIih31F2sOu7AZFG+CvG8PKu9CJ12hRqDPiH nxKUgeg2oAnwttqJ1rdEP8EemqJXop7h9JOHk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729158175; x=1729762975; 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=bgdGGrdxh1yrmxMi7ELq+GCDozx5PI/JXUv/P9EgGw8=; b=Q69FdJDwtcyVkMQbNo6nrDCbwx+EebMOiqK7NAjsyttzw8bkN+hzmBQSr+gH381Sx/ JMQ49+qN11qwwpTBKEzKEWueExLSL6aUU2+L/hzqeph8lJI0ejU3nFvALLijYsO3tRci P7bpy1U/Nc7RjsAvSiJm9tnx+nBWwpXFuiI/xwgsbYFi15Jay/yj5XMju6EsVdpJDLGc 3aNj2yPMlFbfkC3RX25FCIwkaRm9vFuEkjz9DCsr+xMt/aCObbDoyF/2VJpTW/ENBwax 94YfA5ZTParsHkPUqZv8Qtg25NZ+dzLiGcegp5gmQIJZXj46QlHYNGS+P7ekyuoQtqvW F2NQ== X-Forwarded-Encrypted: i=1; AJvYcCXnvPMe+shdoInZjlysC3F3ET475RSd3XlntkFYiu6itimqrGVUfX4kPbzktAfP6uzt/H1sR9WxoPqi3HE=@vger.kernel.org X-Gm-Message-State: AOJu0YxLfe2BtrXPrEOIEWN/us04Jv0rWPkjftrP/sX8zwnAf7Wr3h5e vXf1PPFSLvChwmYcL/0rwwXway2AGM7Z8dlPvB4IbUQa56j8qviedF1AoSrwLQ== X-Google-Smtp-Source: AGHT+IHVU8qRS0FvlAaYy1P680aH2xlYaVBdegJzFVdyqHN/XTuDFiVaYaam7IEGx7XhiQ/wL2kUcA== X-Received: by 2002:a17:902:e80d:b0:206:c486:4c4c with SMTP id d9443c01a7336-20cbb2abe0dmr282504325ad.57.1729158174895; Thu, 17 Oct 2024 02:42:54 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:fabb:a7ab:3d7:9aaa]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20d17f87ccasm40638655ad.62.2024.10.17.02.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2024 02:42:54 -0700 (PDT) From: Chen-Yu Tsai To: Rob Herring , Saravana Kannan , Matthias Brugger , AngeloGioacchino Del Regno , Wolfram Sang , Benson Leung , Tzung-Bi Shih Cc: Chen-Yu Tsai , chrome-platform@lists.linux.dev, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Douglas Anderson , Johan Hovold , Jiri Kosina , Andy Shevchenko , linux-i2c@vger.kernel.org Subject: [PATCH v9 7/7] arm64: dts: mediatek: mt8173-elm-hana: Mark touchscreens and trackpads as fail Date: Thu, 17 Oct 2024 17:34:42 +0800 Message-ID: <20241017094222.1014936-8-wenst@chromium.org> X-Mailer: git-send-email 2.47.0.rc1.288.g06298d1525-goog In-Reply-To: <20241017094222.1014936-1-wenst@chromium.org> References: <20241017094222.1014936-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Instead of having them all available, 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. Signed-off-by: Chen-Yu Tsai --- Changes since v7: - Mark touchscreen@40 as "fail-needs-probe" as well Changes since v6: none Changes since v5: none Changes since v4: - Rebased Changes since v3: - Also remove second source workaround, i.e. move the interrupt line pinctrl entry from the i2c node back to the components. Changes since v2: - Drop class from status --- arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi | 14 ++++++++++++++ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi b/arch/arm64= /boot/dts/mediatek/mt8173-elm-hana.dtsi index e03474702cad..d9abd68da369 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi @@ -14,6 +14,7 @@ touchscreen2: touchscreen@34 { compatible =3D "melfas,mip4_ts"; reg =3D <0x34>; interrupts-extended =3D <&pio 88 IRQ_TYPE_LEVEL_LOW>; + status =3D "fail-needs-probe"; }; =20 /* @@ -26,6 +27,7 @@ touchscreen3: touchscreen@20 { reg =3D <0x20>; hid-descr-addr =3D <0x0020>; interrupts-extended =3D <&pio 88 IRQ_TYPE_LEVEL_LOW>; + status =3D "fail-needs-probe"; }; =20 /* Lenovo Ideapad C330 uses G2Touch touchscreen as a 2nd source touchscre= en */ @@ -35,6 +37,7 @@ touchscreen@40 { hid-descr-addr =3D <0x0001>; interrupt-parent =3D <&pio>; interrupts =3D <88 IRQ_TYPE_LEVEL_LOW>; + status =3D "fail-needs-probe"; }; }; =20 @@ -47,6 +50,8 @@ &i2c4 { trackpad2: trackpad@2c { compatible =3D "hid-over-i2c"; interrupts-extended =3D <&pio 117 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&trackpad_irq>; reg =3D <0x2c>; hid-descr-addr =3D <0x0020>; /* @@ -56,6 +61,7 @@ trackpad2: trackpad@2c { /* post-power-on-delay-ms =3D <100>; */ vdd-supply =3D <&mt6397_vgp6_reg>; wakeup-source; + status =3D "fail-needs-probe"; }; }; =20 @@ -80,3 +86,11 @@ pins_wp { }; }; }; + +&touchscreen { + status =3D "fail-needs-probe"; +}; + +&trackpad { + status =3D "fail-needs-probe"; +}; diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot= /dts/mediatek/mt8173-elm.dtsi index b4d85147b77b..eee64461421f 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi @@ -358,12 +358,12 @@ touchscreen: touchscreen@10 { &i2c4 { clock-frequency =3D <400000>; status =3D "okay"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&trackpad_irq>; =20 trackpad: trackpad@15 { compatible =3D "elan,ekth3000"; interrupts-extended =3D <&pio 117 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&trackpad_irq>; reg =3D <0x15>; vcc-supply =3D <&mt6397_vgp6_reg>; wakeup-source; --=20 2.47.0.rc1.288.g06298d1525-goog