From patchwork Thu Feb 27 17:04:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ernest Van Hoecke X-Patchwork-Id: 13994949 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 A846C1BD000 for ; Thu, 27 Feb 2025 17:06:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740675975; cv=none; b=ZO3B35yRyBZuZlx0TOe3GODK86ZfWOSxD5C2bwPXnvfQDxqN4PD6UbGviJWrDq6eAPeYYoQTdsFB6UKP2JHwKM3EpN63Qx+PPwcp58AV8OrUT/8SJzPp00olN05FUGamiaRVJDBsLnKmSgSY0i3JJNmuuSy8QXupGcb9BjNNF5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740675975; c=relaxed/simple; bh=TkEK4S2m3kpoLQQipeT7J847hl/h6o+fCAe8yfTLOfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NBo1A/R149mysivXZZNIYhtho2YSCEfsh7Jx7tlLUO/LqJwbcux7uNqgsKaI13CRS0E+OAJwy+2SwHAn1lRRHcYHU/bnHSxaYmPQ9rrXEEbTcOSGtr9ZUHElhSqUAlbPWQpyJ4PAn+lHZ24O0dT7j/2Ie5XJOAVL/ybfnB4sZBU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=i51zrKXG; arc=none smtp.client-ip=209.85.221.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="i51zrKXG" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-38f406e9f80so978264f8f.2 for ; Thu, 27 Feb 2025 09:06:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740675972; x=1741280772; darn=lists.linux.dev; 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=gO53KeG1WPUYrsia7l0Tb9ExCzbXGMl2yOXGdu7Dqdk=; b=i51zrKXG7j8iLZArniGxAPCJREKxcD30mjMnjGUrGM1jRi23GGcGWHberec4a3wJ/d wxL74JJNtlHXOGkfNntR8AP9Ngmrl5Ebo0QIsm9oAma2ZL2OwxoC42yOyyoqG6sXMmXB Sn+VFmrM/0+3MGBHzEH0xY3CJMSAy+B5adcssphxc7Xn8yBrSI//g3sI8C3ZW8P18SVC JKynVbvGgMTFsn1ZT9MFyiCAGc4e7pi48+o9MUS8m5enf6d6roz9PoPRCcgaERs9ae0L 3gvPVDoCkuKJn3ro9WBdtJMTzAGdnRLXEgtB8/fpBNCTSgHuSr6Jtn8o6SJkM11T/n/r L4ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740675972; x=1741280772; 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=gO53KeG1WPUYrsia7l0Tb9ExCzbXGMl2yOXGdu7Dqdk=; b=RVSGqJJreQVzVW3zq+B1RvIgveizlkS1d9Ea5BDsxMumsb0weTAPM+hAxbuZ9q57iv Mrz4cMavcHDRAaaHEKbYeN1gCHZ6PZv/8qBNFn2AnKvz7XwRfdDhiyx2bELmOWnaW9+D MM3w9pNIX86RpRIePmHc4BZWxAQr5TM2gHNbraNsp74sUSjiPiy+wb37je7ymuMs+jGl PrZfpF2wVJSzVB/7smYJWkw1jxwq1dFBAolUW2WEvugmXols/P7q4BzepEcJ+++Cgmcu K96U4dXLlNkII0XdxHOkjdWrsywMyIg4ROTXOFxTReafQ36tKKtDHWOdvfVPYxmzu3uH pq6A== X-Forwarded-Encrypted: i=1; AJvYcCWoOtG14ZJ11JtmMHenDmTZVRAUsnwgBQpZleQkhN0/0KtYcEiErsc49ml5ZGAO6mqXqak=@lists.linux.dev X-Gm-Message-State: AOJu0Yzs7x6oWwqvMeVZM8lDw7mk091wHDYjaDrAsozPspu5T3CHJwv/ w0tH4PtMOlldID+9I/mNtonKVDtI8RSly7CDiwezP2PBcmzXoXgC X-Gm-Gg: ASbGncvkyq6BToht9cW1G+vztINrR8nQHCAglviM7t73ehOf4d3Rm4OlEiUpNvNV8LK 7I9hv0fm99n9unMeP90CwLP+7PrxAvr2KStPEPFbO+uVxSZs/Wid1vItc1wHr4+0B0jIyRQNs15 0EQHkWT634u0XmTgs8KNxTDWOgGQlbjUY/B5O2KYNJ6smkavSFZO+57StlZ0S4+Q3fbYyj1J0n0 q28MyLHcJ5gI4oYVotWb4zOvdnDfdPpVS/HDigAxoGfHWXHoDrnqmP/TGAifEdOE9kSAOIksFdM TL7gityOiUwEoWLbmT3ymrzz6+4CWwXD/BCvOO1AZqo/YToo4T8nKQbCAPGj6DgYyAAypJhUF3/ uwxRr X-Google-Smtp-Source: AGHT+IERDIu0iZ+hBFIiIkbbbpaVVGZ6G37IX9OWfYQr1SknQHLsuZbyaI8TcO5g3Sxx15wY0R6sRw== X-Received: by 2002:a5d:47c4:0:b0:390:e311:a8c7 with SMTP id ffacd0b85a97d-390e311acb3mr3600237f8f.5.1740675971592; Thu, 27 Feb 2025 09:06:11 -0800 (PST) Received: from ernest.corp.toradex.com (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e485dbe7sm2613138f8f.93.2025.02.27.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 09:06:11 -0800 (PST) From: Ernest Van Hoecke X-Google-Original-From: Ernest Van Hoecke To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: Ernest Van Hoecke , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ARM: dts: apalis/colibri-imx6: Enable STMPE811 TS Date: Thu, 27 Feb 2025 18:04:52 +0100 Message-ID: <20250227170556.589668-2-ernest.vanhoecke@toradex.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250227170556.589668-1-ernest.vanhoecke@toradex.com> References: <20250227170556.589668-1-ernest.vanhoecke@toradex.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Enable the STMPE811 touchscreen in the SOM dtsi files. The STMPE811 is part of the SOM. It's self contained within it, therefore, disabling it is not the correct default behavior. Signed-off-by: Ernest Van Hoecke Reviewed-by: Francesco Dolcini --- arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 1 - arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi index dffab5aa8b9c..23913f18586c 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi @@ -664,7 +664,6 @@ stmpe_ts: stmpe_touchscreen { st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; - status = "disabled"; }; stmpe_adc: stmpe_adc { diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi index 9f33419c260b..9a9f9764dc65 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi @@ -588,7 +588,6 @@ stmpe_ts: stmpe_touchscreen { st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; - status = "disabled"; }; stmpe_adc: stmpe_adc { From patchwork Thu Feb 27 17:04:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ernest Van Hoecke X-Patchwork-Id: 13994950 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 716861D5AD3 for ; Thu, 27 Feb 2025 17:06:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740675976; cv=none; b=jOsguDp+NEpEdXwiIsssXS+VgNcMYWEVjrc0Q/z1Im9kKT/iF51jGo/qTs3h4hvMS5EyfAPW7xDO6W4XyvB7OE/MZEC2nEdCz3cTTUXmIhyMKzMfcVMIweCxrh9fRpWvOnlr8pdh+F4IzTPXZCgphfefdVOgz4yn/3TAqMitG+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740675976; c=relaxed/simple; bh=TAnqKm978WmKQiBBOY5vk3Al1dmAZdwFyuzuE1ROnQ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q/w5oPI2M8rdFecYLazo/0wRxcD2NgwPO4FVRuyX6ymYzw3n/Ck9KMrK97MZMVm0LQguRYYT/R0tG/lN/Y0LAcWdCAZtDbY5rw9zGAAoeLGTDpOxJUcyAsYlsFAixcR5HHs+z0uE6m5ftBBVSiDOr7NUXyib0oeY/weatcGwtmo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=g+TS59fT; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g+TS59fT" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-439a1e8ba83so12092135e9.3 for ; Thu, 27 Feb 2025 09:06:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740675973; x=1741280773; darn=lists.linux.dev; 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=ZDITHZykvJgRGx/AG29j6F4v8cMHufXuXntyHw4dwLA=; b=g+TS59fTxZCOKNZ1WVEp1MTq1s/s587co6ziRgKaRE/4NnMYEwjG4ChDG6i5fmCNJA r0YTVlEYO3mD0jxHaG4kl+RwDcm6/NmJxUX2Ez+i6WMb93S50ysdai5mD+xHpf1jbWSN VxwJ0Zs3sV7Jhj0qAVCQL6kOBDKbvSAfPfumuWogz0swlmTHsgY6INAsxPZ0l1NfaVNG 5wguI0ApIw0uv+3mLiV12lMFnxNk18XcAURGoTAmzDFOFkgyqfm+aTzYL+53aMtH2Fg7 DS0j9kSJvZQZcHLagGFVpTWpj2Zdj7ugS9wdYn7ELGHwDUOcf5lUOZprG+eib9/GhSWu HuPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740675973; x=1741280773; 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=ZDITHZykvJgRGx/AG29j6F4v8cMHufXuXntyHw4dwLA=; b=G03PH3jqenne/bKYAkQjDCOUWQ0V572eLeuWs5h/RJ5R8mF0ZQmlztAVN1XXNKPFO2 RCUyu7GiFkUmA1u6GELIUjz7CfJOjRpeKxNjYR7eMSFKMuqY2k0t/25VCkecJWTqjmsm a+4IpaafuRga/ApE4SaFluhDoXF6gHzghOFg7YZk9egJE6y1DfVTaf5/AADiQB96tDeD gZLL2EUNQ5cKMfk9JgOlDGWIumO4LCenNvSEdaky2Y9TvcipH66OZv/zd12bgaIAmk+T jwPGhsEayvh8hpzyoY0mH0HY8KOcjpjd9UN5NcT2r7gimNr0OmGdGZ2ao3L2Rjx1k0ev 1fzQ== X-Forwarded-Encrypted: i=1; AJvYcCUVXqDV12Qto6oyoqlb3UxEsXWRGSSgY7Xm6q7xgVwyE3brL7LdGyKvALS8pxYot3Woo5E=@lists.linux.dev X-Gm-Message-State: AOJu0YyVkesfmPygYIbJfVY55jzrkDo77dr4WkZ5XEjs9OaAb4EJOfX7 al+GgGSaH+4ouMqbd32rot6gEzwC4lB+Rx+hrjOQx77CGulsgKHM X-Gm-Gg: ASbGncsZpy5daPNOAfq9TnyMKYe1Ilz5+XppmDKR7EAtAO9aOvCnhSl36OuIXqwSdPs V5Z4rYQZfukyP6gIbSQzaZk1dXxDE8RWDoZcIGBg4uo/+7rjEBgTpHvq7KEkqFXzDRR8oq4MADq PHcwyeqQE3zgTKtyoCYNN9qsDOzBcJ7Wg1QbMBBv7eR2qNQoB69O89DBGbRgPYSWKpQTKagTTNZ 43lG1Fr12QQOFKGmbJ0aFyRUGNrYEUDmTIAa4/sBHGVIHhuMvPj5zsCBUGfcro2cCiNos9EidIr jHJV3M+c1vRsmUVBrZK5C1zD737+1pgBjZg0rBzx4J94q1ypap50DX9mqVNqf6u7V/7LODTVdHT uuo6g X-Google-Smtp-Source: AGHT+IHP18MKChfeAp7UDygXb3/Zzoe0rSxaWJhwSK8PncRr8rL+G2mA/AWIG8esd4/iEPPoh//NZQ== X-Received: by 2002:a5d:64e8:0:b0:390:ea4b:ea9 with SMTP id ffacd0b85a97d-390ea4b18afmr1317093f8f.39.1740675972395; Thu, 27 Feb 2025 09:06:12 -0800 (PST) Received: from ernest.corp.toradex.com (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e485dbe7sm2613138f8f.93.2025.02.27.09.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 09:06:12 -0800 (PST) From: Ernest Van Hoecke X-Google-Original-From: Ernest Van Hoecke To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: Ernest Van Hoecke , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ARM: dts: apalis/colibri-imx6: Add support for v1.2 Date: Thu, 27 Feb 2025 18:04:53 +0100 Message-ID: <20250227170556.589668-3-ernest.vanhoecke@toradex.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250227170556.589668-1-ernest.vanhoecke@toradex.com> References: <20250227170556.589668-1-ernest.vanhoecke@toradex.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Apalis/Colibri iMX6 V1.2 replaced the STMPE811 ADC/touch controller, which is EOL, with the TLA2024 ADC and AD7879 touch controller. Accurately describe the new hardware. v1.1 of these SoMs is still described by the following DTSI files: imx6qdl-apalis.dtsi imx6qdl-colibri.dtsi v1.2 is now supported by a DTSI that modifies v1.1: imx6qdl-apalis-v1.2.dtsi imx6qdl-colibri-v1.2.dtsi For each carrier board using these modules, a new DTS file was added that includes the v1.1 DTS and modifies it with this v1.2 DTSI. The original DTS can be used for modules up to and including v1.1. Signed-off-by: Ernest Van Hoecke Reviewed-by: Francesco Dolcini --- arch/arm/boot/dts/nxp/imx/Makefile | 9 +++ .../dts/nxp/imx/imx6dl-colibri-v1.2-aster.dts | 11 ++++ .../nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts | 11 ++++ .../nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts | 11 ++++ .../dts/nxp/imx/imx6dl-colibri-v1.2-iris.dts | 11 ++++ .../nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts | 11 ++++ .../dts/nxp/imx/imx6q-apalis-v1.2-eval.dts | 11 ++++ .../nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts | 11 ++++ .../nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts | 11 ++++ .../dts/nxp/imx/imx6q-apalis-v1.2-ixora.dts | 11 ++++ .../boot/dts/nxp/imx/imx6qdl-apalis-v1.2.dtsi | 57 +++++++++++++++++++ .../dts/nxp/imx/imx6qdl-colibri-v1.2.dtsi | 57 +++++++++++++++++++ 12 files changed, 222 insertions(+) create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-aster.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-apalis-v1.2.dtsi create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-colibri-v1.2.dtsi diff --git a/arch/arm/boot/dts/nxp/imx/Makefile b/arch/arm/boot/dts/nxp/imx/Makefile index 39a153536d2a..81b6a96e28da 100644 --- a/arch/arm/boot/dts/nxp/imx/Makefile +++ b/arch/arm/boot/dts/nxp/imx/Makefile @@ -69,6 +69,10 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-colibri-eval-v3.dtb \ imx6dl-colibri-iris.dtb \ imx6dl-colibri-iris-v2.dtb \ + imx6dl-colibri-v1.2-aster.dtb \ + imx6dl-colibri-v1.2-eval-v3.dtb \ + imx6dl-colibri-v1.2-iris.dtb \ + imx6dl-colibri-v1.2-iris-v2.dtb \ imx6dl-cubox-i.dtb \ imx6dl-cubox-i-emmc-som-v15.dtb \ imx6dl-cubox-i-som-v15.dtb \ @@ -158,6 +162,11 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-apalis-ixora.dtb \ imx6q-apalis-ixora-v1.1.dtb \ imx6q-apalis-ixora-v1.2.dtb \ + imx6q-apalis-v1.2-eval.dtb \ + imx6q-apalis-v1.2-eval-v1.2.dtb \ + imx6q-apalis-v1.2-ixora.dtb \ + imx6q-apalis-v1.2-ixora-v1.1.dtb \ + imx6q-apalis-v1.2-ixora-v1.2.dtb \ imx6q-apf6dev.dtb \ imx6q-arm2.dtb \ imx6q-b450v3.dtb \ diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-aster.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-aster.dts new file mode 100644 index 000000000000..44c78c07f431 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-aster.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +/dts-v1/; + +#include "imx6dl-colibri-aster.dts" +#include "imx6qdl-colibri-v1.2.dtsi" + +/ { + model = "Toradex Colibri iMX6DL/S V1.2+ on Colibri Aster Board"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts new file mode 100644 index 000000000000..93fd0af53a3c --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +/dts-v1/; + +#include "imx6dl-colibri-eval-v3.dts" +#include "imx6qdl-colibri-v1.2.dtsi" + +/ { + model = "Toradex Colibri iMX6DL/S V1.2+ on Colibri Evaluation Board V3"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts new file mode 100644 index 000000000000..92d41fc9a13f --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +/dts-v1/; + +#include "imx6dl-colibri-iris-v2.dts" +#include "imx6qdl-colibri-v1.2.dtsi" + +/ { + model = "Toradex Colibri iMX6DL/S V1.2+ on Colibri Iris V2 Board"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris.dts new file mode 100644 index 000000000000..c8957948c887 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +/dts-v1/; + +#include "imx6dl-colibri-iris.dts" +#include "imx6qdl-colibri-v1.2.dtsi" + +/ { + model = "Toradex Colibri iMX6DL/S V1.2+ on Colibri Iris Board"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts new file mode 100644 index 000000000000..908dab57fd87 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +/dts-v1/; + +#include "imx6q-apalis-eval-v1.2.dts" +#include "imx6qdl-apalis-v1.2.dtsi" + +/ { + model = "Toradex Apalis iMX6Q/D Module V1.2+ on Apalis Evaluation Board v1.2"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval.dts b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval.dts new file mode 100644 index 000000000000..5463d4127382 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +/dts-v1/; + +#include "imx6q-apalis-eval.dts" +#include "imx6qdl-apalis-v1.2.dtsi" + +/ { + model = "Toradex Apalis iMX6Q/D Module V1.2+ on Apalis Evaluation Board"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts new file mode 100644 index 000000000000..84eabf81ba84 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +/dts-v1/; + +#include "imx6q-apalis-ixora-v1.1.dts" +#include "imx6qdl-apalis-v1.2.dtsi" + +/ { + model = "Toradex Apalis iMX6Q/D Module V1.2+ on Ixora Carrier Board V1.1"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts new file mode 100644 index 000000000000..d7cfab4de457 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +/dts-v1/; + +#include "imx6q-apalis-ixora-v1.2.dts" +#include "imx6qdl-apalis-v1.2.dtsi" + +/ { + model = "Toradex Apalis iMX6Q/D Module V1.2+ on Ixora Carrier Board V1.2"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora.dts b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora.dts new file mode 100644 index 000000000000..189b074e31ce --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +/dts-v1/; + +#include "imx6q-apalis-ixora.dts" +#include "imx6qdl-apalis-v1.2.dtsi" + +/ { + model = "Toradex Apalis iMX6Q/D Module V1.2+ on Ixora Carrier Board"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis-v1.2.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis-v1.2.dtsi new file mode 100644 index 000000000000..83fa04fc9f18 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis-v1.2.dtsi @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +&i2c2 { + /delete-node/ stmpe811@41; + + ad7879_ts: touchscreen@2c { + compatible = "adi,ad7879-1"; + reg = <0x2c>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_touch_int>; + interrupts = <10 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent = <&gpio4>; + touchscreen-max-pressure = <4096>; + adi,resistance-plate-x = <120>; + adi,first-conversion-delay = /bits/ 8 <3>; + adi,acquisition-time = /bits/ 8 <1>; + adi,median-filter-size = /bits/ 8 <2>; + adi,averaging = /bits/ 8 <1>; + adi,conversion-interval = /bits/ 8 <255>; + }; + + tla2024_adc: adc@49 { + compatible = "ti,tla2024"; + reg = <0x49>; + #address-cells = <1>; + #size-cells = <0>; + + /* Apalis AN1_ADC0 */ + channel@4 { + reg = <4>; + ti,datarate = <4>; + ti,gain = <1>; + }; + + /* Apalis AN1_ADC1 */ + channel@5 { + reg = <5>; + ti,datarate = <4>; + ti,gain = <1>; + }; + + /* Apalis AN1_ADC2 */ + channel@6 { + reg = <6>; + ti,datarate = <4>; + ti,gain = <1>; + }; + + /* Apalis AN1_TSWIP_ADC3 */ + channel@7 { + reg = <7>; + ti,datarate = <4>; + ti,gain = <1>; + }; + }; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri-v1.2.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri-v1.2.dtsi new file mode 100644 index 000000000000..d11bf911b728 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri-v1.2.dtsi @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* Copyright (c) 2025 Toradex */ + +&i2c2 { + /delete-node/ stmpe811@41; + + ad7879_ts: touchscreen@2c { + compatible = "adi,ad7879-1"; + reg = <0x2c>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_touch_int>; + interrupts = <20 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent = <&gpio6>; + touchscreen-max-pressure = <4096>; + adi,resistance-plate-x = <120>; + adi,first-conversion-delay = /bits/ 8 <3>; + adi,acquisition-time = /bits/ 8 <1>; + adi,median-filter-size = /bits/ 8 <2>; + adi,averaging = /bits/ 8 <1>; + adi,conversion-interval = /bits/ 8 <255>; + }; + + tla2024_adc: adc@49 { + compatible = "ti,tla2024"; + reg = <0x49>; + #address-cells = <1>; + #size-cells = <0>; + + /* Colibri AIN0 */ + channel@4 { + reg = <4>; + ti,datarate = <4>; + ti,gain = <1>; + }; + + /* Colibri AIN1 */ + channel@5 { + reg = <5>; + ti,datarate = <4>; + ti,gain = <1>; + }; + + /* Colibri AIN2 */ + channel@6 { + reg = <6>; + ti,datarate = <4>; + ti,gain = <1>; + }; + + /* Colibri AIN3 */ + channel@7 { + reg = <7>; + ti,datarate = <4>; + ti,gain = <1>; + }; + }; +};