From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB5D8C433F5 for ; Mon, 16 May 2022 11:59:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243294AbiEPL71 (ORCPT ); Mon, 16 May 2022 07:59:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230080AbiEPL7W (ORCPT ); Mon, 16 May 2022 07:59:22 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AC1A15A0B; Mon, 16 May 2022 04:59:21 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id p26so1751259eds.5; Mon, 16 May 2022 04:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O1BYS9UgVZFFyEZ8wlaCzvbMmLIqMqA+LjVcM1kOh4o=; b=cNQJV+Bs81tLUSH7A4R/Nso8Qnlmlps7sPTj/74fJT7Ex2wxjlHjoZ4ycHtI5X9OKk VSdQj/HodJ66vn35VzMA9/mTsHAWG10IhOipRamiGrGuFRMU9QiJf/o9CmZsu1vKKQXb 5uaB0xmGAwaB9a89o/dT7NYlVeszWou/egVivAlFc8/Qryf2MRx1V2GJQoU8uNMYvNFU pPoGkXS5XUqrYkiuVIr0zTqrNyQKFyiGCgCtOpecAa9H0nS+rIpYJMcG5PpLDoKBe1eE oWblulcouHJ2VpKn32llYcGibqENOHoILKmrYZShFtpsJD1QK/75rFipZQiExBbXZuvs gViA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O1BYS9UgVZFFyEZ8wlaCzvbMmLIqMqA+LjVcM1kOh4o=; b=zpdpHfDkr/VEh1JbBAtjTGFbaHK0rzF0q+IdsmlFhtix0+pjp+IDaYoc85eVQ8h/tH C8u8/UC++WtGMBkSbjInHcvAyzUtKXWJlII3XNV4i/h9+l221Rq92e7hmKkX80BxHp6j 5Cpb0H0pHKNJbVpQ29Lxj6gXITB6/knwAUSKnGqymPhODPvcGJFF+88Dy9r9IAlaJrQq Od9T+7Dpt1kfcVOo/BK1v+H3stI514neyYTpvU+b5qg428CSP+xdddBZ1bHXDC4c4X77 13DB8U6n5gMvDdluLsjv+ahsFj9jgIEldba7tF2BNy1/SnFi8AI8cuL3Tql2Lj3tl3np yvHQ== X-Gm-Message-State: AOAM531ihDM9CFhPlnsoFmMrvDAQqPZ4AdRDjSzcSfQZgQUrd+FjEGOp OyyGLcVgq5Q5V1dHaL+b9Nc= X-Google-Smtp-Source: ABdhPJzg5eVFZfUYNcIyON++UrT9fMivCPU5hqFmSyaJ/kDkchFAcT6BpW1+45v57xquAfSHt6eVKA== X-Received: by 2002:a05:6402:42d4:b0:416:5cac:a9a0 with SMTP id i20-20020a05640242d400b004165caca9a0mr12857396edc.86.1652702359489; Mon, 16 May 2022 04:59:19 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:19 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Alexander Stein , Christoph Niedermaier , Krzysztof Kozlowski , Li Yang , Lucas Stach , Marcel Ziswiler , Matthias Schiffer , Oleksij Rempel , Rob Herring , Sebastian Reichel , Shawn Guo , Tim Harvey , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 01/17] dt-bindings: arm: fsl: Add carrier for toradex,apalis-imx6q Date: Mon, 16 May 2022 13:58:29 +0200 Message-Id: <20220516115846.58328-2-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher Add binding for the Ixora V1.2 carrier board our Apalis iMX6D/Q may be mated with. Signed-off-by: Max Krummenacher Acked-by: Rob Herring --- Documentation/devicetree/bindings/arm/fsl.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation= /devicetree/bindings/arm/fsl.yaml index 08bdd30e511c..eb090372dd23 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -320,6 +320,7 @@ properties: - enum: - 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 - const: toradex,apalis_imx6q - const: fsl,imx6q --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9992AC433EF for ; Mon, 16 May 2022 11:59:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232829AbiEPL7g (ORCPT ); Mon, 16 May 2022 07:59:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243279AbiEPL7X (ORCPT ); Mon, 16 May 2022 07:59:23 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7E7E15A1F; Mon, 16 May 2022 04:59:22 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id y21so17992295edo.2; Mon, 16 May 2022 04:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e5MlAE8SnkTiFChlBdPJSfW3vFLUzMTgpeUilH24TZ4=; b=ifEttzhn6xBuE6SqZ1BK3qusjmqI+ZoFGO6PbHg6FKGnoOUbGbJ6Nbq4gZmliMjlKM HpRfJkGa1R5K6S3Sz+GmcgV0W/omf4So0r+ewX5tPSbrhMFl7cb+/RWY2T1+TpxhtnQD 5wGGauwd6L4pGGlFISSTV2nDDhVWmk62x3YczXn8NX/v+JSF6g4OoaneuS5WIrzd/T1r O8XFt+1fjeXDW6XC9wj2wa4LazRUEtSzoatn7k9cZ/bQUzvOyyI2v8QKz+zSpLpPrFJy /O8q1F3z+qEwiPHsGQHx4C/KLSlhMmNz02xq7hCXVD2TJCBWgyX4gP2SV4Yr188leNbW M3Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e5MlAE8SnkTiFChlBdPJSfW3vFLUzMTgpeUilH24TZ4=; b=b96EmVSFxYqkF8I21FwYnexnA+ZLwEsL8uD1ry1QRVBm7uNpmK/n3VE7u0mgUnPQXM 1aB4AaBX6ThvOKL+tAPmkv+IowGBSFWNLd6uVH90bX4Z2zm738C1cD+xqEl2NRCU4AcW DDmFcjSt2dLN8tlAchlPQfdtLC724A3golf8wvh7kWKho9ahdMbgqguflg3BfrWNHQe1 cYgq+cdfp1GkOLAiRakUYqmgl4WSxtPkjZfQ92WH5QhrgXugYjIQG88XX6Ees8Nwd2H8 cdicj4tpUXW88f9gVbFzwiTfpDTWsjKMZeaXgq1AxxiMvRaPVsKdD5okRzjT3Np9n+0h m9lg== X-Gm-Message-State: AOAM530b4ZBgVcPakI8bCX6ALZ9FU4KyPdmh+24YVgbd21+YK/iZR7aG 1UYgkUPfGEa/hAIcI8DgRSA= X-Google-Smtp-Source: ABdhPJz4tLeGiOn5boAVfBdvy20eNUDuSLC2kPEis33ndo0w+9uFWq0olKNZfF/PXNdVvwI1jFVtVg== X-Received: by 2002:a05:6402:17c1:b0:428:8016:d98d with SMTP id s1-20020a05640217c100b004288016d98dmr12791876edy.5.1652702361288; Mon, 16 May 2022 04:59:21 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:20 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 02/17] Revert "ARM: dts: imx6qdl-apalis: Avoid underscore in node name" Date: Mon, 16 May 2022 13:58:30 +0200 Message-Id: <20220516115846.58328-3-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher The STMPE MFD device binding requires the child node to have a fixed name, i.e. with '_', not '-'. Otherwise the stmpe_adc, stmpe_touchscreen drivers will not be probed. Fixes: 56086b5e804f ("ARM: dts: imx6qdl-apalis: Avoid underscore in node na= me") Signed-off-by: Max Krummenacher Reviewed-by: Ahmad Fatoum --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index bd763bae596b..da919d0544a8 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -315,7 +315,7 @@ /* ADC conversion time: 80 clocks */ st,sample-time =3D <4>; =20 - stmpe_touchscreen: stmpe-touchscreen { + stmpe_touchscreen: stmpe_touchscreen { compatible =3D "st,stmpe-ts"; /* 8 sample average control */ st,ave-ctrl =3D <3>; @@ -332,7 +332,7 @@ st,touch-det-delay =3D <5>; }; =20 - stmpe_adc: stmpe-adc { + stmpe_adc: stmpe_adc { compatible =3D "st,stmpe-adc"; /* forbid to use ADC channels 3-0 (touch) */ st,norequest-mask =3D <0x0F>; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C85AFC433F5 for ; Mon, 16 May 2022 11:59:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243287AbiEPL7m (ORCPT ); Mon, 16 May 2022 07:59:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243282AbiEPL7Z (ORCPT ); Mon, 16 May 2022 07:59:25 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13DF615A2D; Mon, 16 May 2022 04:59:24 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id fd25so5367440edb.3; Mon, 16 May 2022 04:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y6JdWBOFeyMMw2iBqLTjLOG7raGk0JckwGY/WzDd5go=; b=U1gO0n8iTonrVb7p6x+lN4NDxpjrm7HbjBINUn9bMCEotMjj6Nod0nH3R8IHT35io9 4xj5JJt2VNTcCAX6kLTotF7PFk/55xGnWxTsgLa9+vGllxGJ22MW5esjuJYWwkd5VGKY vSC+0wegwUd4BuQOXLKGi1KZrPzx16GlBm9gmybNz7lm6Dy5KJdA1bqIYNQdSRWbl1Qx YVkdOQRL04r8GRsRbG0aFrta56kVllaj839/ManUpGgWK2flp0DOGT3VgJkV0nRLzmqk AMAT/sHoTyepTiW1b3z9zPGt3k4wQ1E8UGdIDMYK7H+Mck7ZH344/7RoUzQ4fUPzAI7J lagw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y6JdWBOFeyMMw2iBqLTjLOG7raGk0JckwGY/WzDd5go=; b=7ZMBzGE9PDTO4neRhqRu4ChHBInec3SVS1nrtMmTcpSuJxE3qdGZxrsQRbd8puw1WE tcnnvK3oCbytVPcR5M3OEa1R7x7Y/Q3diZTRmpkkZARQyTLw3OE7d/XvxayzhKOIpJUe Az0S8Y9iMdxVdZYySUXLqJNxEkCTuUooWWQFWMEepfXt2tuGJHka2ogDrCUfc3axPVh2 s+v5WqUqUSu+O3zCGYVtFwOZjk2yP0LEtANQI98cQOpNuSSJ6hn9P4eLJQVlvibPBIL9 75TS9U0r+dwDPLAvDDdepJDdstwggdhpfz1GABADK0gDfFAD4FCTEAbraJ7iqcI7Mld9 kG1A== X-Gm-Message-State: AOAM5313j3zWqfPecrthYcvVJ7GznKImt78vFQ0wqzh6a9TI41WyzvSn IxndyDyvENWQX4ay0lMMg2A= X-Google-Smtp-Source: ABdhPJzm1oBNCNN5MgwfKo3BaHvqMFSf/kni3zzK323H2ANh2ioEuNI0P3DTutn+5O/rQ6DqMydRig== X-Received: by 2002:aa7:d659:0:b0:42a:b0d5:a64e with SMTP id v25-20020aa7d659000000b0042ab0d5a64emr5133125edr.157.1652702362702; Mon, 16 May 2022 04:59:22 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:22 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 03/17] ARM: dts: imx6q-apalis: Add gpio-line-names Date: Mon, 16 May 2022 13:58:31 +0200 Message-Id: <20220516115846.58328-4-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher Add GPIO line names on module level. Those are all GPIOs which a user might use on his custom carrier board. If more meaningful names are available on the carrier board, the user can overwrite the line names in the carrier board level device tree. Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 193 ++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index da919d0544a8..e56451651a6d 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -141,6 +141,199 @@ status =3D "disabled"; }; =20 +&gpio1 { + gpio-line-names =3D "MXM3_84", + "MXM3_4", + "MXM3_15/GPIO7", + "MXM3_96", + "MXM3_37", + "", + "MXM3_17/GPIO8", + "MXM3_14", + "MXM3_12", + "MXM3_2", + "MXM3_184", + "MXM3_180", + "MXM3_178", + "MXM3_176", + "MXM3_188", + "MXM3_186", + "MXM3_160", + "MXM3_162", + "MXM3_150", + "MXM3_144", + "MXM3_154", + "MXM3_146", + "", + "", + "MXM3_72"; +}; + +&gpio2 { + gpio-line-names =3D "MXM3_148", + "MXM3_152", + "MXM3_156", + "MXM3_158", + "MXM3_1/GPIO1", + "MXM3_3/GPIO2", + "MXM3_5/GPIO3", + "MXM3_7/GPIO4", + "MXM3_95", + "MXM3_6", + "MXM3_8", + "MXM3_123", + "MXM3_126", + "MXM3_128", + "MXM3_130", + "MXM3_132", + "MXM3_253", + "MXM3_251", + "MXM3_283", + "MXM3_281", + "MXM3_279", + "MXM3_277", + "MXM3_243", + "MXM3_235", + "MXM3_231", + "MXM3_229", + "MXM3_233", + "MXM3_198", + "MXM3_275", + "MXM3_273", + "MXM3_207", + "MXM3_122"; +}; + +&gpio3 { + gpio-line-names =3D "MXM3_271", + "MXM3_269", + "MXM3_301", + "MXM3_299", + "MXM3_297", + "MXM3_295", + "MXM3_293", + "MXM3_291", + "MXM3_289", + "MXM3_287", + "MXM3_249", + "MXM3_247", + "MXM3_245", + "MXM3_286", + "MXM3_239", + "MXM3_35", + "MXM3_205", + "MXM3_203", + "MXM3_201", + "MXM3_116", + "MXM3_114", + "MXM3_262", + "MXM3_274", + "MXM3_124", + "MXM3_110", + "MXM3_120", + "MXM3_263", + "MXM3_265", + "", + "MXM3_135", + "MXM3_261", + "MXM3_259"; +}; + +&gpio4 { + gpio-line-names =3D "", + "", + "", + "", + "", + "MXM3_194", + "MXM3_136", + "MXM3_134", + "MXM3_140", + "MXM3_138", + "", + "MXM3_220", + "", + "", + "MXM3_18", + "MXM3_16", + "", + "", + "MXM3_214", + "MXM3_216", + "MXM3_164"; +}; + +&gpio5 { + gpio-line-names =3D "MXM3_159", + "", + "", + "", + "MXM3_257", + "", + "", + "", + "", + "", + "MXM3_200", + "MXM3_196", + "MXM3_204", + "MXM3_202", + "", + "", + "", + "", + "MXM3_191", + "MXM3_197", + "MXM3_77", + "MXM3_195", + "MXM3_221", + "MXM3_225", + "MXM3_223", + "MXM3_227", + "MXM3_209", + "MXM3_211", + "MXM3_118", + "MXM3_112", + "MXM3_187", + "MXM3_185"; +}; + +&gpio6 { + gpio-line-names =3D "MXM3_183", + "MXM3_181", + "MXM3_179", + "MXM3_177", + "MXM3_175", + "MXM3_173", + "MXM3_255", + "MXM3_83", + "MXM3_91", + "MXM3_13/GPIO6", + "MXM3_11/GPIO5", + "MXM3_79", + "", + "", + "MXM3_190", + "MXM3_193", + "MXM3_89"; +}; + +&gpio7 { + gpio-line-names =3D "", + "", + "", + "", + "", + "", + "", + "", + "", + "MXM3_99", + "MXM3_85", + "MXM3_217", + "MXM3_215"; +}; + &fec { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_enet>; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18D7EC433FE for ; Mon, 16 May 2022 11:59:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232452AbiEPL7x (ORCPT ); Mon, 16 May 2022 07:59:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243300AbiEPL7b (ORCPT ); Mon, 16 May 2022 07:59:31 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DF7A15FC2; Mon, 16 May 2022 04:59:25 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id z2so28179109ejj.3; Mon, 16 May 2022 04:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gThDHWbqFCP9qbssdWR/8tkQmg9lvSi8P3DDStpWpd0=; b=TEt+cednHQf4XGucaHpUbUP6tpT44YDZvznSBa2Or8dRdQ+cKl4YLuIlXmnmCSJiNK ypcnB40JSfXoioah4RU3H2Mzdi0z2Fr50pshMwmSdFL/OgXiyM4BN1GXfQb82eJg5VRN 6Tpe/AmWatHltSCB4iaQjLSqGvuwTnfYnPysTYQS0oTIEx6fv/xhU9siTFInUXSBMbSn aNXROk9MAESZvRzgaMcwZfuLFBUEym/gU5DZX/EVRhLgKDbX4V+Piisrx14VaRzhZYFM 5saA2ujhsb8GHsfl8HarkZHO8aLR0Q02FHE9r/opPzJ9J4ShlFN7eiNmS+pqR2aIsNAO oZgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gThDHWbqFCP9qbssdWR/8tkQmg9lvSi8P3DDStpWpd0=; b=4Ho7N4+jvCM/II7wvJOHtJzoj9wkAOugJ1XU+urrUse9/SfapO08EsRh3Ke5NKXhBD gcy2yfRE6QtIY5EWhDA69iWL3BlFuin5VkoLj0Mjq3pkaGjblum8BGl8Psz7kznAEzMP cKjOB3p9bkKl+IGBcaWdgatA9ZbjM+3CY6HgTTDQdBhBpc/DXBe+5tV5BTHycuif2ABA 41jtFdjtC0U+CY3UexnPLZadoXIJd2QOwaiM4H3mrefoGJ9IwpD5pj+VMMxXaacQMHWK YfHsU6EwehcFeQYtXfp5B8t9SfvlPYwleTNAVAJzHab5s91jdCPqKHj3i2zFJkRnmB28 /IQw== X-Gm-Message-State: AOAM530iwnJqnLWx4uPkk9VGaUgNQezmQs6JlffrlvZsav4QPAqYvDOz 8r3gbQa0T3YeSa7Pd2XV7CM= X-Google-Smtp-Source: ABdhPJzBfuv2XyXGJugCPvYCLipwLx8XOgyffkIKDcO9mO6hrNSqRypVFjxhgkTh1s6TdZgYxEJlxg== X-Received: by 2002:a17:907:a429:b0:6fd:da12:eec4 with SMTP id sg41-20020a170907a42900b006fdda12eec4mr14255039ejc.707.1652702364111; Mon, 16 May 2022 04:59:24 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:23 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 04/17] ARM: dts: imx6q-apalis: Command pmic to standby for poweroff Date: Mon, 16 May 2022 13:58:32 +0200 Message-Id: <20220516115846.58328-5-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher The Apalis iMX6 HW doesn't allow to use the PWR_ON_REQ signal for poweroff. Use the fsl,pmic-stby-poweroff property to command the PMIC into a low power mode in poweroff. Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index e56451651a6d..668793356b46 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -125,6 +125,10 @@ status =3D "disabled"; }; =20 +&clks { + fsl,pmic-stby-poweroff; +}; + /* Apalis SPI1 */ &ecspi1 { cs-gpios =3D <&gpio5 25 GPIO_ACTIVE_LOW>; @@ -387,6 +391,7 @@ =20 pmic: pfuze100@8 { compatible =3D "fsl,pfuze100"; + fsl,pmic-stby-poweroff; reg =3D <0x08>; =20 regulators { --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 953A3C433EF for ; Mon, 16 May 2022 11:59:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243310AbiEPL7s (ORCPT ); Mon, 16 May 2022 07:59:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243303AbiEPL7b (ORCPT ); Mon, 16 May 2022 07:59:31 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D24B15A25; Mon, 16 May 2022 04:59:26 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id y21so17992295edo.2; Mon, 16 May 2022 04:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hBQGlCOb9/uG9s6ZXsqustGqFa07ekesI9A1jC1cNws=; b=BlBfIjHqfrvNvI+f/E5QUsRjsOjgOXbAsCoNffZt4ZbnQMaM6vHhAXDX08vZELzlew RkDkf3Bv6Xw0ou/FynKxcUy1CC0AKW86J1OrzfH8VGeVuiOEErMwbvkFVr03iKuGuOjH q+tQESV6mmb+ZIy90Me0Osx0VUJ7NE/iACN4igveA2fy+hBkl/9JbUV3EeqKlo5s/zZr nIvNewaFCADR42AyCdmCg7sGISGzCe+J8U02RNzvAIICzn0qUFr31iXZYxz2QmDIglUP ZbA2B6jF37VLMoYh48nXbBTupYcE1xAe0R7nFQWS6fSA7Ncmdnnnt+LK7DbNMSx5yGfr rZjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hBQGlCOb9/uG9s6ZXsqustGqFa07ekesI9A1jC1cNws=; b=k5Q+2a3ptStLXZnGDXlX5I3iz0lLTk4GwxK2Ilvz3rqSrYgRzdmRx48l906YZZVHFN cVpa5xb2tvCiZi4PwI62kiY8wVL2Mqz1Ri8aNu2VOvMg2VAjN2lr1/rAwbMImql6b/3B JikytsdeVokVBD/uYR6FwBvIxvFJgNOQ0l0PjzQluxpesBylTEUuPJRtAIDCFSSM8iLa SU6+fp/uXhw0dDWcy3eSn7qAFfBoUO30OjFb20cyEv5S2wkxgptV3RbhQd3WgETb6X+j HVjofMbGXNhEf3hH48QYoe+VcRGLn/6km8KG7LFtvceIJxrqMrl6KIMkQ7bXJYTPMmfQ 5Xng== X-Gm-Message-State: AOAM532XPVMc+k7mYxj4HUYDLz4go5wO9y7gZZpkQLVBE67HCnMu13AF gtLfGqv5nFRYlFQImA9U0zg= X-Google-Smtp-Source: ABdhPJwE/XTjNI6hcbUcQDrYV8t2UZTE5vj2IrqNrrM15EDccdBWIwgkpxPPOTmcCLW5siSehUdlMw== X-Received: by 2002:a05:6402:6da:b0:42a:9fe0:fdce with SMTP id n26-20020a05640206da00b0042a9fe0fdcemr9931535edy.172.1652702365592; Mon, 16 May 2022 04:59:25 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:25 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Oleksandr Suvorov , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 05/17] ARM: dts: imx6q-apalis: Move parallel rgb interface to SoM dtsi Date: Mon, 16 May 2022 13:58:33 +0200 Message-Id: <20220516115846.58328-6-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Oleksandr Suvorov Move all Parallel RGB-related nodes to the module level and disable it by default. This allows to enable it in an overlay per the current system configuration. Update SPDX-License spelling to latest convention. Update Copyright year. Signed-off-by: Oleksandr Suvorov Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 57 +------------------ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 55 +----------------- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 55 +----------------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 52 ++++++++++++++++- 4 files changed, 55 insertions(+), 164 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/im= x6q-apalis-eval.dts index a0683b4aeca1..1e6b5482a777 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2014-2020 Toradex + * Copyright 2014-2022 Toradex * Copyright 2012 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. */ @@ -44,48 +44,6 @@ }; }; =20 - lcd_display: disp0 { - compatible =3D "fsl,imx-parallel-display"; - #address-cells =3D <1>; - #size-cells =3D <0>; - interface-pix-fmt =3D "rgb24"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_ipu1_lcdif>; - status =3D "okay"; - - port@0 { - reg =3D <0>; - - lcd_display_in: endpoint { - remote-endpoint =3D <&ipu1_di1_disp1>; - }; - }; - - port@1 { - reg =3D <1>; - - lcd_display_out: endpoint { - remote-endpoint =3D <&lcd_panel_in>; - }; - }; - }; - - panel: panel { - /* - * edt,et057090dhu: EDT 5.7" LCD TFT - * edt,et070080dh6: EDT 7.0" LCD TFT - */ - compatible =3D "edt,et057090dhu"; - backlight =3D <&backlight>; - power-supply =3D <®_3v3_sw>; - - port { - lcd_panel_in: endpoint { - remote-endpoint =3D <&lcd_display_out>; - }; - }; - }; - reg_pcie_switch: regulator-pcie-switch { compatible =3D "regulator-fixed"; regulator-name =3D "pcie_switch"; @@ -106,13 +64,6 @@ }; }; =20 -&backlight { - brightness-levels =3D <0 127 191 223 239 247 251 255>; - default-brightness-level =3D <1>; - power-supply =3D <®_3v3_sw>; - status =3D "okay"; -}; - &can1 { xceiver-supply =3D <®_3v3_sw>; status =3D "okay"; @@ -164,10 +115,6 @@ status =3D "okay"; }; =20 -&ipu1_di1_disp1 { - remote-endpoint =3D <&lcd_display_in>; -}; - &ldb { status =3D "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/= dts/imx6q-apalis-ixora-v1.1.dts index 86e84781cf5d..527585d26e51 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2014-2020 Toradex + * Copyright 2014-2022 Toradex * Copyright 2012 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. */ @@ -45,47 +45,6 @@ }; }; =20 - lcd_display: disp0 { - compatible =3D "fsl,imx-parallel-display"; - #address-cells =3D <1>; - #size-cells =3D <0>; - interface-pix-fmt =3D "rgb24"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_ipu1_lcdif>; - status =3D "okay"; - - port@0 { - reg =3D <0>; - - lcd_display_in: endpoint { - remote-endpoint =3D <&ipu1_di1_disp1>; - }; - }; - - port@1 { - reg =3D <1>; - - lcd_display_out: endpoint { - remote-endpoint =3D <&lcd_panel_in>; - }; - }; - }; - - panel: panel { - /* - * edt,et057090dhu: EDT 5.7" LCD TFT - * edt,et070080dh6: EDT 7.0" LCD TFT - */ - compatible =3D "edt,et057090dhu"; - backlight =3D <&backlight>; - - port { - lcd_panel_in: endpoint { - remote-endpoint =3D <&lcd_display_out>; - }; - }; - }; - leds { compatible =3D "gpio-leds"; =20 @@ -114,12 +73,6 @@ }; }; =20 -&backlight { - brightness-levels =3D <0 127 191 223 239 247 251 255>; - default-brightness-level =3D <1>; - status =3D "okay"; -}; - &can1 { status =3D "okay"; }; @@ -164,10 +117,6 @@ status =3D "okay"; }; =20 -&ipu1_di1_disp1 { - remote-endpoint =3D <&lcd_display_in>; -}; - &ldb { status =3D "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/i= mx6q-apalis-ixora.dts index 62e72773e53b..9900ab04fb28 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2014-2020 Toradex + * Copyright 2014-2022 Toradex * Copyright 2012 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. */ @@ -44,47 +44,6 @@ }; }; =20 - lcd_display: disp0 { - compatible =3D "fsl,imx-parallel-display"; - #address-cells =3D <1>; - #size-cells =3D <0>; - interface-pix-fmt =3D "rgb24"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_ipu1_lcdif>; - status =3D "okay"; - - port@0 { - reg =3D <0>; - - lcd_display_in: endpoint { - remote-endpoint =3D <&ipu1_di1_disp1>; - }; - }; - - port@1 { - reg =3D <1>; - - lcd_display_out: endpoint { - remote-endpoint =3D <&lcd_panel_in>; - }; - }; - }; - - panel: panel { - /* - * edt,et057090dhu: EDT 5.7" LCD TFT - * edt,et070080dh6: EDT 7.0" LCD TFT - */ - compatible =3D "edt,et057090dhu"; - backlight =3D <&backlight>; - - port { - lcd_panel_in: endpoint { - remote-endpoint =3D <&lcd_display_out>; - }; - }; - }; - leds { compatible =3D "gpio-leds"; =20 @@ -113,12 +72,6 @@ }; }; =20 -&backlight { - brightness-levels =3D <0 127 191 223 239 247 251 255>; - default-brightness-level =3D <1>; - status =3D "okay"; -}; - &can1 { status =3D "okay"; }; @@ -168,10 +121,6 @@ status =3D "okay"; }; =20 -&ipu1_di1_disp1 { - remote-endpoint =3D <&lcd_display_in>; -}; - &ldb { status =3D "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index 668793356b46..c0ae08780d86 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2014-2020 Toradex + * Copyright 2014-2022 Toradex * Copyright 2012 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. */ @@ -21,11 +21,53 @@ compatible =3D "pwm-backlight"; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpio_bl_on>; - pwms =3D <&pwm4 0 5000000>; + brightness-levels =3D <0 127 191 223 239 247 251 255>; + default-brightness-level =3D <1>; enable-gpios =3D <&gpio3 13 GPIO_ACTIVE_HIGH>; + power-supply =3D <®_module_3v3>; + pwms =3D <&pwm4 0 5000000>; status =3D "disabled"; }; =20 + lcd_display: disp0 { + compatible =3D "fsl,imx-parallel-display"; + #address-cells =3D <1>; + #size-cells =3D <0>; + interface-pix-fmt =3D "rgb24"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_ipu1_lcdif>; + status =3D "disabled"; + + port@0 { + reg =3D <0>; + + lcd_display_in: endpoint { + remote-endpoint =3D <&ipu1_di1_disp1>; + }; + }; + + port@1 { + reg =3D <1>; + + lcd_display_out: endpoint { + remote-endpoint =3D <&lcd_panel_in>; + }; + }; + }; + + panel_dpi: panel-dpi { + compatible =3D "edt,et057090dhu"; + backlight =3D <&backlight>; + + status =3D "disabled"; + + port { + lcd_panel_in: endpoint { + remote-endpoint =3D <&lcd_display_out>; + }; + }; + }; + reg_module_3v3: regulator-module-3v3 { compatible =3D "regulator-fixed"; regulator-name =3D "+V3.3"; @@ -553,6 +595,10 @@ status =3D "disabled"; }; =20 +&ipu1_di1_disp1 { + remote-endpoint =3D <&lcd_display_in>; +}; + &pwm1 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pwm1>; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAADEC433F5 for ; Mon, 16 May 2022 11:59:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243362AbiEPL74 (ORCPT ); Mon, 16 May 2022 07:59:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243311AbiEPL7j (ORCPT ); Mon, 16 May 2022 07:59:39 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B77A315FE2; Mon, 16 May 2022 04:59:28 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id g12so2639286edq.4; Mon, 16 May 2022 04:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mmdHqA0oaYOkSe9dGsepZveX0B9uSDC/sB1WxfLB/rc=; b=nWOMwweBoLWmosmAjjSCbL4rr16qLV3iGprVRhu3Q5guf2p2PcT+XZzH1uyNjzEX9F whwFjVnBWCmVDjJm6MJT5TLtcpYhrxaG4sT3PDZZhJp3/r9PbsP4znIoFzWelUbrWetc Bp9Ki/Ch0Hj2LGYZJHDu+c0YpTHDO9kcE1Jq0VbCwzezfsOxoxmrcClE2SQzBCHs+Gur 8wiuoJ5XqvH32J1SdyBIdM2MaP5MJ+Cu9meSUjRUetNXHt9ISn9t9dF8weDkc+YWrmyP aG2uPWCgVe1pJKuwMK0ZURSwRV9pa6qMa6ExYCa5V9f8Y+QBBP76DmLmhOnZ7NyXNXk5 fIug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mmdHqA0oaYOkSe9dGsepZveX0B9uSDC/sB1WxfLB/rc=; b=6wr49Z/m8GtpFlfxOEvPPxbsTOffrB/mGy3EST6flpXF4UMQTWN/z3WYMVYcRG/i9h SyLX1k8GC3MUz5M3jToaN/DqWRThyBb531lqAjLOOjHxReMy3gZGVKZ4505VL49X65X9 PTMHIIapfLyUIUvtOFN2iYRDZRzS6W/UWI4qJpgSbtbGgJkz0AaPPg10DNB+yctGfouf v4VRkXNOHpTDxGoldxdhRVg8QHtfoyH/hlAY0JG5K5lNKdpsDZt0pGXL5JQZr4OSh1zL mAYFg4dP33UIRA4LZWO0zbUPOGHh7cqkjdx8x/FmBGU8v0x/sLTCK42oczAAXsbw3YDX POhA== X-Gm-Message-State: AOAM532WBFeK+DgxGl1XOLFRXXkvWe0befaUXZmDy4vPpmRkcgpataLK y9BzmocUss4hwKwW0Srev1o= X-Google-Smtp-Source: ABdhPJw60VJVPlZ1+ug5yXxRRBD2eI28gxK/k1AZCRb2cueQONF2HtDPxz4ZNaaRz4uXP6VgxncvTg== X-Received: by 2002:a05:6402:d0e:b0:413:3d99:f2d6 with SMTP id eb14-20020a0564020d0e00b004133d99f2d6mr12990573edb.189.1652702367114; Mon, 16 May 2022 04:59:27 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:26 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Oleksandr Suvorov , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 06/17] ARM: dts: imx6q-apalis: Move pinmux groups to SoM dtsi Date: Mon, 16 May 2022 13:58:34 +0200 Message-Id: <20220516115846.58328-7-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Oleksandr Suvorov GPIO pinmux groups are declared on the module level. Move muxing them to the same level. It also reduces code duplication. Signed-off-by: Oleksandr Suvorov Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 12 ------------ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 10 ---------- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 8 -------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 8 ++++++++ 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/im= x6q-apalis-eval.dts index 1e6b5482a777..fe5d491e1399 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -206,15 +206,3 @@ cd-gpios =3D <&gpio6 14 GPIO_ACTIVE_LOW>; status =3D "okay"; }; - -&iomuxc { - /* - * Mux the Apalis GPIOs - */ - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 - &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 - &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6 - &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 - >; -}; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/= dts/imx6q-apalis-ixora-v1.1.dts index 527585d26e51..8febfc0aea93 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -202,16 +202,6 @@ }; =20 &iomuxc { - /* - * Mux the Apalis GPIOs - */ - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 - &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 - &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6 - &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 - >; - pinctrl_leds_ixora: ledsixoragrp { fsl,pins =3D < MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x1b0b0 diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/i= mx6q-apalis-ixora.dts index 9900ab04fb28..78cf1d9583c1 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -205,14 +205,6 @@ }; =20 &iomuxc { - /* Mux the Apalis GPIOs */ - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 - &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 - &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6 - &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 - >; - pinctrl_leds_ixora: ledsixoragrp { fsl,pins =3D < MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x1b0b0 diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index c0ae08780d86..9413c14ce5f6 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -709,6 +709,14 @@ }; =20 &iomuxc { + /* Mux the Apalis GPIOs */ + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 + &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 + &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6 + &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 + >; + pinctrl_apalis_gpio1: gpio2io04grp { fsl,pins =3D < MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0 --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AC13C433F5 for ; Mon, 16 May 2022 12:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243338AbiEPMAD (ORCPT ); Mon, 16 May 2022 08:00:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243319AbiEPL7j (ORCPT ); Mon, 16 May 2022 07:59:39 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1964715FCE; Mon, 16 May 2022 04:59:30 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id tk15so4685667ejc.6; Mon, 16 May 2022 04:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gk+Al3GhpVx5YnHdlxIQSiRQjppttTaoPkIXQqKosHE=; b=MwShmOxoYa0ud8MhJ0NOSqRZ0X6ErVSIQhCK4u/i0r1M1PWmYQYxw3bb9scmXjtLOn QpUoAnvoNsA7XDVffaXiR5y6SnzhxiCh5n/bCT8CGkCqiQEDJzzMyE4F1FGzfoH541Dj anpBu3nzp/hOJ0rugwRES6jYaINHfj5CSF0GpWyNAyqQrVa54xJgyaggPjVvO0Cc/qiT aXU9oXiYR1YV7VqvDH5vfWkp5EA7F5vw44Ots1Y1/DT4TkpWhSZ7hjrMF0ASMKFshlBD Oz+2kk5vcjjJC+t+19KqfAFXoeetpLYvPH2X3aG+Zcos0XT+3sdmu34kirMMxzlUg10U oqlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gk+Al3GhpVx5YnHdlxIQSiRQjppttTaoPkIXQqKosHE=; b=1phZgIj+mfMJ+uZI0NYMJFGmOLeB+4BQqBDwiAPlIPNRWWxBi08TSMOx+OWiNy029I 7mKzprufgz/xgm5q+gQK7nkyhmuFVFzwQ0w+er3neXG4z96XImO9zjE0t+DmsFLzfv4S 29jDbPXD3PuQg6JBh0H5j3HfOBQbQjN9wYFAPCTnjuRDeFyCoCP6E0bBfxMkU9y0jGn4 TjJs7xE3UNjZGo9YsSgwKXwlCu9ZWs7EGMtRduTMrQ6MxxGkL4JELw9dp/9QsNkwLm/E 2Sa5ql9Cb63XWMrHUlzgKFdgfH8dU6IrmG7EQPDVPDt86a7BobY37QyPsIo/nKMAyuMi FMgw== X-Gm-Message-State: AOAM531VRuJYCRhOjMHVPX82HzTN0hJaMtp9DULj0jpMtlMnbQu5GFjQ 5Y92zdqn4yw6SO8YXflHowPn0rWCNpo= X-Google-Smtp-Source: ABdhPJzpRcXV4iJUcMwBSRRFb2kS/v+knGeN0ueBE0f3EzuoxkNiKtYs5eBBHfhqMIFojNbojaAgIQ== X-Received: by 2002:a17:907:3f16:b0:6f4:c54:2700 with SMTP id hq22-20020a1709073f1600b006f40c542700mr14812849ejc.615.1652702368590; Mon, 16 May 2022 04:59:28 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:28 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 07/17] ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl to SoM dtsi Date: Mon, 16 May 2022 13:58:35 +0200 Message-Id: <20220516115846.58328-8-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher Reduces code duplication. While at it drop the comments which do not apply on Apalis iMX6 but add the correct SoM pin names. Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 13 ------------- arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 ------------- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 13 ------------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 11 +++++++++++ 4 files changed, 11 insertions(+), 39 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/im= x6q-apalis-eval.dts index fe5d491e1399..5985d1169be1 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -82,19 +82,6 @@ &i2c1 { status =3D "okay"; =20 - /* - * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, - * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms - */ - touchscreen@4a { - compatible =3D "atmel,maxtouch"; - reg =3D <0x4a>; - interrupt-parent =3D <&gpio6>; - interrupts =3D <10 IRQ_TYPE_EDGE_FALLING>; - reset-gpios =3D <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */ - status =3D "disabled"; - }; - pcie-switch@58 { compatible =3D "plx,pex8605"; reg =3D <0x58>; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/= dts/imx6q-apalis-ixora-v1.1.dts index 8febfc0aea93..21f88e19e87d 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -89,19 +89,6 @@ &i2c1 { status =3D "okay"; =20 - /* - * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, - * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms - */ - touchscreen@4a { - compatible =3D "atmel,maxtouch"; - reg =3D <0x4a>; - interrupt-parent =3D <&gpio6>; - interrupts =3D <10 IRQ_TYPE_EDGE_FALLING>; - reset-gpios =3D <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */ - status =3D "disabled"; - }; - /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible =3D "st,m41t0"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/i= mx6q-apalis-ixora.dts index 78cf1d9583c1..6743617ad1c1 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -88,19 +88,6 @@ &i2c1 { status =3D "okay"; =20 - /* - * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, - * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms - */ - touchscreen@4a { - compatible =3D "atmel,maxtouch"; - reg =3D <0x4a>; - interrupt-parent =3D <&gpio6>; - interrupts =3D <10 IRQ_TYPE_EDGE_FALLING>; - reset-gpios =3D <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */ - status =3D "disabled"; - }; - eeprom@50 { compatible =3D "atmel,24c02"; reg =3D <0x50>; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index 9413c14ce5f6..3aa66b6d0c88 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -416,6 +416,17 @@ scl-gpios =3D <&gpio5 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios =3D <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status =3D "disabled"; + + atmel_mxt_ts: touchscreen@4a { + compatible =3D "atmel,maxtouch"; + /* These GPIOs are muxed with the iomuxc node */ + interrupt-parent =3D <&gpio6>; + interrupts =3D <10 IRQ_TYPE_EDGE_FALLING>; /* MXM3_11 */ + reg =3D <0x4a>; + reset-gpios =3D <&gpio6 9 GPIO_ACTIVE_LOW>; /* MXM3_13 */ + status =3D "disabled"; + }; + }; =20 /* --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97474C433EF for ; Mon, 16 May 2022 12:00:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243411AbiEPMAM (ORCPT ); Mon, 16 May 2022 08:00:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243331AbiEPL7k (ORCPT ); Mon, 16 May 2022 07:59:40 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA13F16584; Mon, 16 May 2022 04:59:31 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id dk23so28149832ejb.8; Mon, 16 May 2022 04:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t6QnOlaEmPk5w0CUbgkiElPmdAVeupgyOfiVgHTVYrs=; b=poefYTAJysRL8JajKHfgAq/lICxCmMyF+rhh0w43DuY6aRO8dzAW0s4xWZ3AxcN1n7 +Qv4CUjgVmaQ8cSg7Jg+3yGpN3EN/8Fhtlpl9piAUXSk714XXKzGwXOCrmazlOzm/9QX kSdJFE0379pD9qH85ORs2ojBZibpxusIVI/20KqVZTJhgg+XEOXNNM/mKewxJP78kxmw f3QsOCabKNhfGB/DrBTOhj8A22j3ls9EqztCyOjB0CnbqHprT0GuRDBOvDSr6NVgA/hh z/zcmbAJ2x0Bzpnn+YfK0e2TaZbSRwlFcMfANmdGZsBZkJjH3PaKkejGg6OyETR+ys/s DAUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t6QnOlaEmPk5w0CUbgkiElPmdAVeupgyOfiVgHTVYrs=; b=WG9vILC4SPlfRBD5i03GRC7WvKtlYgEE/tUF8LijrbNUeLHX4M2DcmhUWKz5cqnPIQ wSe8eQ0zCf8lnb++3F0S+8UI2bji7+/VIVVFwVWe4PB7nEU7B3XAP+uEPq0x8h5Wr8Z3 NPT633A48vXKNuyrTuSitXPwbHuqkcqLJ+VAz/v00n0Aiveh4ZkQn9QxyDijq4asQKDu qrDpKOon5LJ1Zg2ne5+1HrRHz3L7IcrD8J/hi416jK8DM5W4auT9PrIRflMk/cLUvalv LjBlQeH80Elpn8sHM8oRQJgMzZPQKjjnSlooRpprTNO7LMoRBYn+lFt0LH7BJ0F1Jhxx rR1g== X-Gm-Message-State: AOAM533H5E7Xy9rpQYQ6m5wBvgFWoNNn09r9+4tSc8/UVtxQiiOLHCL6 UvnmKhhXAslP5H44fhgNAas= X-Google-Smtp-Source: ABdhPJxwm87KMgQCehgWjFdS+7fr1G8eU83fjJqZBMEpJZZWwL64J1D4qLUTjnVUDevA3y+Pc27FSQ== X-Received: by 2002:a17:907:3e03:b0:6da:8c5a:6d4a with SMTP id hp3-20020a1709073e0300b006da8c5a6d4amr15173944ejc.585.1652702370206; Mon, 16 May 2022 04:59:30 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:29 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Oleksandr Suvorov , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 08/17] ARM: dts: imx6q-apalis: Add LVDS panel support Date: Mon, 16 May 2022 13:58:36 +0200 Message-Id: <20220516115846.58328-9-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Oleksandr Suvorov Add LVDS panel and endpoint linkage support but keep the inherited disabled state. This allows to enable it in an overlay per the current system configuration. Signed-off-by: Oleksandr Suvorov Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 4 --- arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 4 --- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 4 --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 36 +++++++++++++++++++ 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/im= x6q-apalis-eval.dts index 5985d1169be1..948bbece3ab5 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -102,10 +102,6 @@ status =3D "okay"; }; =20 -&ldb { - status =3D "okay"; -}; - &pcie { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_reset_moci>; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/= dts/imx6q-apalis-ixora-v1.1.dts index 21f88e19e87d..beb1981fc775 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -104,10 +104,6 @@ status =3D "okay"; }; =20 -&ldb { - status =3D "okay"; -}; - &pcie { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_reset_moci>; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/i= mx6q-apalis-ixora.dts index 6743617ad1c1..28e5d6b68530 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -108,10 +108,6 @@ status =3D "okay"; }; =20 -&ldb { - status =3D "okay"; -}; - &pcie { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_reset_moci>; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index 3aa66b6d0c88..428841cdaac2 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -68,6 +68,18 @@ }; }; =20 + panel_lvds: panel-lvds { + compatible =3D "panel-lvds"; + backlight =3D <&backlight>; + status =3D "disabled"; + + port { + lvds_panel_in: endpoint { + remote-endpoint =3D <&lvds0_out>; + }; + }; + }; + reg_module_3v3: regulator-module-3v3 { compatible =3D "regulator-fixed"; regulator-name =3D "+V3.3"; @@ -610,6 +622,30 @@ remote-endpoint =3D <&lcd_display_in>; }; =20 +&ldb { + lvds-channel@0 { + port@4 { + reg =3D <4>; + + lvds0_out: endpoint { + remote-endpoint =3D <&lvds_panel_in>; + }; + }; + }; + + lvds-channel@1 { + fsl,data-mapping =3D "spwg"; + fsl,data-width =3D <18>; + + port@4 { + reg =3D <4>; + + lvds1_out: endpoint { + }; + }; + }; +}; + &pwm1 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pwm1>; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E741C433F5 for ; Mon, 16 May 2022 12:00:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237762AbiEPMAH (ORCPT ); Mon, 16 May 2022 08:00:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243348AbiEPL7u (ORCPT ); Mon, 16 May 2022 07:59:50 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A3B516596; Mon, 16 May 2022 04:59:33 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id l18so28140973ejc.7; Mon, 16 May 2022 04:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ijndZeMokX/hEJkaDxQ/IoPAmAy206jKv8vbR7k2snk=; b=h5qaa5vCkXXVcZNO1QqCMQAIp7ZLuKfNhYWysWVgoyL66gim/KjrgSjoS65AU29ud7 42VkFP/v6+QpOYN/xvPYgOYU7pH+d45e76LDj8m9c2kQkMkKimDNw8Ujco05BgFBpb7J oGdHvEM6WK24fYWFs7UZaAtskaF/aEXdNkLFoYB+NKQX2Ka4121gbkk14WQ7HN7Q29M+ 1ph4E5IbWsypBG4iqZGa0m5ERGhCvYQbTlYmYfcOoW2bjSnOtZp5GY1S5XOctWlGouGx cplv1akofNnKwSptEpphegTQdkQGS7Ndbrt5UZ1rCz88Da1v/OIIkv/C5Ff0tpSDH40u Qfrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ijndZeMokX/hEJkaDxQ/IoPAmAy206jKv8vbR7k2snk=; b=l3VxZvDAFIG7TiOeJfZ3GSscF8h+WLpZzvdsE/KP8AZF96qbk9xmD8UKMcdj+7ULcy vMPwfybA65M2GeH80OPOzWv/lqgnFKv0FdZfNQSzs2qgj+t/SLzzSiDLtzR4zVr4TUOS dnJKCTGpcV4as+lZyiNLEaubMq1kPoLz9To9Ui5QOnqu/uXTu1L1Cpd52KdxuOZs18Dl Yiwt2qKOBpHZm/kKwqwyosCm0+mEimYdHWIgpgr7wmdtInp1UTFmh2g0ELnTmyKAL0cq QUG8vSB7fOLtuF7uWBopFGHcT2Y6kX/Vb+xOCwFaO50EnLcn8LFU+LQNzTfsvaehYyvl Yj0A== X-Gm-Message-State: AOAM5317w/LdiiOPiiwT2PB1meY1Dj/9ZcDxze1HZEepVVMBx52dHcMN Rja6tDvh3jfCO6xVP5J1hgF7Vh85djo= X-Google-Smtp-Source: ABdhPJx/cDamiwiWlibYkBKC8V1pm/jPhnUWDYI8f8yVrHf0mOBKx1FpuyesASQq63NRQGd9mplA5Q== X-Received: by 2002:a17:906:4786:b0:6f9:635f:72a7 with SMTP id cw6-20020a170906478600b006f9635f72a7mr15385967ejc.326.1652702371721; Mon, 16 May 2022 04:59:31 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:31 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 09/17] ARM: dts: imx6q-apalis: Disable HDMI Date: Mon, 16 May 2022 13:58:37 +0200 Message-Id: <20220516115846.58328-10-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher This allows to enable it in an overlay per the current system configuration. Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 4 ---- arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 4 ---- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 4 ---- 3 files changed, 12 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/im= x6q-apalis-eval.dts index 948bbece3ab5..2436f9a1e18c 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -74,10 +74,6 @@ status =3D "okay"; }; =20 -&hdmi { - status =3D "okay"; -}; - /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ &i2c1 { status =3D "okay"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/= dts/imx6q-apalis-ixora-v1.1.dts index beb1981fc775..b254e96d194a 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -81,10 +81,6 @@ status =3D "okay"; }; =20 -&hdmi { - status =3D "okay"; -}; - /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ &i2c1 { status =3D "okay"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/i= mx6q-apalis-ixora.dts index 28e5d6b68530..97ddf4621bdf 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -80,10 +80,6 @@ status =3D "okay"; }; =20 -&hdmi { - status =3D "okay"; -}; - /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ &i2c1 { status =3D "okay"; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02E9EC433EF for ; Mon, 16 May 2022 12:00:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243521AbiEPMAT (ORCPT ); Mon, 16 May 2022 08:00:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243355AbiEPL7v (ORCPT ); Mon, 16 May 2022 07:59:51 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C391165AA; Mon, 16 May 2022 04:59:34 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id m20so28116633ejj.10; Mon, 16 May 2022 04:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QCU7wfDMqrm19GcnwILuywiRx6koKWukaCjyLUMr2jY=; b=lCL7qISvtKKvBfN7Fj5ilr1dpWU0aSKxE1M1Ycx2YiF1m2N2r20lHQkoMeOOoqphhM zTFOOQUMcsoXp1Z4adiWU8brX19S+6CQq9pTptK5cmoiV8+lEF+gXgUiOsMwrWeCxDrW j2zN0Ejt+en9ZZo6tsfnyWPX+Z1lC0eBCDaA59e6O81rGbZvhbE54AhMx9l0xq1+SwZW +69tW4ajTk7H1BZJVhhBg3kEjl40Q/w5zI4Gz2zKxvnh0/UFkwTH7yrIwd97zvAXrQT0 ArtYz80hSDUH0XYrtLZ6tk7rJRk2XQ5h6FeBqTDaq89OdRBL0tvc5YZxcGs/1ebAHqvI YZQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QCU7wfDMqrm19GcnwILuywiRx6koKWukaCjyLUMr2jY=; b=QuNakz6uezVHqnY3wrpnwy+E7VxwbpvHIhgR2/2FH1162taM/BjgTYTZo4vQMk9c7m Pf+vcrCf0/wuDy+UPplzSzVzkHPQOOPBCPlRVNlZGzVaT51KIFk4549fV0Q+KqtBiAfh Yejz/sCjRKNSI86OZNJ2HvtJWFfeSNuoFPq+REkuGy00J3E9FXs0urMSbD31qzH69Msu zuG5HB8nTpJwRZm7/8X/CBBIUAMp5b56zR1J1CnVFh51POLVA4Z+K8mVbsvB7DIghefz LwD994uSSyUwaqp2aAlPC5CpeLg1xZTcE9RhaZpbvzwPbcHgRe86js5JfLWylRSsDiLb h5nw== X-Gm-Message-State: AOAM530Pn8UiGgV0k7jrRcXAahMUqd8pItFqRvnY/l0mzzfYu3bKwPxT cEtdmBbwLen92GCyo9sK5UYz3Jkgl0E= X-Google-Smtp-Source: ABdhPJwy58Fv2Rln/V04XhYV65F1aWgT954hvfk2TNnITvkLvMQSdg+QATjeaXnqvWLQp8TCmUpQdw== X-Received: by 2002:a17:907:161f:b0:6f6:b288:b397 with SMTP id hb31-20020a170907161f00b006f6b288b397mr14865028ejc.303.1652702373233; Mon, 16 May 2022 04:59:33 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:32 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Oleksandr Suvorov , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 10/17] ARM: dts: imx6q-apalis: Disable stmpe touchscreen Date: Mon, 16 May 2022 13:58:38 +0200 Message-Id: <20220516115846.58328-11-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Oleksandr Suvorov Unify its label with other toradex SoM dtbs. This allows to enable it in an overlay per the current system configuration. Signed-off-by: Oleksandr Suvorov Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index 428841cdaac2..506d040ea37a 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -578,7 +578,7 @@ /* ADC conversion time: 80 clocks */ st,sample-time =3D <4>; =20 - stmpe_touchscreen: stmpe_touchscreen { + stmpe_ts: stmpe_touchscreen { compatible =3D "st,stmpe-ts"; /* 8 sample average control */ st,ave-ctrl =3D <3>; @@ -593,6 +593,7 @@ st,settling =3D <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay =3D <5>; + status =3D "disabled"; }; =20 stmpe_adc: stmpe_adc { --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CEEDC433F5 for ; Mon, 16 May 2022 12:00:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243603AbiEPMAz (ORCPT ); Mon, 16 May 2022 08:00:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243378AbiEPL75 (ORCPT ); Mon, 16 May 2022 07:59:57 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E0FF167C0; Mon, 16 May 2022 04:59:36 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id gh6so28276322ejb.0; Mon, 16 May 2022 04:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eKqWeVdKRXTC0PRCpQ3WiXZdLhshSKyjEsxqGUT/HYc=; b=HOVL5KjJ8vLZnRuUW2KIYcrGAxudGUnJ+hwrzYqmdVzZkAxlxfk9QerQIxCDD//Rbk VmVqhnrTCkQ/ySHwiQzlUsEGPifjqJP2fBC8EatI00V+kHqzDJASctQl95vHmaaHmI6t XVg7JAKTze24nTs/M9dV9rl6Rpd83vbr3EtHjjBhFwZWhRc6TsJ0ARikICwP/UjbuuyR 9faK/4Y3L35YjxpIUMFMCtbJ2S3TSShiA/4f61RzQcu2opkQqSdjMaVIjlihZDnBptFR 92qdBE+7DzgWbU3zfbpyClqXH0gKOpyTFZQ7jEWkcH8eM2a0S0foyZDkigUXt42sjmmJ JPYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eKqWeVdKRXTC0PRCpQ3WiXZdLhshSKyjEsxqGUT/HYc=; b=lnQOI1Z0eEV1zwv8m7iuFeiMZ2hMo1KnQ+PEFyb86Zx019ZrN7G+YVxMgGmLXolc0J 98sUPsZqLcLap383OALEeVD+TuWA+HYcuS4lelVV4uXZv5xoFW0OZU5YRTbbxml0cwBL yyM7bHKh7cNhJQs7o/1zT490A84zPYf5enrRZAKqPzfU7eZ4s4tn1Yjool934T61Qudf 3q8M/DwDlbh9tEtB5IMCcqi0iRs47oeaeN6gtHlVALX1Y7mARR2F7iDzcA/B9pEyAlxX 9lbl+f9pgmSa/GUgCYizs31KHpjumw/SJVgIa5apCjW6UNl7A3kliVjaM1pIsEaNk1kH 58wg== X-Gm-Message-State: AOAM533L0+DluHcj89CWTwlvbB7T8f0oLTsvTglVJjqU02spAFRzmfaE NJiltqLp5etLjERqPN8o7DA= X-Google-Smtp-Source: ABdhPJzjRyVMdvgn2cmwrSPAdySFmjd6bAJZiiS1JEC/F0scx+NlGXVoK/y8QYY59y9r0SKSK6JBfA== X-Received: by 2002:a17:906:8306:b0:6f3:da72:5ca1 with SMTP id j6-20020a170906830600b006f3da725ca1mr15039625ejx.606.1652702374743; Mon, 16 May 2022 04:59:34 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:34 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Oleksandr Suvorov , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 11/17] ARM: dts: imx6q-apalis: Add ov5640 mipi csi camera Date: Mon, 16 May 2022 13:58:39 +0200 Message-Id: <20220516115846.58328-12-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Oleksandr Suvorov The Apalis iMX6 modules allow connecting a mipi-csi video input. Add support for our OV5640 camera module but have it disabled. This allows to enable it in an overlay per the current system configuration. Signed-off-by: Oleksandr Suvorov Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 67 ++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index 506d040ea37a..0d1004eede62 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -29,6 +29,12 @@ status =3D "disabled"; }; =20 + clk_ov5640_osc: clk_ov5640_osc_int { + compatible =3D "fixed-clock"; + #clock-cells =3D <0>; + clock-frequency =3D <24000000>; + }; + lcd_display: disp0 { compatible =3D "fsl,imx-parallel-display"; #address-cells =3D <1>; @@ -96,6 +102,26 @@ regulator-always-on; }; =20 + reg_ov5640_1v8_d_o_vdd: regulator-ov5640-1v8-d-o-vdd { + compatible =3D "regulator-fixed"; + regulator-always-on; + regulator-max-microvolt =3D <1800000>; + regulator-min-microvolt =3D <1800000>; + regulator-name =3D "DOVDD/DVDD_1.8V"; + /* Note: The CSI module uses on-board 3.3V_SW supply */ + vin-supply =3D <®_module_3v3>; + }; + + reg_ov5640_2v8_a_vdd: regulator-ov5640-2v8-a-vdd { + compatible =3D "regulator-fixed"; + regulator-always-on; + regulator-max-microvolt =3D <2800000>; + regulator-min-microvolt =3D <2800000>; + regulator-name =3D "AVDD/AFVDD_2.8V"; + /* Note: The CSI module uses on-board 3.3V_SW supply */ + vin-supply =3D <®_module_3v3>; + }; + reg_usb_otg_vbus: regulator-usb-otg-vbus { compatible =3D "regulator-fixed"; pinctrl-names =3D "default"; @@ -438,7 +464,6 @@ reset-gpios =3D <&gpio6 9 GPIO_ACTIVE_LOW>; /* MXM3_13 */ status =3D "disabled"; }; - }; =20 /* @@ -617,6 +642,30 @@ scl-gpios =3D <&gpio3 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios =3D <&gpio3 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status =3D "disabled"; + + ov5640_csi_cam: ov5640_mipi@3c { + compatible =3D "ovti,ov5640"; + AVDD-supply =3D <®_ov5640_2v8_a_vdd>; + DOVDD-supply =3D <®_ov5640_1v8_d_o_vdd>; + DVDD-supply =3D <®_ov5640_1v8_d_o_vdd>; + clocks =3D <&clks IMX6QDL_CLK_CKO2>; + clock-names =3D "xclk"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_cam_mclk>; + /* These GPIOs are muxed with the iomuxc node */ + powerdown-gpios =3D <&gpio2 5 GPIO_ACTIVE_HIGH>; + reg =3D <0x3c>; + reset-gpios =3D <&gpio2 4 GPIO_ACTIVE_LOW>; + status =3D "disabled"; + + port { + ov5640_to_mipi_csi2: endpoint { + clock-lanes =3D <0>; + data-lanes =3D <1 2>; + remote-endpoint =3D <&mipi_csi_from_ov5640>; + }; + }; + }; }; =20 &ipu1_di1_disp1 { @@ -647,6 +696,22 @@ }; }; =20 +&mipi_csi { + #address-cells =3D <1>; + #size-cells =3D <0>; + status =3D "disabled"; + + port@0 { + reg =3D <0>; + + mipi_csi_from_ov5640: endpoint { + clock-lanes =3D <0>; + data-lanes =3D <1 2>; + remote-endpoint =3D <&ov5640_to_mipi_csi2>; + }; + }; +}; + &pwm1 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pwm1>; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29BC0C433F5 for ; Mon, 16 May 2022 12:00:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237910AbiEPMAm (ORCPT ); Mon, 16 May 2022 08:00:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243395AbiEPL75 (ORCPT ); Mon, 16 May 2022 07:59:57 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C840C167DA; Mon, 16 May 2022 04:59:37 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id g6so28205336ejw.1; Mon, 16 May 2022 04:59:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7EhdZnBGNhKoELha1acB7pKc8koKdRuYwtp3Avxy8oI=; b=i9EsMC2lv00nRAFVxDcRyY0hG5V121w+/Ew8fuvpkalFFHov7+KQLqJixu1dyt9ub5 CvhrkqszEq6MeCRmKh+W2EojH+PIczySWDRfQTh8Z98to/OUjTgM7c8urokFEdQnoMup YAoVjMa9HSdxLH4Ev77e/oRBGL4AdbnidwWUenTCaUo0CWqBNdF4yntuMDFu/qGnGRb8 epYgqvTIiSJ/B04hsK03uszCiIU0J8YFoBrwnoCltN9lqvcAYFRQ+ltQ3Epe7c03t12B vDmPGT7JLZYjr5ZXLrKYS/hOgUpKM5hn8Dcz+nKdCQejZJyk0uva+/u8qufqMCh7Qm3r 8OTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7EhdZnBGNhKoELha1acB7pKc8koKdRuYwtp3Avxy8oI=; b=sXkgOVqvJeHMFTof6E4F/n7Pfy65g2yNi5NAFss8t5GRPTG25PJIBi9eoZWaREW2JF bLseU3I5WTLzoo8np4A/wt0m1fyWfvBkr+PbmsnvoQ8OpcgLmOJA4SBVUcv0GJ6br+Nq ETjGH/ayQHS+ybwmNFbkjVh5y80iyLG6J04EHlAqNu5MS7EIZlcKJQyD8fuS3JFpDOO+ if5rK89VvUDoUQ6DUspIBQ/okX1BJPBJn9jHVtZtNZUlZ29OVQO61XhE5Y54hMfDmqld HRSl1/ip9KtBaoYSC2IEkmSHavKIX3JHMCtaYGsaGWIUOptOShuOlc8HqDjYJD5Xssvk Vk7w== X-Gm-Message-State: AOAM531KCTPzKEw1Y5YbNAPhijyEqjs0tbZH55ma88yPBmQhxbYxuMUo 7RY9X0hEB64frVQ5qgy8yko= X-Google-Smtp-Source: ABdhPJwTw63vxQa3VD8DO5ZvJ99y9QxISsFfkeOmu1ogAKWEmcsFNlFpjXUGTibWIw+Ggb9a/Sti+Q== X-Received: by 2002:a17:907:6090:b0:6fa:14ca:fba2 with SMTP id ht16-20020a170907609000b006fa14cafba2mr15158725ejc.564.1652702376316; Mon, 16 May 2022 04:59:36 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:35 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Oleksandr Suvorov , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 12/17] ARM: dts: imx6q-apalis: Add adv7280 video input Date: Mon, 16 May 2022 13:58:40 +0200 Message-Id: <20220516115846.58328-13-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Oleksandr Suvorov The Apalis iMX6 modules allow connecting a parallel video input. Add support for our ADV7280 video input module but have it disabled. This allows to enable it in an overlay per the current system configuration. Signed-off-by: Oleksandr Suvorov Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index 0d1004eede62..f33dfaa907d7 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -418,6 +418,21 @@ "MXM3_215"; }; =20 +&gpr { + ipu1_csi0_mux { + #address-cells =3D <1>; + #size-cells =3D <0>; + status =3D "disabled"; + + port@1 { + reg =3D <1>; + ipu1_csi0_mux_from_parallel_sensor: endpoint { + remote-endpoint =3D <&adv7280_to_ipu1_csi0_mux>; + }; + }; + }; +}; + &fec { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_enet>; @@ -643,6 +658,21 @@ sda-gpios =3D <&gpio3 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status =3D "disabled"; =20 + adv_7280: adv7280@21 { + compatible =3D "adi,adv7280"; + reg =3D <0x21>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_ipu1_csi0>; + status =3D "disabled"; + + port { + adv7280_to_ipu1_csi0_mux: endpoint { + bus-width =3D <8>; + remote-endpoint =3D <&ipu1_csi0_mux_from_parallel_sensor>; + }; + }; + }; + ov5640_csi_cam: ov5640_mipi@3c { compatible =3D "ovti,ov5640"; AVDD-supply =3D <®_ov5640_2v8_a_vdd>; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA403C433FE for ; Mon, 16 May 2022 12:00:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243567AbiEPMAa (ORCPT ); Mon, 16 May 2022 08:00:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243419AbiEPMAN (ORCPT ); Mon, 16 May 2022 08:00:13 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65DFA167F2; Mon, 16 May 2022 04:59:39 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id n10so28201158ejk.5; Mon, 16 May 2022 04:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I3Sfbr8BAGz5vkKbSG+pjMvzfsn3wzmqZ9XE0VbkJng=; b=hCuA99+WFKizFSAmRMvXuFpJr3npywXJ5ksCBqmNpF0lcK8Bo01paM87G+oHCtcSDN OIC4WURy0WHw+1+fubR0AnTJAoRasQ81Bhb1QNKktUvHRsTWHEmiyhaVsrPOWWY3/kM0 7YYt2dowFs2NUUNKNDkmWGK6EkD6e5MkxVUFscaN0N2xNpDxDCtxWSDvwvr6b08oJVuu mZX8x4kiniCgMerq0jSczUx929quHINsMyg+WjY28YiJBK8e7/WjssbTGxcTTXUxnEj9 X3Tl/etF8noLL6rY7BiAusIxWLMVBZbnhfYFzciUwCMW/QIIQOCMUBJGaflmZv/AqEZj CL5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I3Sfbr8BAGz5vkKbSG+pjMvzfsn3wzmqZ9XE0VbkJng=; b=s+rww8HiU90uX3fpXpq7MsxZprGUU/4oFNiwE85SoPqbV9oOFD9gy3cClujSelcpXx eNbhGaKfJjqRFXtfLAypkb2PoOa+BNv4krPG2KFFuUJNhV9p4rW3ZK6EF4ubwnzJYMo2 zDhw8JIkgHY/7lTGLLK+yLTYv53iZ+3udTIO2m60Z6QzTtwhKkAcgnIIcVHVvHj7eBQ8 SsoqG6MjmDmvpstBkohiNKqR5SO1G34ZbJkNLmaaxb0wXm3/rAKwrSuBIenYa6AYBQ1F pKzFESwpxaiaf8RjOA+iLcSPWYpmEVMLKJ0sPfXY2ivRHAWCBpMUCSK1nUgrXfQ/byOP lflg== X-Gm-Message-State: AOAM532A+m8CnozZVDc7+imYeOvKUnhk+zrNsliPz5UuqDLfmRQbwVgH y4TnwMCIte0XxbHV6BelAjs= X-Google-Smtp-Source: ABdhPJyvdsOLJCqOHH35vJvbh6yIAu5csT122cVuiLOjstV7U09o6OXSfunH8tSONhKku/lEU7Q9Nw== X-Received: by 2002:a17:907:1ca5:b0:6f4:b220:430b with SMTP id nb37-20020a1709071ca500b006f4b220430bmr15086120ejc.261.1652702377813; Mon, 16 May 2022 04:59:37 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:37 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Denys Drozdov , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 13/17] ARM: dts: imx6q-apalis: Clean-up sd card support Date: Mon, 16 May 2022 13:58:41 +0200 Message-Id: <20220516115846.58328-14-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Denys Drozdov Configure SOM DTSI to 8-bit, card detect in the SoM dtsi as this is the Apalis family default functionality. Limit the interface to 4-bit only on the Ixora V1.1 carrier boards. Signed-off-by: Denys Drozdov Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 3 --- arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 1 - arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 ++- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/im= x6q-apalis-eval.dts index 2436f9a1e18c..5c4d9a4ec586 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -172,9 +172,6 @@ =20 /* MMC1 */ &usdhc1 { - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; - cd-gpios =3D <&gpio4 20 GPIO_ACTIVE_LOW>; status =3D "okay"; }; =20 diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/= dts/imx6q-apalis-ixora-v1.1.dts index b254e96d194a..2d0324103804 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -175,7 +175,6 @@ &usdhc1 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; - cd-gpios =3D <&gpio4 20 GPIO_ACTIVE_LOW>; bus-width =3D <4>; status =3D "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index f33dfaa907d7..57642aefe349 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -817,7 +817,8 @@ /* MMC1 */ &usdhc1 { pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>; + pinctrl-0 =3D <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; + cd-gpios =3D <&gpio4 20 GPIO_ACTIVE_LOW>; vqmmc-supply =3D <®_module_3v3>; bus-width =3D <8>; disable-wp; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74F1DC433FE for ; Mon, 16 May 2022 12:00:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243368AbiEPMA0 (ORCPT ); Mon, 16 May 2022 08:00:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243423AbiEPMAN (ORCPT ); Mon, 16 May 2022 08:00:13 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25A9217049; Mon, 16 May 2022 04:59:41 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id j28so3928398eda.13; Mon, 16 May 2022 04:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sAIC5XO8Gpb1Psqm27VnVBwo9ZckV1Uf+O9pRsgrc5w=; b=OIvDXjnaMI0BsLHjcaWoVSJs5Viu/U5uHaGQReMYDOP7UJaZ6MXnPLv/AAzsyBqy2n mkV3NDKqXkhrPcDAwbbGY3GUVr7wfpxHT69hWEQlZqg0jZ130gMEdw+H0GddlPUNrFHX PKWDmpqSPLrHjAbaOI/uXr+v/KSnsPuTkCfEZ88MUsIiQoXQsF2oibwDM8hQYbkvoIT6 UX72PTPxnXpUreeBX5dNRGBkwn3Vd/Bv9ssl9hgMKSYM127EohSvTLcc4QfvsUW9f+rA BWGybNqbuKf/z5VAZ+5TVPNIyYovWS+cCpidSs9qkY5kfeHPHm7ZXHwnE0QJE8wpwMZl UxDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sAIC5XO8Gpb1Psqm27VnVBwo9ZckV1Uf+O9pRsgrc5w=; b=yLaq4hjgdvXi5K6PFpsg4ucdZfLiYvWaI9tcFAD20vMML04muuCo5GGEKltNmFmHB8 LhO8BjoLOX70LntXXEtOWOxlgZTAQLYCqTMDUILB4AIanKKchcwXlJc7rdjbnqlTCvCx z/gsk4SZ/pFALzLqN8pA6oOCdrHl9HWc5nuQ2HaoiySckRAGqko39k/zn4jhfW4FGnBH spE3OOlzqCNMaLuAMxyvJpO3u+cNsoXz0XgGCEhHw1AbqXF3iGU4yTWjpXejdCcGBCxq rcGU7guu1bZDZZpPyJ1GaT/5jMbtOehsvEOqF0526uDEN+K0zC2wxBrHiGlcqs2z8RXa dIRg== X-Gm-Message-State: AOAM532z2K/Rca+AqDKd13Jup1OMNfwET9xzzLgdzrCPuF2yeRd235aR N2KY+QtjnGrxOF0ibpP2BkQ= X-Google-Smtp-Source: ABdhPJzK3rkJ3N/5/Nwzqwf7yEjeiEjJlq6CVlniW4meeZ/cWtoYSjGiYM/l7xsYzrzhuYwLYi8nwQ== X-Received: by 2002:a05:6402:3552:b0:427:e36a:e839 with SMTP id f18-20020a056402355200b00427e36ae839mr12724834edd.351.1652702379491; Mon, 16 May 2022 04:59:39 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:39 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Arnd Bergmann , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Olof Johansson , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, soc@kernel.org Subject: [PATCH v1 14/17] ARM: dts: imx6q-apalis: Add support for Toradex Ixora V1.2 carrier boards Date: Mon, 16 May 2022 13:58:42 +0200 Message-Id: <20220516115846.58328-15-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher The Ixora V1.2 carrier board adds SW relevant new features compared to the V1.1 version. - An I2C EEPROM is added. - The SD card slot got a switchable 3.3V supply. - Pull ups on the SD card signals are not assembled to faciliate 1.8V speed modes. - The CAN transceivers got a switchable 3.3V supply. Add a new device tree and, as the differences are so small rework the device tree for V1.1 to include the V1.2 device tree and adjust as needed. Drop adding the toradex,apalis_imx6q-ixora to the dtb compatible to adhere to the binding yaml document. Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 178 +---------- arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 290 ++++++++++++++++++ 3 files changed, 303 insertions(+), 166 deletions(-) create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 0ad8339e07d8..55fbe4f8c598 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -544,6 +544,7 @@ dtb-$(CONFIG_SOC_IMX6Q) +=3D \ imx6q-apalis-eval.dtb \ imx6q-apalis-ixora.dtb \ imx6q-apalis-ixora-v1.1.dtb \ + imx6q-apalis-ixora-v1.2.dtb \ imx6q-apf6dev.dtb \ imx6q-arm2.dtb \ imx6q-b450v3.dtb \ diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/= dts/imx6q-apalis-ixora-v1.1.dts index 2d0324103804..44637d606e61 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -5,187 +5,33 @@ * Copyright 2011 Linaro Ltd. */ =20 -/dts-v1/; - -#include -#include -#include -#include "imx6q.dtsi" -#include "imx6qdl-apalis.dtsi" +#include "imx6q-apalis-ixora-v1.2.dts" =20 / { model =3D "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board V1.1"; - compatible =3D "toradex,apalis_imx6q-ixora-v1.1", - "toradex,apalis_imx6q-ixora", "toradex,apalis_imx6q", + compatible =3D "toradex,apalis_imx6q-ixora-v1.1", "toradex,apalis_imx6q", "fsl,imx6q"; =20 - aliases { - i2c0 =3D &i2c1; - i2c1 =3D &i2c3; - i2c2 =3D &i2c2; - rtc0 =3D &rtc_i2c; - rtc1 =3D &snvs_rtc; - }; - - chosen { - stdout-path =3D "serial0:115200n8"; - }; - - gpio-keys { - compatible =3D "gpio-keys"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_gpio_keys>; - - wakeup { - label =3D "Wake-Up"; - gpios =3D <&gpio1 4 GPIO_ACTIVE_LOW>; - linux,code =3D ; - debounce-interval =3D <10>; - wakeup-source; - }; - }; - - leds { - compatible =3D "gpio-leds"; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_leds_ixora>; - - led4-green { - label =3D "LED_4_GREEN"; - gpios =3D <&gpio1 14 GPIO_ACTIVE_HIGH>; - }; =20 - led4-red { - label =3D "LED_4_RED"; - gpios =3D <&gpio1 12 GPIO_ACTIVE_HIGH>; - }; - - led5-green { - label =3D "LED_5_GREEN"; - gpios =3D <&gpio2 1 GPIO_ACTIVE_HIGH>; - }; - - led5-red { - label =3D "LED_5_RED"; - gpios =3D <&gpio2 2 GPIO_ACTIVE_HIGH>; - }; - }; }; =20 +/delete-node/ &eeprom; +/delete-node/ ®_3v3_vmmc; +/delete-node/ ®_can1_supply; +/delete-node/ ®_can2_supply; + &can1 { - status =3D "okay"; + /delete-property/ xceiver-supply; }; =20 &can2 { - status =3D "okay"; -}; - -/* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ -&i2c1 { - status =3D "okay"; - - /* M41T0M6 real time clock on carrier board */ - rtc_i2c: rtc@68 { - compatible =3D "st,m41t0"; - reg =3D <0x68>; - }; -}; - -/* - * I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor on carrier - * board) - */ -&i2c3 { - status =3D "okay"; -}; - -&pcie { - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_reset_moci>; - /* active-high meaning opposite of regular PERST# active-low polarity */ - reset-gpio =3D <&gpio1 28 GPIO_ACTIVE_HIGH>; - reset-gpio-active-high; - status =3D "okay"; -}; - -&pwm1 { - status =3D "okay"; -}; - -&pwm2 { - status =3D "okay"; -}; - -&pwm3 { - status =3D "okay"; -}; - -&pwm4 { - status =3D "okay"; -}; - -®_usb_otg_vbus { - status =3D "okay"; -}; - -®_usb_host_vbus { - status =3D "okay"; -}; - -&sata { - status =3D "okay"; -}; - -&sound_spdif { - status =3D "okay"; -}; - -&spdif { - status =3D "okay"; -}; - -&uart1 { - status =3D "okay"; -}; - -&uart2 { - status =3D "okay"; -}; - -&uart4 { - status =3D "okay"; -}; - -&uart5 { - status =3D "okay"; -}; - -&usbh1 { - vbus-supply =3D <®_usb_host_vbus>; - status =3D "okay"; -}; - -&usbotg { - vbus-supply =3D <®_usb_otg_vbus>; - status =3D "okay"; + /delete-property/ xceiver-supply; }; =20 /* MMC1 */ &usdhc1 { + /delete-property/ cap-power-off-card; + /delete-property/ pinctrl-1; + /delete-property/ vmmc-supply; pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; - bus-width =3D <4>; - status =3D "okay"; -}; - -&iomuxc { - pinctrl_leds_ixora: ledsixoragrp { - fsl,pins =3D < - MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x1b0b0 - MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x1b0b0 - MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0 - MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0 - >; - }; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts b/arch/arm/boot/= dts/imx6q-apalis-ixora-v1.2.dts new file mode 100644 index 000000000000..7770697fde5e --- /dev/null +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts @@ -0,0 +1,290 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2014-2022 Toradex + * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + */ + +/dts-v1/; + +#include +#include +#include +#include "imx6q.dtsi" +#include "imx6qdl-apalis.dtsi" + +/ { + model =3D "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board V1.2"; + compatible =3D "toradex,apalis_imx6q-ixora-v1.2", "toradex,apalis_imx6q", + "fsl,imx6q"; + + aliases { + i2c0 =3D &i2c1; + i2c1 =3D &i2c3; + i2c2 =3D &i2c2; + rtc0 =3D &rtc_i2c; + rtc1 =3D &snvs_rtc; + }; + + chosen { + stdout-path =3D "serial0:115200n8"; + }; + + gpio-keys { + compatible =3D "gpio-keys"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_gpio_keys>; + + wakeup { + debounce-interval =3D <10>; + gpios =3D <&gpio1 4 GPIO_ACTIVE_LOW>; + label =3D "Wake-Up"; + linux,code =3D ; + wakeup-source; + }; + }; + + leds { + compatible =3D "gpio-leds"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_leds_ixora>; + + led4-green { + gpios =3D <&gpio1 14 GPIO_ACTIVE_HIGH>; + label =3D "LED_4_GREEN"; + }; + + led4-red { + gpios =3D <&gpio1 12 GPIO_ACTIVE_HIGH>; + label =3D "LED_4_RED"; + }; + + led5-green { + gpios =3D <&gpio2 1 GPIO_ACTIVE_HIGH>; + label =3D "LED_5_GREEN"; + }; + + led5-red { + gpios =3D <&gpio2 2 GPIO_ACTIVE_HIGH>; + label =3D "LED_5_RED"; + }; + }; + + reg_3v3_vmmc: regulator-3v3-vmmc { + compatible =3D "regulator-fixed"; + enable-active-high; + gpio =3D <&gpio2 0 GPIO_ACTIVE_HIGH>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_enable_3v3_vmmc>; + regulator-max-microvolt =3D <3300000>; + regulator-min-microvolt =3D <3300000>; + regulator-name =3D "3v3_vmmc"; + startup-delay-us =3D <100>; + }; + + reg_can1_supply: regulator-can1-supply { + compatible =3D "regulator-fixed"; + enable-active-high; + gpio =3D <&gpio2 3 GPIO_ACTIVE_HIGH>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_enable_can1_power>; + regulator-name =3D "can1_supply"; + }; + + reg_can2_supply: regulator-can2-supply { + compatible =3D "regulator-fixed"; + enable-active-high; + gpio =3D <&gpio3 15 GPIO_ACTIVE_HIGH>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_enable_can2_power>; + regulator-name =3D "can2_supply"; + }; +}; + +&can1 { + xceiver-supply =3D <®_can1_supply>; + status =3D "okay"; +}; + +&can2 { + xceiver-supply =3D <®_can2_supply>; + status =3D "okay"; +}; + +&gpio1 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_uart24_forceoff>; + + /* + * uart-2-4-on-x21-enable-hog enables the UART transceiver for Apalis + * UART2 and UART3. If one wants to disable the transceiver force + * the GPIO to output-low, if one wants to control the transceiver + * from user space delete the hog node. + */ + uart-2-4-on-x21-enable-hog { + gpio-hog; + gpios =3D <11 GPIO_ACTIVE_HIGH>; /* MXM3 180 */ + output-high; + }; +}; + +/* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ +&i2c1 { + status =3D "okay"; + + /* M41T0M6 real time clock on carrier board */ + rtc_i2c: rtc@68 { + compatible =3D "st,m41t0"; + reg =3D <0x68>; + }; + + eeprom: eeprom@50 { + compatible =3D "atmel,24c02"; + reg =3D <0x50>; + pagesize =3D <16>; + }; +}; + +/* + * I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor on carrier + * board) + */ +&i2c3 { + status =3D "okay"; +}; + +&pcie { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_reset_moci>; + /* active-high meaning opposite of regular PERST# active-low polarity */ + reset-gpio =3D <&gpio1 28 GPIO_ACTIVE_HIGH>; + reset-gpio-active-high; + status =3D "okay"; +}; + +&pwm1 { + status =3D "okay"; +}; + +&pwm2 { + status =3D "okay"; +}; + +&pwm3 { + status =3D "okay"; +}; + +&pwm4 { + status =3D "okay"; +}; + +®_usb_host_vbus { + status =3D "okay"; +}; + +®_usb_otg_vbus { + status =3D "okay"; +}; + +&sata { + status =3D "okay"; +}; + +&sound_spdif { + status =3D "okay"; +}; + +&spdif { + status =3D "okay"; +}; + +&uart1 { + status =3D "okay"; +}; + +&uart2 { + status =3D "okay"; +}; + +&uart4 { + status =3D "okay"; +}; + +&uart5 { + status =3D "okay"; +}; + +&usbh1 { + vbus-supply =3D <®_usb_host_vbus>; + status =3D "okay"; +}; + +&usbotg { + vbus-supply =3D <®_usb_otg_vbus>; + status =3D "okay"; +}; + +/* MMC1 */ +&usdhc1 { + pinctrl-names =3D "default", "sleep"; + pinctrl-0 =3D <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; + pinctrl-1 =3D <&pinctrl_usdhc1_4bit_sleep &pinctrl_mmc_cd_sleep>; + bus-width =3D <4>; + cap-power-off-card; + vmmc-supply =3D <®_3v3_vmmc>; + status =3D "okay"; +}; + +&iomuxc { + pinctrl_enable_3v3_vmmc: enable3v3vmmcgrp { + fsl,pins =3D < + MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x1b0b0 + >; + }; + + pinctrl_enable_can1_power: enablecan1powergrp { + fsl,pins =3D < + MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 + >; + }; + + pinctrl_enable_can2_power: enablecan2powergrp { + fsl,pins =3D < + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x1b0b0 + >; + }; + + pinctrl_uart24_forceoff: uart24forceoffgrp { + fsl,pins =3D < + MX6QDL_PAD_SD2_CMD__GPIO1_IO11 0x1b0b0 + >; + }; + + pinctrl_leds_ixora: ledsixoragrp { + fsl,pins =3D < + MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x1b0b0 + MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x1b0b0 + MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0 + MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0 + >; + }; + + pinctrl_mmc_cd_sleep: mmccdslpgrp { + fsl,pins =3D < + /* MMC1 CD */ + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x0 + >; + }; + + pinctrl_usdhc1_4bit_sleep: usdhc1-4bitslpgrp { + fsl,pins =3D < + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x3000 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x3000 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x3000 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x3000 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x3000 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x3000 + >; + }; +}; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE45CC433FE for ; Mon, 16 May 2022 12:01:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243632AbiEPMBB (ORCPT ); Mon, 16 May 2022 08:01:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243440AbiEPMAO (ORCPT ); Mon, 16 May 2022 08:00:14 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C3971705D; Mon, 16 May 2022 04:59:42 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id ks9so28180673ejb.2; Mon, 16 May 2022 04:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HQ+/zAYDYzlIVwhBZOjr+9YmcuxLFRWGYnq8noCNm6Q=; b=Ul2ALb+PwrpKLFgrqQ2ddPMSS6EGneglWSb29zDFP9QO3F6HpYV3GsIJX/TX4FeKaS sh3REtOmRVVysBbyRKetx2mvKsIXfVdAj7wliiqyzPCYjKNE+kI5wQAluPX5QlHNqEkY m5teKtGq2++zpS5nHhe9BuoCXPbXOEyeraV/OdrT3su3IgHf5qG/TzhXiWOrmKpyuisG hFX9vCQx2Ic27oP2qY96k4SKtI92Mp3CHaF1nmJ9u1/Ml+wRe0Dwp1qFj6CA4ET+gbG1 U/UjXG3quk5naFPEEDv/8bTVNrnEgc7ra7Q4y7iMoRfHsScr+UCuszL82TontIj8x74f 8DqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HQ+/zAYDYzlIVwhBZOjr+9YmcuxLFRWGYnq8noCNm6Q=; b=nRy/oh3VdY4yePJ3OpH7vR+wckGKmztLOtClQuBZ0fZwLnfgWjK2Sz+olBOC6HO85F SxcERnn2QOXQFIxvMlSGCsoTKI1kXmGqJfLHxeyYJwa9WySX2E/yWCNtJw3hlqBmia8d iSLfSTPIWrU/yAU5kb/+zWK+PLcbsxx2cOgwdot4fujRMdcLC/k0d1SJBxMrBq5nl7MB 7rzILK52w3MnaturHJzY9fJM9+HoVnx5kW/0SMmj4a+3jMidgouX1g3ShF8zV6a/vVQu orPuGeYVeQwlCAx4H/dcPaAVCAh1BiqboktI5ha9D6GzExv0Lx6mTVVf/rTxtxNIrEn7 5ZUA== X-Gm-Message-State: AOAM532SLWUb86jTr31ovcUlPJb91mpknJCJq9O3DvyP+lvm+SFFktqU FstkclZgQbsyWvoQcv62J/A= X-Google-Smtp-Source: ABdhPJzGegeYVw0NU99xQNbBARJB4zkYwREXhG0v+IXsvWmsBLwKH/JJ1PRgnOJT6uwK5uUAGF+YGQ== X-Received: by 2002:a17:906:7952:b0:6fe:1e0b:6343 with SMTP id l18-20020a170906795200b006fe1e0b6343mr9096414ejo.337.1652702380993; Mon, 16 May 2022 04:59:40 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:40 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 15/17] ARM: dts: imx6q-apalis: backlight pwm: Simplify inverted backlight Date: Mon, 16 May 2022 13:58:43 +0200 Message-Id: <20220516115846.58328-16-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher Set #pwm-cells to the default 3 to gain access to the parameter which allows inverting the PWM signal. This is useful to specify a backlight which has its highest brightness at 0. With the change to use the PWM with inverted polarity the PWM signal is inverted to how it was before this patch. This changes the meaning of the values in the brightness-levels property. I.e. the duty-cycle changes from x/255 to (255-x)/255. Keeping the brightness-levels will then have a big brightness jump from 0 to 127 duty cycle, the other 6 steps will then be barely noticeable. Change the brightness-levels to provide the same brightness-levels as before. Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index 57642aefe349..49669caac8b7 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -6,6 +6,7 @@ */ =20 #include +#include =20 / { model =3D "Toradex Apalis iMX6Q/D Module"; @@ -19,13 +20,13 @@ =20 backlight: backlight { compatible =3D "pwm-backlight"; + brightness-levels =3D <0 4 8 16 32 64 128 255>; + default-brightness-level =3D <6>; + enable-gpios =3D <&gpio3 13 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpio_bl_on>; - brightness-levels =3D <0 127 191 223 239 247 251 255>; - default-brightness-level =3D <1>; - enable-gpios =3D <&gpio3 13 GPIO_ACTIVE_HIGH>; power-supply =3D <®_module_3v3>; - pwms =3D <&pwm4 0 5000000>; + pwms =3D <&pwm4 0 5000000 PWM_POLARITY_INVERTED>; status =3D "disabled"; }; =20 @@ -761,7 +762,6 @@ }; =20 &pwm4 { - #pwm-cells =3D <2>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pwm4>; status =3D "disabled"; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E3BFC433F5 for ; Mon, 16 May 2022 12:01:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243321AbiEPMBQ (ORCPT ); Mon, 16 May 2022 08:01:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243459AbiEPMAO (ORCPT ); Mon, 16 May 2022 08:00:14 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B66B1707C; Mon, 16 May 2022 04:59:44 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id i40so2959573eda.7; Mon, 16 May 2022 04:59:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U5klBQd+5VVDxjdh+quG2QVbCvgSx+FMLRBxcvrncEk=; b=CIjZSaFko+8bhEs+vM+NHZRLIWaxag02GeoxPgnAnBPYuHptRPYOxjhBh4yiPk3KWi lImIw6IM6aXA893VEOO5ACf6D0mIsHIaHMEqAhmJsTNy/mUTCpuRnmZzxtJcDrmX21Mc c2uP4QbHlnJ9tlYnI5K6rRzIYXUU6UCbI3p2x2UStYk8HT2lEkHRAjSylYg+dq/pEiK+ 4SrDV5LWLog34KJLk2Ef9uAe1T37AG+KCE2BxDMW2LZQayXcrk6uJx6n7enSwnmGq913 U9V8so1/AHdkDzGBXyiwYPxYaEpgZCOwgKS+ooKUxcZOpxlOZmm0Ew8l3C5p757jKtdw xgvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U5klBQd+5VVDxjdh+quG2QVbCvgSx+FMLRBxcvrncEk=; b=DqRqK6KqLmZPKYYTGmK7K03mQ/i/pUmYy+SeF7sKpnPJNtKNIgg324KKEI5iHNwlAP DKWiA/5q74pmu94SMg125GjmqLDPYeb8jtxjo3OSi5oniQMYbUV0gagUo4ts2J0Juzdu kTFFPUpCOdI5acCkk55AC3sMG41tu8pbkfx2daQMHevWXPQu++RMj88xCDhN1R7yRxPs JQw/m29dIDZ4el5qzNrx5R3nSAZ4DRhtdTRfgnwVDMJz1djXXDYZsty7xdrYitMKdnF6 E55Yz28k3flqFdFWTDnEBmWyNlj8q2ASD6ldAl69UZ7v65BEBDEU+OGoqxycIvbZzzZ2 B2xA== X-Gm-Message-State: AOAM5309CWJe7+gMlFIt+28iKcXs2mlPBw4ynGrjP3DJgh4X0XuCHS+C coSsIEtWJqM95SSeGhhO764= X-Google-Smtp-Source: ABdhPJx1JBFiuRd9VuE61SGGK9mBPT3srwZOBVe7F0qmyVKKeBVfcHi5qM+43lnihoMWKUkZKugJ8A== X-Received: by 2002:a05:6402:354a:b0:427:d0e1:8ef3 with SMTP id f10-20020a056402354a00b00427d0e18ef3mr12799717edd.66.1652702382458; Mon, 16 May 2022 04:59:42 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:42 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 16/17] ARM: dts: imx6q-apalis: backlight pwm: Adapt brightness steps Date: Mon, 16 May 2022 13:58:44 +0200 Message-Id: <20220516115846.58328-17-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher Adapt the brightness steps as the backlight doesn't light up for very low duty cycles. Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index 49669caac8b7..62d9d907432c 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -20,8 +20,8 @@ =20 backlight: backlight { compatible =3D "pwm-backlight"; - brightness-levels =3D <0 4 8 16 32 64 128 255>; - default-brightness-level =3D <6>; + brightness-levels =3D <0 45 63 88 119 158 203 255>; + default-brightness-level =3D <4>; enable-gpios =3D <&gpio3 13 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpio_bl_on>; --=20 2.20.1 From nobody Fri May 8 00:09:40 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A52F5C433EF for ; Mon, 16 May 2022 12:01:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243456AbiEPMBG (ORCPT ); Mon, 16 May 2022 08:01:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243366AbiEPMAP (ORCPT ); Mon, 16 May 2022 08:00:15 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC616175AD; Mon, 16 May 2022 04:59:45 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id i40so2959659eda.7; Mon, 16 May 2022 04:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8v3zC+bcVZmBX8bpVu6ShxZSvB7w6D1hvShbIHcKXX8=; b=iwv6B2A9Yc5HYYGnzu0TdMiPeTA/tI/mlOqma9m8t/aG3YLMUSi2e8SNXNXE1/BZOV oPa8lW9o6hjACb5+giJqyASnlGBnn1opye8Rrjhrv+nNN2LUvXX0OnNteELE/oFAOtPK G8o1iEOgIsLE8/AfZTEvDet1esikgr2ysCnofUtbIWL2qp0PoCuofm88vAU93dHngCMQ fyvVHSEUSjxoTIOz0OncmidZmm1O8IwrUXL1yB7dmU9+7GvOmC7pdMhWXmwageWBfgPh yqdYAMeEqvdZ/3WIryMuCBh5cCSsJRzJfayuJrEhVmc/+di87ZS/yfj+VMlGCdPlOa3c VAfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8v3zC+bcVZmBX8bpVu6ShxZSvB7w6D1hvShbIHcKXX8=; b=B1H936o07KIdRg6qkU74FYfDVdFlQ9RpWJGYkKfkpYUCi7dzcR93ojfXfonmAL1JlI RcbICogPE09vAuIAK5HrQZgfT3hkE/6GgpfT52Nzd3Q7tKy9AhxjiaK7sHX5Ay/cEE7I hLqNNVyz1304T/WeXEIZMP4IO4t6rzzGdDCRaFd0WGSxmMAGvPL3ouTnv0OTnFoQ2pPM 8JKCuieJ8OykZAtwnNojAMLIpyljlEDdRLuSAufRFeGMztKNhxrZuGTfPARDGDfs+OqG 8LfFOKCn2xrGMpa+dv/zaPEogg4C1VpLMQvbRDclOKlzeVu+p+128DhgTx/RG6TSKtKM 4zmA== X-Gm-Message-State: AOAM531Tcd7cRTmaIVTWSfkDkBxceLBnIC1gLOwO+mjDgvM1GIEjOwRm BhdN43U5XzkBxWP9La1gdqy91/LtE/Y= X-Google-Smtp-Source: ABdhPJxKX86h4Ns8le0iLrkZPm5IIbaDY1DcGfkoDOXZ1aATJzOtvau51LfII5C11wT0ADcnHhsgig== X-Received: by 2002:a05:6402:26d3:b0:427:c590:ae2 with SMTP id x19-20020a05640226d300b00427c5900ae2mr12978421edd.242.1652702384025; Mon, 16 May 2022 04:59:44 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:43 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 17/17] ARM: dts: imx6q-apalis: Cleanup Date: Mon, 16 May 2022 13:58:45 +0200 Message-Id: <20220516115846.58328-18-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-1-max.oss.09@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher - Sort nodes and properties alphabetical - End all pinctrl node names in grp and avoid using dashes - Change the pmic's node name to pmic@8 per binding requirement - Add sound-dai-cells to the codec node per binding requirement Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 24 +-- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 19 +- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 221 ++++++++++++----------- 3 files changed, 132 insertions(+), 132 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/im= x6q-apalis-eval.dts index 5c4d9a4ec586..b3e169239a19 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -36,31 +36,31 @@ pinctrl-0 =3D <&pinctrl_gpio_keys>; =20 wakeup { - label =3D "Wake-Up"; + debounce-interval =3D <10>; gpios =3D <&gpio1 4 GPIO_ACTIVE_LOW>; + label =3D "Wake-Up"; linux,code =3D ; - debounce-interval =3D <10>; wakeup-source; }; }; =20 reg_pcie_switch: regulator-pcie-switch { compatible =3D "regulator-fixed"; - regulator-name =3D "pcie_switch"; - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; + enable-active-high; gpio =3D <&gpio1 2 GPIO_ACTIVE_HIGH>; + regulator-max-microvolt =3D <1800000>; + regulator-min-microvolt =3D <1800000>; + regulator-name =3D "pcie_switch"; startup-delay-us =3D <100000>; - enable-active-high; status =3D "okay"; }; =20 reg_3v3_sw: regulator-3v3-sw { compatible =3D "regulator-fixed"; - regulator-name =3D "3.3V_SW"; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; regulator-always-on; + regulator-max-microvolt =3D <3300000>; + regulator-min-microvolt =3D <3300000>; + regulator-name =3D "3.3V_SW"; }; }; =20 @@ -124,11 +124,11 @@ status =3D "okay"; }; =20 -®_usb_otg_vbus { +®_usb_host_vbus { status =3D "okay"; }; =20 -®_usb_host_vbus { +®_usb_otg_vbus { status =3D "okay"; }; =20 @@ -177,8 +177,8 @@ =20 /* SD1 */ &usdhc2 { + cd-gpios =3D <&gpio6 14 GPIO_ACTIVE_LOW>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_usdhc2 &pinctrl_sd_cd>; - cd-gpios =3D <&gpio6 14 GPIO_ACTIVE_LOW>; status =3D "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/i= mx6q-apalis-ixora.dts index 97ddf4621bdf..8a12585ab062 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -36,38 +36,37 @@ pinctrl-0 =3D <&pinctrl_gpio_keys>; =20 wakeup { - label =3D "Wake-Up"; + debounce-interval =3D <10>; gpios =3D <&gpio1 4 GPIO_ACTIVE_LOW>; + label =3D "Wake-Up"; linux,code =3D ; - debounce-interval =3D <10>; wakeup-source; }; }; =20 leds { compatible =3D "gpio-leds"; - pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_leds_ixora>; =20 led4-green { - label =3D "LED_4_GREEN"; gpios =3D <&gpio1 17 GPIO_ACTIVE_HIGH>; + label =3D "LED_4_GREEN"; }; =20 led4-red { - label =3D "LED_4_RED"; gpios =3D <&gpio1 21 GPIO_ACTIVE_HIGH>; + label =3D "LED_4_RED"; }; =20 led5-green { - label =3D "LED_5_GREEN"; gpios =3D <&gpio2 1 GPIO_ACTIVE_HIGH>; + label =3D "LED_5_GREEN"; }; =20 led5-red { - label =3D "LED_5_RED"; gpios =3D <&gpio2 2 GPIO_ACTIVE_HIGH>; + label =3D "LED_5_RED"; }; }; }; @@ -129,11 +128,11 @@ status =3D "okay"; }; =20 -®_usb_otg_vbus { +®_usb_host_vbus { status =3D "okay"; }; =20 -®_usb_host_vbus { +®_usb_otg_vbus { status =3D "okay"; }; =20 @@ -177,9 +176,9 @@ =20 /* SD1 */ &usdhc2 { + cd-gpios =3D <&gpio6 14 GPIO_ACTIVE_LOW>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_usdhc2 &pinctrl_sd_cd>; - cd-gpios =3D <&gpio6 14 GPIO_ACTIVE_LOW>; status =3D "okay"; }; =20 diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6= qdl-apalis.dtsi index 62d9d907432c..7a1feaa5bc23 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -89,18 +89,18 @@ =20 reg_module_3v3: regulator-module-3v3 { compatible =3D "regulator-fixed"; - regulator-name =3D "+V3.3"; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; regulator-always-on; + regulator-max-microvolt =3D <3300000>; + regulator-min-microvolt =3D <3300000>; + regulator-name =3D "+V3.3"; }; =20 reg_module_3v3_audio: regulator-module-3v3-audio { compatible =3D "regulator-fixed"; - regulator-name =3D "+V3.3_AUDIO"; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; regulator-always-on; + regulator-max-microvolt =3D <3300000>; + regulator-min-microvolt =3D <3300000>; + regulator-name =3D "+V3.3_AUDIO"; }; =20 reg_ov5640_1v8_d_o_vdd: regulator-ov5640-1v8-d-o-vdd { @@ -125,63 +125,63 @@ =20 reg_usb_otg_vbus: regulator-usb-otg-vbus { compatible =3D "regulator-fixed"; + enable-active-high; + gpio =3D <&gpio3 22 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_regulator_usbotg_pwr>; - regulator-name =3D "usb_otg_vbus"; - regulator-min-microvolt =3D <5000000>; regulator-max-microvolt =3D <5000000>; - gpio =3D <&gpio3 22 GPIO_ACTIVE_HIGH>; - enable-active-high; + regulator-min-microvolt =3D <5000000>; + regulator-name =3D "usb_otg_vbus"; status =3D "disabled"; }; =20 /* on module USB hub */ reg_usb_host_vbus_hub: regulator-usb-host-vbus-hub { compatible =3D "regulator-fixed"; + enable-active-high; + gpio =3D <&gpio3 28 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_regulator_usbhub_pwr>; - regulator-name =3D "usb_host_vbus_hub"; - regulator-min-microvolt =3D <5000000>; regulator-max-microvolt =3D <5000000>; - gpio =3D <&gpio3 28 GPIO_ACTIVE_HIGH>; + regulator-min-microvolt =3D <5000000>; + regulator-name =3D "usb_host_vbus_hub"; startup-delay-us =3D <2000>; - enable-active-high; status =3D "okay"; }; =20 reg_usb_host_vbus: regulator-usb-host-vbus { compatible =3D "regulator-fixed"; + enable-active-high; + gpio =3D <&gpio1 0 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_regulator_usbh_pwr>; - regulator-name =3D "usb_host_vbus"; - regulator-min-microvolt =3D <5000000>; regulator-max-microvolt =3D <5000000>; - gpio =3D <&gpio1 0 GPIO_ACTIVE_HIGH>; - enable-active-high; + regulator-min-microvolt =3D <5000000>; + regulator-name =3D "usb_host_vbus"; vin-supply =3D <®_usb_host_vbus_hub>; status =3D "disabled"; }; =20 sound { compatible =3D "fsl,imx-audio-sgtl5000"; - model =3D "imx6q-apalis-sgtl5000"; - ssi-controller =3D <&ssi1>; audio-codec =3D <&codec>; audio-routing =3D "LINE_IN", "Line In Jack", "MIC_IN", "Mic Jack", "Mic Jack", "Mic Bias", "Headphone Jack", "HP_OUT"; - mux-int-port =3D <1>; + model =3D "imx6q-apalis-sgtl5000"; mux-ext-port =3D <4>; + mux-int-port =3D <1>; + ssi-controller =3D <&ssi1>; }; =20 sound_spdif: sound-spdif { compatible =3D "fsl,imx-audio-spdif"; - model =3D "imx-spdif"; spdif-controller =3D <&spdif>; spdif-in; spdif-out; + model =3D "imx-spdif"; status =3D "disabled"; }; }; @@ -495,104 +495,105 @@ sda-gpios =3D <&gpio4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status =3D "okay"; =20 - pmic: pfuze100@8 { + pmic: pmic@8 { compatible =3D "fsl,pfuze100"; fsl,pmic-stby-poweroff; reg =3D <0x08>; =20 regulators { sw1a_reg: sw1ab { - regulator-min-microvolt =3D <300000>; - regulator-max-microvolt =3D <1875000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <1875000>; + regulator-min-microvolt =3D <300000>; regulator-ramp-delay =3D <6250>; }; =20 sw1c_reg: sw1c { - regulator-min-microvolt =3D <300000>; - regulator-max-microvolt =3D <1875000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <1875000>; + regulator-min-microvolt =3D <300000>; regulator-ramp-delay =3D <6250>; }; =20 sw3a_reg: sw3a { - regulator-min-microvolt =3D <400000>; - regulator-max-microvolt =3D <1975000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <1975000>; + regulator-min-microvolt =3D <400000>; }; =20 swbst_reg: swbst { - regulator-min-microvolt =3D <5000000>; - regulator-max-microvolt =3D <5150000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <5150000>; + regulator-min-microvolt =3D <5000000>; }; =20 snvs_reg: vsnvs { - regulator-min-microvolt =3D <1000000>; - regulator-max-microvolt =3D <3000000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <3000000>; + regulator-min-microvolt =3D <1000000>; }; =20 vref_reg: vrefddr { - regulator-boot-on; regulator-always-on; + regulator-boot-on; }; =20 vgen1_reg: vgen1 { - regulator-min-microvolt =3D <800000>; - regulator-max-microvolt =3D <1550000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <1550000>; + regulator-min-microvolt =3D <800000>; }; =20 vgen2_reg: vgen2 { - regulator-min-microvolt =3D <800000>; - regulator-max-microvolt =3D <1550000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <1550000>; + regulator-min-microvolt =3D <800000>; }; =20 vgen3_reg: vgen3 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <3300000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <3300000>; + regulator-min-microvolt =3D <1800000>; }; =20 vgen4_reg: vgen4 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <1800000>; + regulator-min-microvolt =3D <1800000>; }; =20 vgen5_reg: vgen5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <3300000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <3300000>; + regulator-min-microvolt =3D <1800000>; }; =20 vgen6_reg: vgen6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <3300000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <3300000>; + regulator-min-microvolt =3D <1800000>; }; }; }; =20 codec: sgtl5000@a { compatible =3D "fsl,sgtl5000"; - reg =3D <0x0a>; + #sound-dai-cells =3D <0>; + clocks =3D <&clks IMX6QDL_CLK_CKO>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_sgtl5000>; - clocks =3D <&clks IMX6QDL_CLK_CKO>; + reg =3D <0x0a>; VDDA-supply =3D <®_module_3v3_audio>; VDDIO-supply =3D <®_module_3v3>; VDDD-supply =3D <&vgen4_reg>; @@ -601,15 +602,15 @@ /* STMPE811 touch screen controller */ stmpe811@41 { compatible =3D "st,stmpe811"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_touch_int>; - reg =3D <0x41>; + blocks =3D <0x5>; + id =3D <0>; interrupts =3D <10 IRQ_TYPE_LEVEL_LOW>; - interrupt-parent =3D <&gpio4>; interrupt-controller; - id =3D <0>; - blocks =3D <0x5>; + interrupt-parent =3D <&gpio4>; irq-trigger =3D <0x1>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_touch_int>; + reg =3D <0x41>; /* 3.25 MHz ADC clock speed */ st,adc-freq =3D <1>; /* 12-bit ADC */ @@ -639,9 +640,9 @@ =20 stmpe_adc: stmpe_adc { compatible =3D "st,stmpe-adc"; + #io-channel-cells =3D <1>; /* forbid to use ADC channels 3-0 (touch) */ st,norequest-mask =3D <0x0F>; - #io-channel-cells =3D <1>; }; }; }; @@ -661,9 +662,9 @@ =20 adv_7280: adv7280@21 { compatible =3D "adi,adv7280"; - reg =3D <0x21>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_ipu1_csi0>; + reg =3D <0x21>; status =3D "disabled"; =20 port { @@ -679,8 +680,8 @@ AVDD-supply =3D <®_ov5640_2v8_a_vdd>; DOVDD-supply =3D <®_ov5640_1v8_d_o_vdd>; DVDD-supply =3D <®_ov5640_1v8_d_o_vdd>; - clocks =3D <&clks IMX6QDL_CLK_CKO2>; clock-names =3D "xclk"; + clocks =3D <&clks IMX6QDL_CLK_CKO2>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_cam_mclk>; /* These GPIOs are muxed with the iomuxc node */ @@ -778,73 +779,73 @@ }; =20 &uart1 { + fsl,dte-mode; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>; - fsl,dte-mode; uart-has-rtscts; status =3D "disabled"; }; =20 &uart2 { + fsl,dte-mode; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_uart2_dte>; - fsl,dte-mode; uart-has-rtscts; status =3D "disabled"; }; =20 &uart4 { + fsl,dte-mode; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_uart4_dte>; - fsl,dte-mode; status =3D "disabled"; }; =20 &uart5 { + fsl,dte-mode; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_uart5_dte>; - fsl,dte-mode; status =3D "disabled"; }; =20 &usbotg { + disable-over-current; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_usbotg>; - disable-over-current; status =3D "disabled"; }; =20 /* MMC1 */ &usdhc1 { - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; - cd-gpios =3D <&gpio4 20 GPIO_ACTIVE_LOW>; - vqmmc-supply =3D <®_module_3v3>; bus-width =3D <8>; + cd-gpios =3D <&gpio4 20 GPIO_ACTIVE_LOW>; disable-wp; no-1-8-v; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; + vqmmc-supply =3D <®_module_3v3>; status =3D "disabled"; }; =20 /* SD1 */ &usdhc2 { - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_usdhc2>; - vqmmc-supply =3D <®_module_3v3>; bus-width =3D <4>; disable-wp; no-1-8-v; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_usdhc2>; + vqmmc-supply =3D <®_module_3v3>; status =3D "disabled"; }; =20 /* eMMC */ &usdhc3 { - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_usdhc3>; - vqmmc-supply =3D <®_module_3v3>; bus-width =3D <8>; no-1-8-v; non-removable; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_usdhc3>; + vqmmc-supply =3D <®_module_3v3>; status =3D "okay"; }; =20 @@ -861,49 +862,49 @@ &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 >; =20 - pinctrl_apalis_gpio1: gpio2io04grp { + pinctrl_apalis_gpio1: apalisgpio1grp { fsl,pins =3D < MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0 >; }; =20 - pinctrl_apalis_gpio2: gpio2io05grp { + pinctrl_apalis_gpio2: apalisgpio2grp { fsl,pins =3D < MX6QDL_PAD_NANDF_D5__GPIO2_IO05 0x130b0 >; }; =20 - pinctrl_apalis_gpio3: gpio2io06grp { + pinctrl_apalis_gpio3: apalisgpio3grp { fsl,pins =3D < MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x130b0 >; }; =20 - pinctrl_apalis_gpio4: gpio2io07grp { + pinctrl_apalis_gpio4: apalisgpio4grp { fsl,pins =3D < MX6QDL_PAD_NANDF_D7__GPIO2_IO07 0x130b0 >; }; =20 - pinctrl_apalis_gpio5: gpio6io10grp { + pinctrl_apalis_gpio5: apalisgpio5grp { fsl,pins =3D < MX6QDL_PAD_NANDF_RB0__GPIO6_IO10 0x130b0 >; }; =20 - pinctrl_apalis_gpio6: gpio6io09grp { + pinctrl_apalis_gpio6: apalisgpio6grp { fsl,pins =3D < MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09 0x130b0 >; }; =20 - pinctrl_apalis_gpio7: gpio1io02grp { + pinctrl_apalis_gpio7: apalisgpio7grp { fsl,pins =3D < MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x130b0 >; }; =20 - pinctrl_apalis_gpio8: gpio1io06grp { + pinctrl_apalis_gpio8: apalisgpio8grp { fsl,pins =3D < MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x130b0 >; @@ -996,7 +997,7 @@ >; }; =20 - pinctrl_gpio_bl_on: gpioblon { + pinctrl_gpio_bl_on: gpioblongrp { fsl,pins =3D < MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x1b0b0 >; @@ -1141,7 +1142,7 @@ >; }; =20 - pinctrl_mmc_cd: gpiommccdgrp { + pinctrl_mmc_cd: mmccdgrp { fsl,pins =3D < /* MMC1 CD */ MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x000b0 @@ -1172,35 +1173,35 @@ >; }; =20 - pinctrl_regulator_usbh_pwr: gpioregusbhpwrgrp { + pinctrl_regulator_usbh_pwr: regusbhpwrgrp { fsl,pins =3D < /* USBH_EN */ MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x0f058 >; }; =20 - pinctrl_regulator_usbhub_pwr: gpioregusbhubpwrgrp { + pinctrl_regulator_usbhub_pwr: regusbhubpwrgrp { fsl,pins =3D < /* USBH_HUB_EN */ MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x0f058 >; }; =20 - pinctrl_regulator_usbotg_pwr: gpioregusbotgpwrgrp { + pinctrl_regulator_usbotg_pwr: regusbotgpwrgrp { fsl,pins =3D < /* USBO1 power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x0f058 >; }; =20 - pinctrl_reset_moci: gpioresetmocigrp { + pinctrl_reset_moci: resetmocigrp { fsl,pins =3D < /* RESET_MOCI control */ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x0f058 >; }; =20 - pinctrl_sd_cd: gpiosdcdgrp { + pinctrl_sd_cd: sdcdgrp { fsl,pins =3D < /* SD1 CD */ MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x000b0 @@ -1220,13 +1221,22 @@ >; }; =20 - pinctrl_touch_int: gpiotouchintgrp { + pinctrl_touch_int: touchintgrp { fsl,pins =3D < /* STMPE811 interrupt */ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0 >; }; =20 + /* Additional DTR, DSR, DCD */ + pinctrl_uart1_ctrl: uart1ctrlgrp { + fsl,pins =3D < + MX6QDL_PAD_EIM_D23__UART1_DCD_B 0x1b0b0 + MX6QDL_PAD_EIM_D24__UART1_DTR_B 0x1b0b0 + MX6QDL_PAD_EIM_D25__UART1_DSR_B 0x1b0b0 + >; + }; + pinctrl_uart1_dce: uart1dcegrp { fsl,pins =3D < MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1 @@ -1244,15 +1254,6 @@ >; }; =20 - /* Additional DTR, DSR, DCD */ - pinctrl_uart1_ctrl: uart1ctrlgrp { - fsl,pins =3D < - MX6QDL_PAD_EIM_D23__UART1_DCD_B 0x1b0b0 - MX6QDL_PAD_EIM_D24__UART1_DTR_B 0x1b0b0 - MX6QDL_PAD_EIM_D25__UART1_DSR_B 0x1b0b0 - >; - }; - pinctrl_uart2_dce: uart2dcegrp { fsl,pins =3D < MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1 @@ -1306,7 +1307,7 @@ >; }; =20 - pinctrl_usdhc1_4bit: usdhc1grp_4bit { + pinctrl_usdhc1_4bit: usdhc1-4bitgrp { fsl,pins =3D < MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071 MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071 @@ -1317,7 +1318,7 @@ >; }; =20 - pinctrl_usdhc1_8bit: usdhc1grp_8bit { + pinctrl_usdhc1_8bit: usdhc1-8bitgrp { fsl,pins =3D < MX6QDL_PAD_NANDF_D0__SD1_DATA4 0x17071 MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17071 --=20 2.20.1