From patchwork Wed Jan 24 14:13:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiago De Franco X-Patchwork-Id: 13529272 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65F6BC47422 for ; Wed, 24 Jan 2024 14:21:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=L4DT06gygQFSISeaYX3g04tfHAQdVVYp4otpYxsdqQM=; b=zwmnhQk7s2pwrO y5j7/Fb+0Jz8eIb4l5pdBFwoIkEQlJ/vkE74ut4sK44UATBj4/3J8Ky56OZmaX6PpMtro6d6Ac2/j KcsDaCi1sK5zaw9ocDmnss0cmCF252VPlA4oUvAdlka+bqf2b+LG11y+6z3mktMF8CB47cN2bbnQN OOqtWRQsx+BsIXJisBhUyxNVsZdPgwmQC6+nOgfpwrZKizMaultO1muf+zWyxDJCZx/mZKoTgDKuk Hmr2sWVLTnn+4YK+yV9Esy4Zp1I2pJV7R/E4poQEpBgYBzl3K9bLdVhf7jJSmagMNBHPoebRZ3QTS gFK/jT1kV4OOe81/0LgA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSe82-003dAJ-0q; Wed, 24 Jan 2024 14:21:22 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSe7w-003d7z-1t for linux-arm-kernel@lists.infradead.org; Wed, 24 Jan 2024 14:21:17 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6ddc1fad6ddso150641b3a.0 for ; Wed, 24 Jan 2024 06:21:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706106073; x=1706710873; darn=lists.infradead.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=BxGn4WrOc3WFp6MYbJqTJXsjcKBvR5o5znq5DWwx5UA=; b=b/Lzc4afroPr364z0XL4c/1zi0+DekfL4sEh+HIdBSztg0VuIRS18pZPGr9ISu4303 ZP7762gFm6s1JdFpFzeInp/SuTSrSjshiG4V6tPQsseRmgorPpTsh5TXVZ3QPQbtcSX3 NMb9oGIYEJJ3LTwbZsoGX6enfOG9tLQqMUtKnmUll3fTXVDwhN3nSf8K89FDmbElZpBr LivPUVfgNjymwSQ70x6xgmAddMz7pY6xh2lCRMXoJLENaUqGmgc483/wSXZ5Xmx2+eFD kyVQl8IxZS4ndlPctjmgLgOF28zSac36TjT3shTSCy46hSnAo++B5t8zGXqp68s31CPM GbkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706106073; x=1706710873; 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=BxGn4WrOc3WFp6MYbJqTJXsjcKBvR5o5znq5DWwx5UA=; b=hvbzKp2r6TyudCck7lkW0mwyfgLyMfxUV1N/FsbpWcU20dkwU34j/jb3gS/www5ZmE 7LUYgZw4S0UxSPcYnxVHcCvnrvd/r84iWQ6UqYwOpoNCfsYCaU28phGYhdkfp7wqTlZa xq/9BuYU4qJ43ieiqymu1nWvUR1nMI+ac+IoREyYnPeJw/NatpTgQNNagu/saR2S6fFL IA8eBxPTiKcuiYi9zzxwqh4ThUm1iElAMleOfKuzutqUBHSnHTCIi5HVbRZZPPw4FlU/ PDb+MHd9gisA46V6ZKZ0D2DJR8HHhaXDKahJL5ixPMuQOmtYcKJrQ85leaMl8K3XjAR6 OUQA== X-Gm-Message-State: AOJu0Yzd6zc34QfdC3ZFmyHOSIeaX+2K7umnwiIU4tfMZLaSconjOzlv sy9wfMyA6k6OOtKMCMNPQar9X2MbNjuIFcylDe6/U/RIkuhgsolF X-Google-Smtp-Source: AGHT+IHwIDMmzpSMkdEfZFwyWdQwhHw0Q1OyZEVHtzQo9az46wLsyMLAPk6CMSCVIkspAIpcpeUzUw== X-Received: by 2002:a05:6a20:3b28:b0:19c:495e:3c40 with SMTP id c40-20020a056a203b2800b0019c495e3c40mr692199pzh.124.1706106073430; Wed, 24 Jan 2024 06:21:13 -0800 (PST) Received: from hdebian.corp.toradex.com ([201.82.41.210]) by smtp.gmail.com with ESMTPSA id j2-20020a056a00234200b006ddb77d443asm634848pfj.209.2024.01.24.06.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 06:21:13 -0800 (PST) From: Hiago De Franco To: Shawn Guo , linux-arm-kernel@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Hiago De Franco , Conor Dooley Subject: [PATCH v2 1/2] dt-bindings: arm: fsl: Add toradex,apalis_imx6q-eval-v1.2 board Date: Wed, 24 Jan 2024 11:13:19 -0300 Message-ID: <20240124141849.26254-2-hiagofranco@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124141849.26254-1-hiagofranco@gmail.com> References: <20240124141849.26254-1-hiagofranco@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240124_062116_630966_2F1272AD X-CRM114-Status: GOOD ( 12.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Hiago De Franco Add the toradex,apalis_imx6q-eval-v1.2 compatible string for version 1.2 of the Apalis Evaluation Board. Version v1.2 includes the following changes compared to v1.1: - 8-bit MMC connector replaced with a 4-bit uSD connector. - Audio codec NAU88C22 added. - M24C02 EEPROM i2c added. - MIPI-CSI-2 connector directly to the board added. - PCIe switch PEX8605 removed and PCIe now is routed directly to Mini PCIe connector. - Power measurement IC INA219 added. - Replaced DVI with HDMI connector. - Single-channel USB to UART converter replaced with four-channel USB to UART/JTAG. - Temperature sensor TMP75 added. Please note that version v1.0 (which reached EOL) is compatible with v1.1, therefore toradex,apalis_imx6q-eval compatible string should be used for both v1.0 and v1.1. Acked-by: Conor Dooley Signed-off-by: Hiago De Franco --- v2: - Add Acked-by: Conor Dooley. --- Documentation/devicetree/bindings/arm/fsl.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml index 228dcc5c7d6f..9502a2946071 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -384,7 +384,8 @@ properties: - toradex,apalis_imx6q-ixora # Apalis iMX6Q/D Module on Ixora Carrier Board - toradex,apalis_imx6q-ixora-v1.1 # Apalis iMX6Q/D Module on Ixora V1.1 Carrier Board - toradex,apalis_imx6q-ixora-v1.2 # Apalis iMX6Q/D Module on Ixora V1.2 Carrier Board - - toradex,apalis_imx6q-eval # Apalis iMX6Q/D Module on Apalis Evaluation Board + - toradex,apalis_imx6q-eval # Apalis iMX6Q/D Module on Apalis Evaluation Board v1.0/v1.1 + - toradex,apalis_imx6q-eval-v1.2 # Apalis iMX6Q/D Module on Apalis Evaluation Board v1.2 - const: toradex,apalis_imx6q - const: fsl,imx6q From patchwork Wed Jan 24 14:13:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiago De Franco X-Patchwork-Id: 13529273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E87F4C47422 for ; Wed, 24 Jan 2024 14:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nrGS/hSflfDhQxyBtESM/McTgzJqKb7hOsCjvPJw42I=; b=vj9tMV8FRCVzE9 uSeYHzP2L88FZHTJH9rX/pPFKV9JbiN+102JCz5dWKFgYkpWzemEqpv05iTUqaHZD4s2YMolZl7hr yQBVupVP1QybiegXIP2xeZCvOvRjIvK4cDE1J90MAe7vs1iaMwBtCDwK4WNFiUdfFt+snldBToZwR MQNT+EIQ40KpO1K1Vdn/8br9hp1OywZxDxZtjwlN7qPpkcdLK9z5lLC4qkrjKTVhSzXgxlObP7a/B rGmnEEuGzfBt4oSAHmODrPGzmR0Iujo6DTItmCb7hUfu9KTU9wYhQw74ruHFE/W1+00Qx8rzDjob6 bLA+ZzmgSQSF1hyNvjlg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSe88-003dDm-31; Wed, 24 Jan 2024 14:21:28 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSe80-003d9S-0W for linux-arm-kernel@lists.infradead.org; Wed, 24 Jan 2024 14:21:22 +0000 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6dd9f9b167bso390227b3a.2 for ; Wed, 24 Jan 2024 06:21:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706106077; x=1706710877; darn=lists.infradead.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=6utO0mRDw+h2xWav7x1F8anfATar00nWOKSWXyI+54s=; b=AcSEn97RFFjxfQ4oWDDY3c1Pc0T3Ohu1/1EeFo9m33RoO/bwwkb04YDFIU6TdCd+kk Km+pEcXR1aVni2OKMbiBq6M4T6NIPcwmpfnMqRAp/EQf2UM8QLJEFMsi6rFObNHltZsA svTnTLcDiIUjVFlVqSuEwoqnHFJlzbLBv0V02lDxOQ2ko67KC/PtaYF+IooOpHH6krcW zGJVhJ42vTUdIKeexNosfg/ayIazBtIYpU5xPOwZJUhVoGc5e4o3XNgKcdOL4IwA38BZ FAtkw2Ho+aAKaJLcRNvmWHFUzZRUX5yhW7M0DR1F4ce0WaMg1kdwfe5ZF/rk89F3ISAl V/Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706106077; x=1706710877; 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=6utO0mRDw+h2xWav7x1F8anfATar00nWOKSWXyI+54s=; b=galv2nzk6EyWbdesRQYrgBGxaXCUyyR0ymzUU35URWWz0XJbyufNONJYLJ2w9blGqx SK3NKq4BlZq/wKY2WrTPX/N3J3+YtxfQ9Ve50nUZNjHEl8RZPp4oue2PRQaN3rEppE4v bkbTaWFujUkX6rOadRQToLxJ/n6CyAAIgwc7yDyzpV+ZJ+7JOCEdwyhQGNypGXGrI8pA pz6AxNx6+nQ8YPsXDlEYaFPm4KgQ2KpM4z30iknP8WjDOZ5EBKGvtWIRA3ffHXdKgTuv hxDOuaWg9d9YDIFkH38lXTE3mO4xAcwCspuYLWHvo5oDdBU5yLy1jBCdlZcPM8lKx4jr SwMA== X-Gm-Message-State: AOJu0YyDFHP4/6Ovg0W8GJHPFugFqFIFanroU8WjwvNd2+I5hGWEVNNJ OcjDq+atdSGNJ77tX74Is2Q5VZ9wLNB0dLUivjZ8P1QPeBVC+Y7PoleVuvaDnz0= X-Google-Smtp-Source: AGHT+IGKDUgZKPbNT0v7HqgvYMdzmiKPjJJoYDMFIBaHZPe9DBv4XWKDNRBKQaJEwFeCg7f0Sq8vvg== X-Received: by 2002:a05:6a00:3926:b0:6db:cd50:a552 with SMTP id fh38-20020a056a00392600b006dbcd50a552mr5591372pfb.12.1706106077013; Wed, 24 Jan 2024 06:21:17 -0800 (PST) Received: from hdebian.corp.toradex.com ([201.82.41.210]) by smtp.gmail.com with ESMTPSA id j2-20020a056a00234200b006ddb77d443asm634848pfj.209.2024.01.24.06.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 06:21:16 -0800 (PST) From: Hiago De Franco To: Shawn Guo , linux-arm-kernel@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Hiago De Franco , Francesco Dolcini Subject: [PATCH v2 2/2] arm: dts: nxp: imx: Add support for Apalis Evaluation Board v1.2 Date: Wed, 24 Jan 2024 11:13:20 -0300 Message-ID: <20240124141849.26254-3-hiagofranco@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124141849.26254-1-hiagofranco@gmail.com> References: <20240124141849.26254-1-hiagofranco@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240124_062120_202366_27A1659B X-CRM114-Status: GOOD ( 19.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Hiago De Franco Add support for the new Apalis Evaluation Board v1.2. Because only the imx6q-apalis-eval.dts was available, the imx6q-apalis-eval.dtsi has been created which has common hardware configurations for v1.0, v1.1 and v1.2. Both imx6q-apalis-eval.dts and imx6q-apalis-eval-v1.2.dts files include imx6q-apalis-eval.dtsi. Versions 1.0 and 1.1 are compatible with each other and should use imx6q-apalis-eval.dts file. Now for v1.2, the new device-tree file should be used. Reviewed-by: Francesco Dolcini Signed-off-by: Hiago De Franco --- v2: - Add missing off-on-delay-us property with 100ms to reg_3v3_mmc and reg_3v3_sd. - Fix startup-delay-us property from 100us (reg_3v3_mmc and reg_3v3_sd) and 1ms (reg_can1 and reg_can2) to 10ms. - Fix pinctrl mux from 0xb000 to 0x1b0b0. - Add Reviewed-by: Francesco Dolcini. --- arch/arm/boot/dts/nxp/imx/Makefile | 1 + .../dts/nxp/imx/imx6q-apalis-eval-v1.2.dts | 200 ++++++++++++++++++ .../boot/dts/nxp/imx/imx6q-apalis-eval.dts | 108 +--------- .../boot/dts/nxp/imx/imx6q-apalis-eval.dtsi | 120 +++++++++++ 4 files changed, 323 insertions(+), 106 deletions(-) create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval-v1.2.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi diff --git a/arch/arm/boot/dts/nxp/imx/Makefile b/arch/arm/boot/dts/nxp/imx/Makefile index a724d1a7a9a0..0473f9b86ec7 100644 --- a/arch/arm/boot/dts/nxp/imx/Makefile +++ b/arch/arm/boot/dts/nxp/imx/Makefile @@ -147,6 +147,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-yapp4-phoenix.dtb \ imx6dl-yapp4-ursa.dtb \ imx6q-apalis-eval.dtb \ + imx6q-apalis-eval-v1.2.dtb \ imx6q-apalis-ixora.dtb \ imx6q-apalis-ixora-v1.1.dtb \ imx6q-apalis-ixora-v1.2.dtb \ diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval-v1.2.dts b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval-v1.2.dts new file mode 100644 index 000000000000..15d4a98ee976 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval-v1.2.dts @@ -0,0 +1,200 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2024 Toradex + */ + +/dts-v1/; + +#include "imx6q-apalis-eval.dtsi" + +/ { + model = "Toradex Apalis iMX6Q/D Module on Apalis Evaluation Board v1.2"; + compatible = "toradex,apalis_imx6q-eval-v1.2", "toradex,apalis_imx6q", + "fsl,imx6q"; + + reg_3v3_mmc: regulator-3v3-mmc { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 0 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enable_3v3_mmc>; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "3.3V_MMC"; + startup-delay-us = <10000>; + }; + + reg_3v3_sd: regulator-3v3-sd { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 1 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enable_3v3_sd>; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "3.3V_SD"; + startup-delay-us = <10000>; + }; + + reg_can1: regulator-can1 { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enable_can1_power>; + regulator-name = "5V_SW_CAN1"; + startup-delay-us = <10000>; + }; + + reg_can2: regulator-can2 { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enable_can2_power>; + regulator-name = "5V_SW_CAN2"; + startup-delay-us = <10000>; + }; + + sound-carrier { + compatible = "simple-audio-card"; + simple-audio-card,bitclock-master = <&codec_dai>; + simple-audio-card,format = "i2s"; + simple-audio-card,frame-master = <&codec_dai>; + simple-audio-card,name = "apalis-nau8822"; + simple-audio-card,routing = + "Headphones", "LHP", + "Headphones", "RHP", + "Speaker", "LSPK", + "Speaker", "RSPK", + "Line Out", "AUXOUT1", + "Line Out", "AUXOUT2", + "LAUX", "Line In", + "RAUX", "Line In", + "LMICP", "Mic In", + "RMICP", "Mic In"; + simple-audio-card,widgets = + "Headphones", "Headphones", + "Line Out", "Line Out", + "Speaker", "Speaker", + "Microphone", "Mic In", + "Line", "Line In"; + + codec_dai: simple-audio-card,codec { + sound-dai = <&nau8822_1a>; + system-clock-frequency = <12288000>; + }; + + simple-audio-card,cpu { + sound-dai = <&ssi2>; + }; + }; +}; + +&can1 { + xceiver-supply = <®_can1>; + status = "okay"; +}; + +&can2 { + xceiver-supply = <®_can2>; + status = "okay"; +}; + +/* I2C1_SDA/SCL on MXM3 209/211 */ +&i2c1 { + /* Audio Codec */ + nau8822_1a: audio-codec@1a { + compatible = "nuvoton,nau8822"; + reg = <0x1a>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nau8822>; + #sound-dai-cells = <0>; + }; + + /* Current measurement into module VCC */ + hwmon@40 { + compatible = "ti,ina219"; + reg = <0x40>; + shunt-resistor = <5000>; + }; + + /* Temperature Sensor */ + temperature-sensor@4f { + compatible = "ti,tmp75c"; + reg = <0x4f>; + }; + + /* EEPROM */ + eeprom@57 { + compatible = "st,24c02", "atmel,24c02"; + reg = <0x57>; + pagesize = <16>; + size = <256>; + }; +}; + +&pcie { + status = "okay"; +}; + +&ssi2 { + status = "okay"; +}; + +/* MMC1 */ +&usdhc1 { + bus-width = <4>; + pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; + vmmc-supply = <®_3v3_mmc>; + status = "okay"; +}; + +/* SD1 */ +&usdhc2 { + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>; + vmmc-supply = <®_3v3_sd>; + status = "okay"; +}; + +&iomuxc { + pinctrl_enable_3v3_mmc: enable3v3mmcgrp { + fsl,pins = < + /* MMC1_PWR_CTRL */ + MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x1b0b0 + >; + }; + + pinctrl_enable_3v3_sd: enable3v3sdgrp { + fsl,pins = < + /* SD1_PWR_CTRL */ + MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0 + >; + }; + + pinctrl_enable_can1_power: enablecan1powergrp { + fsl,pins = < + /* CAN1_PWR_EN */ + MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 + >; + }; + + pinctrl_enable_can2_power: enablecan2powergrp { + fsl,pins = < + /* CAN2_PWR_EN */ + MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0 + >; + }; + + pinctrl_nau8822: nau8822grp { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT16__AUD5_TXC 0x130b0 + MX6QDL_PAD_DISP0_DAT17__AUD5_TXD 0x130b0 + MX6QDL_PAD_DISP0_DAT18__AUD5_TXFS 0x130b0 + MX6QDL_PAD_DISP0_DAT19__AUD5_RXD 0x130b0 + >; + }; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dts b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dts index 3fc079dfd61e..e1077e2da5f4 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dts @@ -7,29 +7,13 @@ /dts-v1/; -#include -#include -#include -#include "imx6q.dtsi" -#include "imx6qdl-apalis.dtsi" +#include "imx6q-apalis-eval.dtsi" / { model = "Toradex Apalis iMX6Q/D Module on Apalis Evaluation Board"; compatible = "toradex,apalis_imx6q-eval", "toradex,apalis_imx6q", "fsl,imx6q"; - aliases { - i2c0 = &i2c1; - i2c1 = &i2c3; - i2c2 = &i2c2; - rtc0 = &rtc_i2c; - rtc1 = &snvs_rtc; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - reg_pcie_switch: regulator-pcie-switch { compatible = "regulator-fixed"; enable-active-high; @@ -40,14 +24,6 @@ reg_pcie_switch: regulator-pcie-switch { startup-delay-us = <100000>; status = "okay"; }; - - reg_3v3_sw: regulator-3v3-sw { - compatible = "regulator-fixed"; - regulator-always-on; - regulator-max-microvolt = <3300000>; - regulator-min-microvolt = <3300000>; - regulator-name = "3.3V_SW"; - }; }; &can1 { @@ -62,102 +38,22 @@ &can2 { /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ &i2c1 { - status = "okay"; - + /* PCIe Switch */ pcie-switch@58 { compatible = "plx,pex8605"; reg = <0x58>; }; - - /* M41T0M6 real time clock on carrier board */ - rtc_i2c: rtc@68 { - compatible = "st,m41t0"; - reg = <0x68>; - }; -}; - -/* - * I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor on carrier - * board) - */ -&i2c3 { - status = "okay"; }; &pcie { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_reset_moci>; - /* active-high meaning opposite of regular PERST# active-low polarity */ - reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>; - reset-gpio-active-high; vpcie-supply = <®_pcie_switch>; status = "okay"; }; -&pwm1 { - status = "okay"; -}; - -&pwm2 { - status = "okay"; -}; - -&pwm3 { - status = "okay"; -}; - -&pwm4 { - status = "okay"; -}; - -®_usb_host_vbus { - status = "okay"; -}; - -®_usb_otg_vbus { - status = "okay"; -}; - -&sata { - status = "okay"; -}; - &sound_spdif { status = "okay"; }; -&spdif { - status = "okay"; -}; - -&uart1 { - status = "okay"; -}; - -&uart2 { - status = "okay"; -}; - -&uart4 { - status = "okay"; -}; - -&uart5 { - status = "okay"; -}; - -&usbh1 { - disable-over-current; - vbus-supply = <®_usb_host_vbus>; - status = "okay"; -}; - -&usbotg { - disable-over-current; - vbus-supply = <®_usb_otg_vbus>; - status = "okay"; -}; - /* MMC1 */ &usdhc1 { status = "okay"; diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi new file mode 100644 index 000000000000..b6c45ad3f430 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi @@ -0,0 +1,120 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2014-2024 Toradex + */ + +#include +#include +#include +#include "imx6q.dtsi" +#include "imx6qdl-apalis.dtsi" + +/ { + aliases { + i2c0 = &i2c1; + i2c1 = &i2c3; + i2c2 = &i2c2; + rtc0 = &rtc_i2c; + rtc1 = &snvs_rtc; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + reg_3v3_sw: regulator-3v3-sw { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "3.3V_SW"; + }; +}; + +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + /* M41T0M6 real time clock on carrier board */ + rtc_i2c: rtc@68 { + compatible = "st,m41t0"; + reg = <0x68>; + }; +}; + +/* + * I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor on carrier + * board) + */ +&i2c3 { + status = "okay"; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reset_moci>; + /* active-high meaning opposite of regular PERST# active-low polarity */ + reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>; + reset-gpio-active-high; +}; + +&pwm1 { + status = "okay"; +}; + +&pwm2 { + status = "okay"; +}; + +&pwm3 { + status = "okay"; +}; + +&pwm4 { + status = "okay"; +}; + +®_usb_host_vbus { + status = "okay"; +}; + +®_usb_otg_vbus { + status = "okay"; +}; + +&sata { + status = "okay"; +}; + +&spdif { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&uart4 { + status = "okay"; +}; + +&uart5 { + status = "okay"; +}; + +&usbh1 { + disable-over-current; + vbus-supply = <®_usb_host_vbus>; + status = "okay"; +}; + +&usbotg { + disable-over-current; + vbus-supply = <®_usb_otg_vbus>; + status = "okay"; +};