From patchwork Wed Jun 15 11:49:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882225 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CE0B1C43334 for ; Wed, 15 Jun 2022 11:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vKOKBwPpS9krnXL9uhRX9N0O1TpFSoPt4Sqa72nNvo0=; b=sOMgpR/OLVwFo4 rlqcI6fBw1LjxFhqGvdxB2KiCdTUPjEJHYwW1qgCwmNb2x7VbcVgw3mkPLi8GR5JBNg5Knb31/9PG 6Ov3gXw+LPVD7ufdDN/Has/nFxy+xyPVkr4wVyCStMksh/6XHMdKueIIbxLKehE4nIwvI7E52297a YCEYnEfPNbMnO3bOL/Q7bdoB56OjF0AbtDliMtEAes0fQ0gUHOiyr1snO9X1ek0jRr3cXbgXrgegi AfbxBdtfUpoC7r4KzQWg6D8WGGY4SLjm4upf9TANz0lEg1wjIT3nBZLTu1Fyv/udJf3cLdsaTSqZo pmUN3oJTKDfJ3cLyh+8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY2-00EGnt-Cs; Wed, 15 Jun 2022 11:50:58 +0000 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXs-00EGhy-QM for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:50 +0000 Received: by mail-ed1-x533.google.com with SMTP id 25so15702578edw.8 for ; Wed, 15 Jun 2022 04:50:47 -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=0gSK28S9ceVWUz1iTMdpdovJKFOpKauEhwDZwMPNaq0=; b=mc6yf626eu1cSbVnBZIijiEYVcysbhuTVxaZwQAhn9/PlGqp8O+wC0yd90icvQgSr7 yLoVasclAJN7p9a709yXq/PrAXEmyhpisJAJgL1DZv2laPVR3rAVfjCL0YNd2oej6e98 tiA0wfzJY2pn1wiVHX6L/I2Wq7eKh7QWeLP1vktKxCikhW/YDQvl8/X7l6isqPN6baSr 6oryz9DQMBkYG9FzUQxVsOs3l9V5dMLK9frm4I0fhuoxfO+K0z6WSwBT/0YXzoyDBnfW 7+Ivi6HZaIZpwSClcDKxXkkQkXU7BeDF36nGaCdJIWUpgcDoiRljcIZiGgMYgrfut+xA gDWA== 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=0gSK28S9ceVWUz1iTMdpdovJKFOpKauEhwDZwMPNaq0=; b=kjpCyyjqweFeQ/ht4l72R3EQyDlZwE9Of68ARgs2migXrp93MEx0msfJET4M0FpZvj MJoUWe2rFl4+zOXOuzmCKgfyf16SS6Oo6CNbwRZmIbBbNrNppCjRDUok/OIQuQ4sabM6 RohEOlIodefuyVngn5n844kdxfOhw9IKnX5R5I0U6lO63+rSzwdSsAxkT//juxdoxdzC LopVBqaecrUmQvsUJZTl3mo4sGUQZF84wifdZbo3BugLW04ayH+9SWrVPu8z43iBO5Q1 LrJ9M6vM9gRRGaj/IFkw4U3Ltf5rUcZCzWyLFDda40cXlpZOjE8wfxoj0wYP03IkJcnw f2sA== X-Gm-Message-State: AOAM530ljI79ns2Gfhrn9aFU3XSOim4klDqM7BlKVCZzvQGLf/jjBNi0 ZX5hz3MH0D23YpzK+NUlPv0= X-Google-Smtp-Source: AGRyM1tfWnczt3nKFVgd48r566OO1mcDxasbAggeDrC0QV6PFRwbkYAuEAppqgEf5CQB7ETe8KWJKg== X-Received: by 2002:a05:6402:428a:b0:42e:8f7e:1638 with SMTP id g10-20020a056402428a00b0042e8f7e1638mr11948815edc.228.1655293846435; Wed, 15 Jun 2022 04:50:46 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:45 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Ahmad Fatoum , 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 v2 02/18] Revert "ARM: dts: imx6qdl-apalis: Avoid underscore in node name" Date: Wed, 15 Jun 2022 13:49:50 +0200 Message-Id: <20220615115006.45672-3-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045048_882698_A2CAB10D X-CRM114-Status: GOOD ( 13.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 name") Reviewed-by: Ahmad Fatoum Signed-off-by: Max Krummenacher --- Changes in v2: - add Ahmad's reviewed-by tag 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/imx6qdl-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 = <4>; - stmpe_touchscreen: stmpe-touchscreen { + stmpe_touchscreen: stmpe_touchscreen { compatible = "st,stmpe-ts"; /* 8 sample average control */ st,ave-ctrl = <3>; @@ -332,7 +332,7 @@ st,touch-det-delay = <5>; }; - stmpe_adc: stmpe-adc { + stmpe_adc: stmpe_adc { compatible = "st,stmpe-adc"; /* forbid to use ADC channels 3-0 (touch) */ st,norequest-mask = <0x0F>; From patchwork Wed Jun 15 11:49:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882226 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 212A7CCA473 for ; Wed, 15 Jun 2022 11:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8Jl+7h+cpFfaaIRX8NThLULs4a7PH/lZ038Q7n7xyaE=; b=tVBuRdwKW7hwXd Om0f389mZZeORD4NdE5myYM3Fk2iYs0zDubT9i0jFURAUt4mwzlGmg1N5tVCpwStZMxois4hIiEuu ZvlB5qZMG762WM6cJJMXS3VKMsPCwt+hgBxV6xAMNGkUpuEM1iseqhwStt9WrQCvQ4Q8dMkGu/iUl ipjCBH+hsbkC2VhnkKoSbhsfl13iofCXunXDW4ne/b2fQ8xfZQxl5/O/GbMq31JU3EiS+knqepz8B XYsPgUOiNJZk8qacPYE4nCfj2weuuIk2Cj3RFJVVZvSwbx7M7xxdfsKGWGfiLFSw/6xbNTB8D7yFW 14CbW8yCqrIdz5ie4U9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RYI-00EGzV-4k; Wed, 15 Jun 2022 11:51:14 +0000 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXt-00EGiD-TK for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:51 +0000 Received: by mail-ej1-x62e.google.com with SMTP id v1so22644905ejg.13 for ; Wed, 15 Jun 2022 04:50:48 -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=hbuNbuFRMh77FD92rjpod8WPzcoxND//BRsYSF6PCGY=; b=G2vQKVJJTGv6bRmCu53yq7Jrj1h534tzPvr+gDeGvNl2Dg/98bS1wbslkXS5p4V8/c JpOG+JazF/Fielamogug1wf5Jvnj9fEl1izxp4E1RDqr6qcmuAxY9KYXFxwkpzHH8MFx PGr6z9Z9Z2wQRpGhB0rP3bxV+7MrAtCVZ0XCtE1iVewON3I6FBwvHjpDdlRtG/P5Ifbv fLDPn3oNgvx4AhGqxzhharWf0/8QSIq75Van5/9ASiG8Qw+qlcWnHlfdIG6iGAaTGK8W yPhEiwcleOKVNu3nyxVTZLkCnd0HtHHtq9m5YReM71W3IFprXXHuWZYQeVzOEMOmct1V 2z1Q== 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=hbuNbuFRMh77FD92rjpod8WPzcoxND//BRsYSF6PCGY=; b=fEWzDD3y28ftnMzrz2AghrvLuMTcWKzsAdIGq4wc/8xDzPJ59vr6Y2cpBf2ZrgBiAL cGkjtgE11uJnNAdHpmSFxcKoY9VpLvREBl8SUi8EdcW9ZvpN6EqGMssc0l4wEW4HwOCc 83jj6FKIbVQocfHbZq3uOPblPyoxifVpFhc7PDGTUpjI1DTJq6sP5rsq+b6WUinIgQQk 563BBK7Q5/fiEsmhZGpjBzti8MMQubN8y2z0wWRBohsWAtdt3QYpJSvjjOYRCbP4Wp0Y oha9S4PZiuNu+UAlQNeA8OFErFe69UOr3c2H2U2oadNlE+hfSX/0cUcigK392zAOCATx bgBg== X-Gm-Message-State: AOAM532YkEq4Uy9VPr3I8KcKYPshu1k+xYyK/89HJ3fz4Fq7/Qu/Ilp6 7y2g/1E9WJyQ103Hz6gtvsU= X-Google-Smtp-Source: ABdhPJynn2DiZLlWxu7Uy+3g/jgm361kQsgU3JoPC9+DJna0YxU05sUfKEd3ntz3FvjjHgObffh9kg== X-Received: by 2002:a17:907:7f2a:b0:711:dbde:19a1 with SMTP id qf42-20020a1709077f2a00b00711dbde19a1mr8471813ejc.87.1655293847501; Wed, 15 Jun 2022 04:50:47 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:47 -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 v2 03/18] ARM: dts: imx6q-apalis: Add gpio-line-names Date: Wed, 15 Jun 2022 13:49:51 +0200 Message-Id: <20220615115006.45672-4-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045049_995970_DF024612 X-CRM114-Status: GOOD ( 11.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- (no changes since v1) 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/imx6qdl-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 = "disabled"; }; +&gpio1 { + gpio-line-names = "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 = "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 = "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 = "", + "", + "", + "", + "", + "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 = "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 = "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 = "", + "", + "", + "", + "", + "", + "", + "", + "", + "MXM3_99", + "MXM3_85", + "MXM3_217", + "MXM3_215"; +}; + &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; From patchwork Wed Jun 15 11:49:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882227 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0E96C433EF for ; Wed, 15 Jun 2022 11:52:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2kqgGPt/9TZwCgTyoSAYxDgWxzwrDrZHxCGlRSl0K/Y=; b=37Vmco3aCPAHKr kvW9cOSZjjM36CCwd+FtpbtAa49EVVUGVN6EODFIa91pKsaZPoxenL6MCZIDHvhGjJkswKrDIVnNJ 2nFYlMg5g8Nra9KQh+CFhRqhvrxuDgKWtjCU/yykkTjC1IYwmkuEamMMbT+QUSXFXkAZCyra74fFC NdHuxNTxkeUSs/HHCorBGbXpY5u32Gdr0cVVx0Iwh4znNjEeZZ0F1vCgLT9nKM33HLytnCMqfYuNs jQxfjqT97xweuvje173bSjDYvB4RQSbyUFd4XVN+ZeAuI9LIa2dPVTDq1oSO/Q33UVG5sfc2s9fNv AWn2KrRJhkzYWP7XS2Hg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RYa-00EH82-Mm; Wed, 15 Jun 2022 11:51:33 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXu-00EGim-Fv for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:51 +0000 Received: by mail-ed1-x529.google.com with SMTP id eo8so7522391edb.0 for ; Wed, 15 Jun 2022 04:50:49 -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=6suKy/7DRYloQtzVBGS1osgjJ67TW7jgZjipxxbY9yQ=; b=gke4V+Z/RKABnEbZgf/+QUsdUxDyB1a+O2y3AAyzhwRpc3IwxvK/LqOFuaTXfbuhLk I93XSx4kMV3F2d4GwupCUgbs9E2TYwdfIjwJUTCJkmA5idIaNomntclg+Q7AZyZ9K+Tk wtC7+kZRWkx2LeJ2lVoWjy4dEQ1ujlu/IPZYgdjf9H1IlwvCCboioTwOf2a1fiorEiNq QytHSMWCn4H87N213GbGchUfGYbKrFucjgLg3zLY9IZXIV11pHIOWMjugYPDW9xsbkKL xaRk1eNC64yU+SHmbcsoxM4Gza2P3BOWFGzfilXhXZ3Mcq/rSNycBrzzHzVDlvPY/2hL VcIw== 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=6suKy/7DRYloQtzVBGS1osgjJ67TW7jgZjipxxbY9yQ=; b=coErzZmeujOmzrzgqI2IlYsGVyV+r8mu5c0RuBm60VGldds2kR5QjNKeHxutKUr/x3 5AXOHjz6SZuFfAa5SZtOjwa3o0k5N6tx+ej+KMfEKh4mh+ybv0a97h60DiCkYT6dYgQn +O3IYI4BiexZim9k8AFT7F7dOIEgP6/M6bezsIHlGE5k/Lj/X3tpCpV5aqdIaQQYxOpv swFcvZDS/sgI259IyyO1d6srVNYBZ0QBP/TYmuZHecfHaTsW5z0hLpUpJnGyknOL2xXC DNna9XhnSBQEXJnCDK+vBIgaCRyq1cVrifwhbjSCBwNiPyOHbm0z3JBEmGlikkz9FjUp booQ== X-Gm-Message-State: AJIora8GgHtXvAipWIHsTbqgnbJp0n8NNisvu2ecv2eZxqaTDTD2Gm0B Fe90X9fJcItaDOHBTBqyTyI= X-Google-Smtp-Source: AGRyM1tWZHi3+4csr+oJAFLiB79X8fyIX4WI46M+4gppDpcrY2ffamQSIlWSeLxNkanslCpNyHqwjA== X-Received: by 2002:a05:6402:380a:b0:435:2019:52ab with SMTP id es10-20020a056402380a00b00435201952abmr3191545edb.44.1655293848675; Wed, 15 Jun 2022 04:50:48 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:48 -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 v2 04/18] ARM: dts: imx6q-apalis: Command pmic to standby for poweroff Date: Wed, 15 Jun 2022 13:49:52 +0200 Message-Id: <20220615115006.45672-5-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045050_577690_55FD8AA9 X-CRM114-Status: GOOD ( 12.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- (no changes since v1) 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/imx6qdl-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 = "disabled"; }; +&clks { + fsl,pmic-stby-poweroff; +}; + /* Apalis SPI1 */ &ecspi1 { cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>; @@ -387,6 +391,7 @@ pmic: pfuze100@8 { compatible = "fsl,pfuze100"; + fsl,pmic-stby-poweroff; reg = <0x08>; regulators { From patchwork Wed Jun 15 11:49:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882228 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6133C433EF for ; Wed, 15 Jun 2022 11:53:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1AWQAkC0PNZAalT/FziNJsPDUiwrHi+kbHCf/bpQxPs=; b=Twiy3kEAjmX2Q3 cN5tG2jCOb6a51ta+UtkGYTGQjVTIbmA0wMefQPUqZZF5zmzNMmxPaP4PZB3F/6XjQvACAstsUkIC H5yJ9Iv/HjVDgZGGyCDFWXQ2BMCHGZHNlUCUBWpXvsPuPdtFOcIJrkEUtQeF2XSFbXP+N44w0epBC MHrgV0srJ6U0LnSWRnsVZFKN2GIUZr+xsogYuN5StLtsNOV2vyN6WocaQoo8iC87P2kV209zqK7H8 sZbvXoexyoJILafHTCbYXvw5xchOOAJdbkyErylBlUlBrvOsd+mb6StcWx3jGNhtbwj6TpSW2yvET BiRl83eJmqhitZY0+j2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RZ3-00EHLo-Ih; Wed, 15 Jun 2022 11:52:02 +0000 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXw-00EGjG-8o for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:54 +0000 Received: by mail-ej1-x636.google.com with SMTP id u12so22670965eja.8 for ; Wed, 15 Jun 2022 04:50:51 -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=9VK2x6WMlQOsMX/qzEBmj8G8Lt+go8cqgsGzVy5IIkw=; b=UG8JIX0EwCemg1I9XYaIHHRMsqncUDk3eOqtyR/Qvke5Veqcisqi5ShonY7P7YDXaN a7021Hi6bfBXmflAe4+4xqAgRqyeA5movJdh75uDeEJsiebm+se/4TCe47Ermzi1Aohw TDs769CMQphp7p0b8Ox+Np7Yn6AghowPIZvBs1xkyc1+G58XsTtjhwg3z2n+KbJAkF5v /sUhqoQ7vG011C3PEPtYze63MuhLtN69S6paRhQdi7CVqZrqLYLPC0u/IKlWbOTgvRr4 oCZ5nEgVvaTMkauAJs3KUjYbxuQPx1VnTC6++DT63NY4t6UeT/cwT9+ihv6tb18xGXY5 dsiA== 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=9VK2x6WMlQOsMX/qzEBmj8G8Lt+go8cqgsGzVy5IIkw=; b=qfwirwAzeVLBM/dqkQCp0zqMwkOy7dgul4Zx6jLjdboDwMJp9YnPtfMPl+8Rh4P982 cblgrkyKYmpwFUTDCQA5oez9lZFanCSK83Y0JqJ7hpg7ufkWTR9uxy/ubMkm58aLyOo2 zRuUwYNJRIWGUgdZSaWtrV7WhrAKtnmgorDqBRV81oZHnW+xz8zIpB5fx8qwhSZ3fHgR SLu6HejLL7a5e4qOPK62wHfirB3kAM20eVrqqXgjPRzqb8nz3a5JspscoJpizEcEw8B3 mncZnWfvo6+6BhGT+WlG8cZAq+KRPnN794uWm2FrRVF4aRIrNfJdhuMim7/xYQRsJPth vxkw== X-Gm-Message-State: AOAM532FjsPN71lZqtiIYYq95igTv093Y4L0ZoBaqD2V1xjj+rkJcCFU ofZ/Od4EkM+75jaSN0x55xQ= X-Google-Smtp-Source: ABdhPJx9YLH7N40aWdAfQ6zhe8WYwOBdWTowC0OW4oAkecCO3ZPOnsUZioM3Nn9Y5pFWVmNVEE5gsg== X-Received: by 2002:a17:906:d8b8:b0:711:c73e:906b with SMTP id qc24-20020a170906d8b800b00711c73e906bmr8587923ejb.225.1655293849950; Wed, 15 Jun 2022 04:50:49 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:49 -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 v2 05/18] ARM: dts: imx6q-apalis: Move parallel rgb interface to SoM dtsi Date: Wed, 15 Jun 2022 13:49:53 +0200 Message-Id: <20220615115006.45672-6-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045052_383808_1D69EAB8 X-CRM114-Status: GOOD ( 13.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- (no changes since v1) 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/imx6q-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 @@ }; }; - lcd_display: disp0 { - compatible = "fsl,imx-parallel-display"; - #address-cells = <1>; - #size-cells = <0>; - interface-pix-fmt = "rgb24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ipu1_lcdif>; - status = "okay"; - - port@0 { - reg = <0>; - - lcd_display_in: endpoint { - remote-endpoint = <&ipu1_di1_disp1>; - }; - }; - - port@1 { - reg = <1>; - - lcd_display_out: endpoint { - remote-endpoint = <&lcd_panel_in>; - }; - }; - }; - - panel: panel { - /* - * edt,et057090dhu: EDT 5.7" LCD TFT - * edt,et070080dh6: EDT 7.0" LCD TFT - */ - compatible = "edt,et057090dhu"; - backlight = <&backlight>; - power-supply = <®_3v3_sw>; - - port { - lcd_panel_in: endpoint { - remote-endpoint = <&lcd_display_out>; - }; - }; - }; - reg_pcie_switch: regulator-pcie-switch { compatible = "regulator-fixed"; regulator-name = "pcie_switch"; @@ -106,13 +64,6 @@ }; }; -&backlight { - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; - power-supply = <®_3v3_sw>; - status = "okay"; -}; - &can1 { xceiver-supply = <®_3v3_sw>; status = "okay"; @@ -164,10 +115,6 @@ status = "okay"; }; -&ipu1_di1_disp1 { - remote-endpoint = <&lcd_display_in>; -}; - &ldb { status = "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 @@ }; }; - lcd_display: disp0 { - compatible = "fsl,imx-parallel-display"; - #address-cells = <1>; - #size-cells = <0>; - interface-pix-fmt = "rgb24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ipu1_lcdif>; - status = "okay"; - - port@0 { - reg = <0>; - - lcd_display_in: endpoint { - remote-endpoint = <&ipu1_di1_disp1>; - }; - }; - - port@1 { - reg = <1>; - - lcd_display_out: endpoint { - remote-endpoint = <&lcd_panel_in>; - }; - }; - }; - - panel: panel { - /* - * edt,et057090dhu: EDT 5.7" LCD TFT - * edt,et070080dh6: EDT 7.0" LCD TFT - */ - compatible = "edt,et057090dhu"; - backlight = <&backlight>; - - port { - lcd_panel_in: endpoint { - remote-endpoint = <&lcd_display_out>; - }; - }; - }; - leds { compatible = "gpio-leds"; @@ -114,12 +73,6 @@ }; }; -&backlight { - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; - status = "okay"; -}; - &can1 { status = "okay"; }; @@ -164,10 +117,6 @@ status = "okay"; }; -&ipu1_di1_disp1 { - remote-endpoint = <&lcd_display_in>; -}; - &ldb { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-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 @@ }; }; - lcd_display: disp0 { - compatible = "fsl,imx-parallel-display"; - #address-cells = <1>; - #size-cells = <0>; - interface-pix-fmt = "rgb24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ipu1_lcdif>; - status = "okay"; - - port@0 { - reg = <0>; - - lcd_display_in: endpoint { - remote-endpoint = <&ipu1_di1_disp1>; - }; - }; - - port@1 { - reg = <1>; - - lcd_display_out: endpoint { - remote-endpoint = <&lcd_panel_in>; - }; - }; - }; - - panel: panel { - /* - * edt,et057090dhu: EDT 5.7" LCD TFT - * edt,et070080dh6: EDT 7.0" LCD TFT - */ - compatible = "edt,et057090dhu"; - backlight = <&backlight>; - - port { - lcd_panel_in: endpoint { - remote-endpoint = <&lcd_display_out>; - }; - }; - }; - leds { compatible = "gpio-leds"; @@ -113,12 +72,6 @@ }; }; -&backlight { - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; - status = "okay"; -}; - &can1 { status = "okay"; }; @@ -168,10 +121,6 @@ status = "okay"; }; -&ipu1_di1_disp1 { - remote-endpoint = <&lcd_display_in>; -}; - &ldb { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-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 = "pwm-backlight"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; - pwms = <&pwm4 0 5000000>; + brightness-levels = <0 127 191 223 239 247 251 255>; + default-brightness-level = <1>; enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>; + power-supply = <®_module_3v3>; + pwms = <&pwm4 0 5000000>; status = "disabled"; }; + lcd_display: disp0 { + compatible = "fsl,imx-parallel-display"; + #address-cells = <1>; + #size-cells = <0>; + interface-pix-fmt = "rgb24"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_lcdif>; + status = "disabled"; + + port@0 { + reg = <0>; + + lcd_display_in: endpoint { + remote-endpoint = <&ipu1_di1_disp1>; + }; + }; + + port@1 { + reg = <1>; + + lcd_display_out: endpoint { + remote-endpoint = <&lcd_panel_in>; + }; + }; + }; + + panel_dpi: panel-dpi { + compatible = "edt,et057090dhu"; + backlight = <&backlight>; + + status = "disabled"; + + port { + lcd_panel_in: endpoint { + remote-endpoint = <&lcd_display_out>; + }; + }; + }; + reg_module_3v3: regulator-module-3v3 { compatible = "regulator-fixed"; regulator-name = "+V3.3"; @@ -553,6 +595,10 @@ status = "disabled"; }; +&ipu1_di1_disp1 { + remote-endpoint = <&lcd_display_in>; +}; + &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; From patchwork Wed Jun 15 11:49:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882231 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7E161C43334 for ; Wed, 15 Jun 2022 11:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UtkcWGTlcl5dGXI8KTN0+KBgwSNNKPIAzUsTp5DWUyA=; b=AeXGJfN/y5rQJ3 RIADg7EDRiPzCgQt26FfUPmqySm4ECCoNUY59+STg83HJV+0jY0NMRt0lZ6Ku2IplYFoO+pA3Gq8W POX/UNdZNkyHqwJ8i4Kpq1mNTMvjfBQPJJeu27+G8E3wuyG+CovVHYpeFa2JC31vJY96gJg3Tp0oi zX0Z3LrkWlBa/JRYR9aQpKekcZ1oeH9OQS34h7cNSy3Bt9dCPmyT2X7YIPRrUWj7wLqQYW32H2ebr ExcnT70GB/ypA5fbjYzFRX+Y5Y4ftyGYme4rxwB+KswTR3W9fcu17H2WaD84OKLj3CZi5oHPn+jXz Y90lJzd1MCxzYHJmYHRA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RZU-00EHh3-6Y; Wed, 15 Jun 2022 11:52:28 +0000 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXx-00EGji-Fm for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:54 +0000 Received: by mail-ej1-x62a.google.com with SMTP id kq6so22684128ejb.11 for ; Wed, 15 Jun 2022 04:50:52 -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=Guka/3EkONPT7ruv1yB3htE4jlDLL09ghQ5WYAu5sy8=; b=K+DHI1DViDB+tXFVTvrhY3VUhuw/yC8eno48Q/6Cb0gqU2yhHqNX4x78GyzWWcvzFK PazxFdHnHYc9sVYbQdrXbBIpeKez1D/6dv1hkKQl+C7ZQI1YnoHQYbhkrhAxUg+5+XeL JyNTMavIHvbgr1Eo4SzcWzXUw+rtFuHxwRyyRogCbkWaxLmcEzWvY2VVggUXZmO566OE jND4Z1ZujLsDlXr3JtgsaSf2lZXDZMyDSHaiq1aPZvRbqnEp0Pg7LH7fxu6A1sBJY9qW Gw6B+XRIifa/fqlKCeZXenmgHpOL0SWrKOuMBJ9uY5szzb8Ydg51Owl16tpPUjufujUl Qe5w== 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=Guka/3EkONPT7ruv1yB3htE4jlDLL09ghQ5WYAu5sy8=; b=7iIcVERgHOv681DmPZptZ4YXRG6U+PaC+SPJBoUUgwFXMJ/3HmsYG7iy9x5NNgpPzP mLa2C7axM/DgOus6V0t9einE/Hf/xgqosfUlEhzh3oseVPZf8kf5qb/addahTEf8XJtu 607rs1cbQnb1W+Af/If2w/BpV0wutXUCs5dHj9jjGAr9YC556ecdm1nATi6/GO3mWBLb NQk3US59mydLbjq+zpA9+6KMllO1qUDVM26GhLuuE0E4fFU8DvMH08k9n13FV7Bp9DBy JGk3RjSyLmSDmu09qWSeUBvM/vJBJMbT5hV3IcQE4Emi4DlIKUoc4RLHgHNvAYkS3rYH /JKg== X-Gm-Message-State: AOAM531pyYl2UOHQUOA59+xjGsgegYK1Q9oXo2GjbI5+77TJMioYxO+Z zh+PBL+DyEPPt+DH5A6xMkk= X-Google-Smtp-Source: ABdhPJx4vH7IbXYyyAkivG+QfNnx5PEYLWveBTWQWpe+ymQB7/5adphCeYUi6oCABDjtTtSDxB+jBQ== X-Received: by 2002:a17:906:33cc:b0:711:609f:8a63 with SMTP id w12-20020a17090633cc00b00711609f8a63mr8782057eja.128.1655293851154; Wed, 15 Jun 2022 04:50:51 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:50 -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 v2 06/18] ARM: dts: imx6q-apalis: Move pinmux groups to SoM dtsi Date: Wed, 15 Jun 2022 13:49:54 +0200 Message-Id: <20220615115006.45672-7-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045053_571511_2F84B788 X-CRM114-Status: GOOD ( 14.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- (no changes since v1) 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/imx6q-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 = <&gpio6 14 GPIO_ACTIVE_LOW>; status = "okay"; }; - -&iomuxc { - /* - * Mux the Apalis GPIOs - */ - pinctrl-names = "default"; - pinctrl-0 = <&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 @@ }; &iomuxc { - /* - * Mux the Apalis GPIOs - */ - pinctrl-names = "default"; - pinctrl-0 = <&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 = < MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x1b0b0 diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-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 @@ }; &iomuxc { - /* Mux the Apalis GPIOs */ - pinctrl-names = "default"; - pinctrl-0 = <&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 = < MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x1b0b0 diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-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 @@ }; &iomuxc { + /* Mux the Apalis GPIOs */ + pinctrl-names = "default"; + pinctrl-0 = <&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 = < MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0 From patchwork Wed Jun 15 11:49:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882232 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 48002C43334 for ; Wed, 15 Jun 2022 11:54:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jNDcc2zHKMq6ngjKH5DBSE1k18/bEAYqiZAJgc+ptBU=; b=FmeyEu/d3pm+BF Ib3a7T5cr1JcvliV0uiSbSS8ZtmgGPgp11Eop9iMWClJulXeiuQxRBNLY+ug3cyf6JvQ8Ug8c1lP3 tSPnSwPtSPaASYs9Cb8ibabPaDqFAz0oBkVQ51Ma5Yady5GWh6Rqmj3gpmsMdF+LH8k3g3Xl6UK8U QdeKNT5eGL+McuwOIyiL/tmc9GEcLtvvTX1MiRov+Fc0yEgzAJlKd6qe5onkL0LxYUsohC9QcteFT WBZUN5ZLAzjcf+oedgLDopTksQ4CCKr3Ixun+htiHIWaxV2scoiJ4gHbez8zzEP0AtFagVGUgIrV5 BCHek7z3/2ntRnYRx0jw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RZo-00EHss-D1; Wed, 15 Jun 2022 11:52:48 +0000 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXy-00EGkI-NC for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:56 +0000 Received: by mail-ej1-x634.google.com with SMTP id s12so22725614ejx.3 for ; Wed, 15 Jun 2022 04:50:53 -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=pMf+gn9LvzLdD1VC7pS9QUk31VCqeS4SgKv1PVXD/FU=; b=G+pqPrhvrERMKQE8/kFpbxSRzKOfTs8FDlgIjxKoXAwZVy/cnapLbut34HEdCWYCC0 RwbN/VCBZyxwb5p846sSBjBoR7oXijGTDrlUMhXLusrnEHQzg0lITt3hhj3C82OWBwsA Bfl8n2rH6ULh52Ya+XJCyGtPMch5fUUT/HbjVxk9riiODq6vkd3I/n9N1BTDXFo6qC/g FQsMq8B5fs2rywQeYYhvgPOCn/8LC//Osbq6W18D0sJnePOL5y100sMkIbqlUnhOHY7f K9i9ZpUCjuVpyF/3bRh3Lz56gpEIpefgNrnQWQDvlaQzEpxXIhUwF8fpL42nvnAEKmLh 82ig== 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=pMf+gn9LvzLdD1VC7pS9QUk31VCqeS4SgKv1PVXD/FU=; b=at5Vdi2arwGf7ivRvq1n1gKPOcIKvJqSK+QzmivcLBj4HOEZVUyJkWQQ+AN1qWqyqU 1dLSHBbJ2SdMaAnHZA5cuYOTfDq8tTDhd7/f2WwIXgoyz6otx2lwnWrBKe5X38mFTqvO OnnoxDgKzF1d9j0a7G4kumeWsmt9gBjLdy3WAtFC14NT+9YmoDfbPLOZZpaZFcxpZ5wK Vl+X77REM9CXGe0gIRYV+L1CA/c9IQfvjfTqESlFQt75Tjv/8anLnuQLTulMNSCYmz94 Hy4G4UflnLPwNdFa5j/T/6Z9pdkQXk3hax/Mq4iIQehRm7/jOrjO2wJH7Djb0eIQo5G6 2jNQ== X-Gm-Message-State: AOAM532xRhVwsIYv7kvYDmbw4K4ehqTIc7Dnl6CV27SMXOsUABqzYo4g uT4n5xWgnHaOw8MC4HAPRSs= X-Google-Smtp-Source: ABdhPJypLpKRmt5Y2u7ALtLUPy499ZLRSRRhuvfvQgi/AGDpkxf3KPYyIFatSUAGGptgohT1QAKVsQ== X-Received: by 2002:a17:906:1084:b0:712:2989:b630 with SMTP id u4-20020a170906108400b007122989b630mr8468195eju.344.1655293852417; Wed, 15 Jun 2022 04:50:52 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:51 -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 v2 07/18] ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl to SoM dtsi Date: Wed, 15 Jun 2022 13:49:55 +0200 Message-Id: <20220615115006.45672-8-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045054_790978_72DFE9E5 X-CRM114-Status: GOOD ( 14.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- (no changes since v1) 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/imx6q-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 = "okay"; - /* - * 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 = "atmel,maxtouch"; - reg = <0x4a>; - interrupt-parent = <&gpio6>; - interrupts = <10 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */ - status = "disabled"; - }; - pcie-switch@58 { compatible = "plx,pex8605"; reg = <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 = "okay"; - /* - * 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 = "atmel,maxtouch"; - reg = <0x4a>; - interrupt-parent = <&gpio6>; - interrupts = <10 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */ - status = "disabled"; - }; - /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-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 = "okay"; - /* - * 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 = "atmel,maxtouch"; - reg = <0x4a>; - interrupt-parent = <&gpio6>; - interrupts = <10 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */ - status = "disabled"; - }; - eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-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 = <&gpio5 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios = <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; + + atmel_mxt_ts: touchscreen@4a { + compatible = "atmel,maxtouch"; + /* These GPIOs are muxed with the iomuxc node */ + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; /* MXM3_11 */ + reg = <0x4a>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* MXM3_13 */ + status = "disabled"; + }; + }; /* From patchwork Wed Jun 15 11:49:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882234 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 08D1FC433EF for ; Wed, 15 Jun 2022 11:54:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/gsLISdZDprbogqixOod120+SM8XcrwXcN8FKwQAbis=; b=JxlkMiWJ34hylu FKawNg6Xu1zJRfDWAPDQ9hcI4bao04+XaM2qB08wuPH1rQfqv16XwwbOqz1BcOPrP64keG8I9qjIj QdsNQAKppSZPdE0Fqv+aYEOOkj9pEC0EAcYAKpiXRs/B4JnjDv4HIftKoI9VYPNaQatXLYkRzcLVW N945GzZG9n5LUdmSGZX2g7uGFSYGJEZ6f8GRD2neceOcaFATNcmt5zlYwQpMZOu/nEKKk47Ko/EBB LPMWEUJO3wq9PZkA20s8SgLnfRHw8z/CDYZZARdejqJx/pJGHfxngHWF4Z3nBEoHpwfxrKsSeEsjF tQw/2mYjm25YwHmxKe3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RaZ-00EIEx-4e; Wed, 15 Jun 2022 11:53:35 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXz-00EGkl-Rm for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:57 +0000 Received: by mail-ej1-x631.google.com with SMTP id fu3so22682264ejc.7 for ; Wed, 15 Jun 2022 04:50:54 -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=NVB55DEg2bPk+Jun3avPAlytYLNNRhGqMzJbc0Lw+GQ=; b=MZVLOdCFSGgMG13oaCBG7RstHuIo08+WtxMPHblfkDD/Btj2afR4FoVA9HFEddTdF2 cBGkfcEeIjTRXeGZcBdVuKMqnlQFaPLjixZBNVF3RwuJ9j2VYyYG4yEz+XjGpv56IO2B JxFqHS8oWjmKqbMH+1m2OfNwv/N5p5fvfMi6U4mt2mlh5JgDT2rV/+0qP2codJc7yk+v mkjVAk5PtaZiN7yHfwbXjzQlVQ5UjdVG6Q0/h0ofyOTzT9kIX4XaM0n0mEGrCg/tXJCH cD16MTJu5ACLIDDehaHoDhyzjb4S7Jt+JEKTpDUZIvto7p0uvb0E9OpXkhqfs6Ss56HW 13Xw== 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=NVB55DEg2bPk+Jun3avPAlytYLNNRhGqMzJbc0Lw+GQ=; b=o561KqY6+bnM754i9sHc0H5iNzJZH9gc486sm25hXNP/PbAIWqyTlW4X/AnESfEjpT 9jC9yvL8ZIclbzwMp4TMpGDOp6GxS/RzQvVDASUh825E8oGUIBJV2hPUWBlLv0zHHkqG rYltMNCFpQDAW2FIjUcXUbqHtHc0dFq145FVOdfMCsKyimMniqMFlqlc4hlbuRYTfuGl ppg8l4nmGG5ePvI4swHkxKUEjpcP2xy9mdDGX8tcdyoUPNMXmaY73TmwMMQbKgGw9Bds 3IIwXKIMDFqvifAUHNyXZqkAyY6/N/6fq7vl7hm60PAyVcAZi3nJbUFqb2t36QznG0Sj qdGw== X-Gm-Message-State: AOAM531ljnfVlvDLULm1HKTfClg0gzlonaiNxwOjWYJTfUjX3lRHdnIf O02xbnyc6iM7Bu3ummkesnI= X-Google-Smtp-Source: AGRyM1sHQrHOVNyibv+XTyKQRzzevxy8F2eT1fvSbkEFBB13kwwGjNp2Cw4QM+lQow7uNDWrJQ0Jbg== X-Received: by 2002:a17:907:1ca3:b0:705:5a6c:d113 with SMTP id nb35-20020a1709071ca300b007055a6cd113mr8999375ejc.535.1655293853494; Wed, 15 Jun 2022 04:50:53 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:53 -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 v2 08/18] ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi Date: Wed, 15 Jun 2022 13:49:56 +0200 Message-Id: <20220615115006.45672-9-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045055_947560_909A51F5 X-CRM114-Status: GOOD ( 11.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Max Krummenacher Move gpio-keys to module-level device tree given it is standard Apalis functionality. Sort properties alphabetical. Signed-off-by: Max Krummenacher --- (no changes since v1) arch/arm/boot/dts/imx6q-apalis-eval.dts | 14 -------------- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 14 -------------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index 5985d1169be1..fdcb740a7a54 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -30,20 +30,6 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio_keys>; - - wakeup { - label = "Wake-Up"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <10>; - wakeup-source; - }; - }; - reg_pcie_switch: regulator-pcie-switch { compatible = "regulator-fixed"; regulator-name = "pcie_switch"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 6743617ad1c1..e6fc76776b2e 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -30,20 +30,6 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio_keys>; - - wakeup { - label = "Wake-Up"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <10>; - wakeup-source; - }; - }; - leds { compatible = "gpio-leds"; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 3aa66b6d0c88..240783d0901c 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -29,6 +29,20 @@ status = "disabled"; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; + + wakeup { + debounce-interval = <10>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + label = "Wake-Up"; + linux,code = ; + wakeup-source; + }; + }; + lcd_display: disp0 { compatible = "fsl,imx-parallel-display"; #address-cells = <1>; From patchwork Wed Jun 15 11:49:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882233 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6B600C433EF for ; Wed, 15 Jun 2022 11:54:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=c3EwW1JmHZqgJcOGM22pcziGKYViaC9z52xXyMKtubo=; b=wjeNEQgf+wKAJ6 ADAqmFAbqx+l7yLAJ4O5H3BGcOQtLlNo9Uv/VzFyPUWXYA9hFuBteSaNyvHpHw/17Ebr/N1xgI5xw Ke19ygjprc7SKBhpMtfsmNhT9O5J7QuL4EyFRZ+z+C1w6JMy3YaW5lN9kudlVi1K+UpwWyMB393yA 2liZ1c2m0INS8N5VHO6nWwkNVaqG49gm3XPwOfsFY74WIvANXZ3uONYLEzQZsBAcwx5LqktijmUwE tJvrkPMBki1pQru2ahPuw+a7RdrHjZT9QC/3Xb7qEETKO2Duo9DbWL4gGqjAR/GCjiTPZLgYmr3Iu 4efZEVwhXiHVcZ7cpucQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Ra7-00EI1B-8F; Wed, 15 Jun 2022 11:53:07 +0000 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXz-00EGhy-Ci for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:56 +0000 Received: by mail-ed1-x533.google.com with SMTP id 25so15702578edw.8 for ; Wed, 15 Jun 2022 04:50:55 -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=3DWcX8Od03/UApijSUWJq2RJ9QBnMd2wigkqz4nDJyM=; b=PBTExrVD+THL+SpJ9En5rEOJY31TcUF58Vd/88kyzxKIOgzcSgQFKACiHVrxYQ++X4 8ZC9KRq4Ku5w45ZPUxcxyIjNShK/5pnk9/S/7LU74Bd1StdhQ6PXfXxGUmgeJBOqlPH+ 3KvLipLIZAM/QV/tWQjt6zDek0+LzBllDUIQnMFuUmsyg6z9NbVRCTYqAjVB4au2a9b3 DgLBIbSfFceYXItQvG365H3tdyLO67OQX/IjVj72Y1y/R2SCsmLxCkbsvUSo708dB76q 55S/Xz2myZiRQQxRy1SbG+sRAv5CmDEDBKMkLVUse1aCpWOq8aefuaTvdF9BRpn1NI3i Sb2Q== 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=3DWcX8Od03/UApijSUWJq2RJ9QBnMd2wigkqz4nDJyM=; b=c9J2uWdWXCTCM96v4Nv6Bqe/5eYhWSiTq/8aKHMBt/Kp9+QOwf8m1gpWsBH7x3+OYi b6rxGUou1yGvjiTtBuK6S/xnknHjW04t93bx6AloRwe9CGTA3JS03P8ZlH+1yXxjrUSZ ehPtrllIDmZSUSlyqO/Rw1HHDFbH5wk5kFm8PqWapiCl/jSwt8ISsR14trCanGA8cld+ MbvF3tW+C+puuQEvH/l+aaFT00e3vJYv96LcFYl74WTnl2uhMPkDxSupPCNT638XlUJh 1kHJe71TprVb2iNyjvSOekLv5F3HcEkiKL+0LWmwbstQViGGqDPc6nNvfCCxCckcYjgh V5AQ== X-Gm-Message-State: AOAM531AGVhvvaYdLCtAYynwWHAcFPk6il4QH3XYwVnjqoWrBTTWvsDr x8auAYhhnNr3XQTLjWViPXI= X-Google-Smtp-Source: AGRyM1vj8HkiO0aUwCSPFvYx6F5XRhfVJlPRVZQWvaSTk0/0Y0eH/fVQWG5Eb/ftiiUH4kG/q47peA== X-Received: by 2002:a50:ec12:0:b0:42d:cbcf:a629 with SMTP id g18-20020a50ec12000000b0042dcbcfa629mr12151968edr.224.1655293855007; Wed, 15 Jun 2022 04:50:55 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:54 -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 v2 09/18] ARM: dts: imx6q-apalis: Add LVDS panel support Date: Wed, 15 Jun 2022 13:49:57 +0200 Message-Id: <20220615115006.45672-10-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045055_463750_32285B56 X-CRM114-Status: GOOD ( 13.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- (no changes since v1) 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/imx6q-apalis-eval.dts index fdcb740a7a54..51efa7c57879 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -88,10 +88,6 @@ status = "okay"; }; -&ldb { - status = "okay"; -}; - &pcie { pinctrl-names = "default"; pinctrl-0 = <&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 = "okay"; }; -&ldb { - status = "okay"; -}; - &pcie { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_reset_moci>; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index e6fc76776b2e..3d42f8ffeb34 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -94,10 +94,6 @@ status = "okay"; }; -&ldb { - status = "okay"; -}; - &pcie { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_reset_moci>; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 240783d0901c..636b04139a5b 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -82,6 +82,18 @@ }; }; + panel_lvds: panel-lvds { + compatible = "panel-lvds"; + backlight = <&backlight>; + status = "disabled"; + + port { + lvds_panel_in: endpoint { + remote-endpoint = <&lvds0_out>; + }; + }; + }; + reg_module_3v3: regulator-module-3v3 { compatible = "regulator-fixed"; regulator-name = "+V3.3"; @@ -624,6 +636,30 @@ remote-endpoint = <&lcd_display_in>; }; +&ldb { + lvds-channel@0 { + port@4 { + reg = <4>; + + lvds0_out: endpoint { + remote-endpoint = <&lvds_panel_in>; + }; + }; + }; + + lvds-channel@1 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + + port@4 { + reg = <4>; + + lvds1_out: endpoint { + }; + }; + }; +}; + &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; From patchwork Wed Jun 15 11:49:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882235 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7B1BC433EF for ; Wed, 15 Jun 2022 11:55:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0WJbyxqH1ievPdTQA8szTNO99EykN0Em10XZF5EX5/Y=; b=JWIv5nqOksE57B lODJBoxfkpCjJr5VkjXJW51TfWrGUKwqfso8W0DgaLKtjaI1d0x0SMCovpVmzCyfxKQ4RK/eZixmx cYLagi2CaeS8KDAP5+ZLD2yOM+FNpFQqZ/0ftx4QcMAKO+2YpaoEhJmaM45S/plk/jsJCk8Wk20FZ k591D9C/XmhUse413S+Xu6f2ctxLkmmkdEbRILcxGt8eaiinXYdfTGQi+MWuLS9taP2sfH5GhXLdl YB7o1LGgMrlBS1XTwlQiVB/6/mxXQhz3br7MjGlpW0UUyTqFywKW6TFf+dnre4HEF0OAiteS39nC7 tt44cDsV7xLgq9nh5yBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RbB-00EIX9-Aj; Wed, 15 Jun 2022 11:54:15 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY0-00EGim-FN for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:57 +0000 Received: by mail-ed1-x529.google.com with SMTP id eo8so7522391edb.0 for ; Wed, 15 Jun 2022 04:50:56 -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=XOsg77BcWgr7gnFM+OgTQJkE/wzQHgLa6aUmenKQNwI=; b=B+cNlMySSFNbg5d+FlV1MUHBza9ntnX0xSUUGRq5lhISSm3Kj7s9/ZkWQpWSnUC89L fyDACn+6C76HAPxY8LBR3W8++ftw3uhPQlK3rkWmhYk9LroHqtQnIdSeSE+ZD2fgHwKe w9kkmIIbxaPpy3xsIRu+6+CU/hjyXBtUcbIqXU+Nrm/GiryiB8hVqVFQaus/x7szVAjM xx/IooCn/6kQZPKohyjZK4XdWwyVyGVDOAsu4jgSYE2DUwHsM5HdWwn+a6kgoDlui8+g DWNEs6NQxRkUKjNgQ/OMz46i0CPtu6O8J8iu8KxX3818MHViKVZqx6hDdyWqpuBQ867F AB5w== 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=XOsg77BcWgr7gnFM+OgTQJkE/wzQHgLa6aUmenKQNwI=; b=CoV9wMuyi0HxM+Mu/D8F/fVkjvwf+CNF/itXyvIcnV3AJrrwyHzDJYI8cS861UobE4 wV0cr1ExEwyC8y8OVQhx0Wjv2L7k9RmLJwSbeXYjRC5sZn+DCLlGo5yiH1nPEjx9EPIJ koy2J8SlYuZz8veY8SzXY/fNkfFGhzfXGPvOquPMpCG703RtvzpCZ/uLMAk5eRm8/LWW nYBrYNRHQhGHmpranQ9G2TLQCGFY/GzUqCc2knTZGkydJzK+NloC6VmPQDGq2GYlyYcF rc+nj0U5c4fNDV/U5Ud51Qx2T7/vvznyHTQSUuUo6S+EQYXzH9bsCOXzOzpXfU/B+hsX w+jg== X-Gm-Message-State: AOAM5322fhDP/TqG0W+XI8Zk7tGtwLeuOdSpO8hRK8OzSYS5DQT67nCJ fjgq1r68FmvaZenBaAHXi28= X-Google-Smtp-Source: ABdhPJwrYv0HnbJxgpMI+NKkutK9hvbryZVM/wJmZJqPqVX8vqGNJoDT0uttaBIt6pIRXp0r+Vt3eg== X-Received: by 2002:a05:6402:847:b0:42d:91ed:82f3 with SMTP id b7-20020a056402084700b0042d91ed82f3mr12626475edz.416.1655293856105; Wed, 15 Jun 2022 04:50:56 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:55 -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 v2 10/18] ARM: dts: imx6q-apalis: Disable HDMI Date: Wed, 15 Jun 2022 13:49:58 +0200 Message-Id: <20220615115006.45672-11-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045056_567834_B290944F X-CRM114-Status: GOOD ( 11.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Max Krummenacher This allows to enable it in an overlay per the current system configuration. Signed-off-by: Max Krummenacher --- (no changes since v1) 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/imx6q-apalis-eval.dts index 51efa7c57879..eeb20d7a637d 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -60,10 +60,6 @@ status = "okay"; }; -&hdmi { - status = "okay"; -}; - /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ &i2c1 { status = "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 = "okay"; }; -&hdmi { - status = "okay"; -}; - /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ &i2c1 { status = "okay"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 3d42f8ffeb34..a9daf1bb970f 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -66,10 +66,6 @@ status = "okay"; }; -&hdmi { - status = "okay"; -}; - /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ &i2c1 { status = "okay"; From patchwork Wed Jun 15 11:49:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882236 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 05469C43334 for ; Wed, 15 Jun 2022 11:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=D+Ki5I5EaEfj1OpOtA3ztNTv18anXQOM/dpcDTHzpi8=; b=jS5Abz6+/88DWD 6L1+cFd2it8bBBt2IRklj79p45qhfdeXLtX8rvzpTH67Kf+1qEuWp4UJCrgppDeKJrwe3wQChIRj4 Dm2DBqYiOfuErKYRnaJNk4tdmM4N6coVkn6Kan0ftl5onaplj/qrYmYhtYR60K30BDpcpdO/PGkj3 gDziqkijEuvnwnN79cRtKCjFfSdtBVFSVySBdme5edKb8WJo1UOlr0WXX2OlMTWct7vzENsgu/xHp hHMoMUnKPcydCRpCYCFdvA8byJ0ZLT2uKM5W+Tw7zzOV0/uGdYVcedoiPCQ4q5pVNxoOyOZAoclKG DWdvkiZWGV3vE4GRd8jA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Rbp-00EIpc-5N; Wed, 15 Jun 2022 11:54:53 +0000 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY3-00EGnl-96 for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:51:00 +0000 Received: by mail-ed1-x532.google.com with SMTP id d14so15697539eda.12 for ; Wed, 15 Jun 2022 04:50:58 -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=cl1dcczO96rBtCg5ygEOypyWeJ90Qx/W0l9Ehf8BH4M=; b=QCoS3wSh7xzDJh42Kjkbhg2/y1eEQ+j+Zb72WzIpKlKJZbMiMdQXiVm52iPgs4hBg1 uhzvAhjaseNimjJUAdncHPTEsYFVb/D2bn5Va4fbtN3LSn7J07MuYD/UwHC6yvJmEvpe Bf3pbUA2CIPb988FRhaVXILig2m8/ZbhKp85bEmtNA6tRRoOpqjnOGN1desIoGiTO5OG ERrR50qwYHQhTD85fEjWG5H0R2NtAVexwy9azQQSnAnDRpL/2Od54PxH4GzZl3zG+mM4 mNP2EtvTD7915qmEYOLaVJBX5FgqITRf7crxWaPGkcolEBB/anzB8SlFt1Wm0y9KCpx0 ZsYw== 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=cl1dcczO96rBtCg5ygEOypyWeJ90Qx/W0l9Ehf8BH4M=; b=aaXDkhRc55gvSlDxHnnXpwB6j7AhfQFofmkDARgM0oY2FiOcnZCp4H2YEpQLgAsmEo lPoHHwfUt5H47VGGe2pfn+UfmwHX/djKQ5mZ41A0rR0NPLWoEpxVFFmg8LEpU6BzNln2 xEJZ2WWjXnnjgB7AqTxe6L8eBGuwRcgBuPHR1zLKHdK2+jkbMbb3CqHTmlAxuopPDTmp zh52/QGj+kpyZAtkj5AWppLWE1q7YyKdp0/H7Jv4lP8jWGhYCdyuNb8wzpTBtgrOclzX xJ9CgXh8zDvH/XNhybh3XfyhA3aJxzujZKmhNEcmzf5/ZchahM8s6g+mCVBw4DR/jAMn DKPg== X-Gm-Message-State: AOAM531bl49skYV32QAIErDkn6oJO+tr5EAn2GYtMDgbByzcbt84RZ/X fP5xIQmjygeQEGV7ad2QyBA= X-Google-Smtp-Source: ABdhPJwtUg/5+Cq6iOM/mEbJDKECBlI5ltgZntMeaKelklR1yr8vyLEtxsPhjovrN8Dbxg+8xZkN5w== X-Received: by 2002:a05:6402:249c:b0:431:3883:967a with SMTP id q28-20020a056402249c00b004313883967amr12490255eda.264.1655293857158; Wed, 15 Jun 2022 04:50:57 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:56 -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 v2 11/18] ARM: dts: imx6q-apalis: Disable stmpe touchscreen Date: Wed, 15 Jun 2022 13:49:59 +0200 Message-Id: <20220615115006.45672-12-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045059_369695_4B08BB27 X-CRM114-Status: GOOD ( 12.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- (no changes since v1) 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/imx6qdl-apalis.dtsi index 636b04139a5b..b4742ad85f56 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -592,7 +592,7 @@ /* ADC conversion time: 80 clocks */ st,sample-time = <4>; - stmpe_touchscreen: stmpe_touchscreen { + stmpe_ts: stmpe_touchscreen { compatible = "st,stmpe-ts"; /* 8 sample average control */ st,ave-ctrl = <3>; @@ -607,6 +607,7 @@ st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; + status = "disabled"; }; stmpe_adc: stmpe_adc { From patchwork Wed Jun 15 11:50:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882238 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 552E0C433EF for ; Wed, 15 Jun 2022 11:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AHohWxw/erBjriCfNvgVCGuu4RROsfppxEKOwBwhalQ=; b=LQMO1GmqXvxrn9 dBbrWoCwcZ8VtcNF5OFLG0MPQOwd/I8Gq1x7ILBcFVtpemZ5rJy/g4zkr0o1V0erjTXn4OuSa+T5l O+9peNc1cNXVKmC2oXvlRzB8RkVIATDdRPli2w1H1qjpTkvV27Qaw6jhwybs5s1w3ks8Vov8sObAr 4UAFcxjIgZV3r/RzwfafE9KBTedwrbSvCKj+5vEPg+ZmYsyGR9kn/koAYLJNmxHHJcJ5srHuum/8t 8Fbi5UeP/NHgTZxKwXhP5MeUE7v5labaQ+UvjrsRv8bLWMy0KxO3YZ5MlQAP/URBkaBxVTeDUDeAC E2DFAbhywEfxBaqkiYsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Rd4-00EJQ1-8J; Wed, 15 Jun 2022 11:56:10 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY4-00EGoO-PS for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:51:02 +0000 Received: by mail-ed1-x52a.google.com with SMTP id z7so15702927edm.13 for ; Wed, 15 Jun 2022 04:50:59 -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=HENmXPwQgZrLvgBCOSxbn3j3qup91Vw70nnac08YVQI=; b=DUgSbBif0rvoVLNJXtj/ChM9YSBp5WGCaDECnnql+GX3hRdyoqgIuQ2xRZFqjedHAf cnEJo5iClqIkgWsSOUF8paCNyTTFWHdWmuvUrd0CEjfkhgikfT+jbe6lbSKDZrKwELoJ 22EmOIDiL+3X0CxgGcJ3i5ogwduadexq5qYRuM1L03r294jQwybtnqgQdHrbmKzdgK8a De2+Y8SBzqolsZauWOELhNie/rBqvlLIMw3SflSQvAdwyAYNRfjUCH5oFZcgtv6XrKSP NcSF4PrhRiOXbY0o5a6a+3xvgGdk4fWeRuQx2TmqZjpReXX+XO6l+3KLKH97sniqnNUL LBdA== 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=HENmXPwQgZrLvgBCOSxbn3j3qup91Vw70nnac08YVQI=; b=scsjt4IEkxtS5YhGC0kBqc40xGvILk7kOYFfZP0pvrsgnmu0LctWuk8Qm/nklB3tRS vITGN4xJUkVjoakjROdNR/DPrMi1uxLBYwe9bI21aSrq8Aack8/Gg/xR4UBVRbmKDOKI ZVEH4xOO3zOaY5QVlmkG8Nms5fjik/BB5Ziu5tVTOsJmjRRQZa8NGbEcifZY052Q2hXg QUvHdSpwqyB6SSSbLNr1GlEaA9BgJVdhlY3NgJPx3UiOXVosE7/oAwmf2WSyPXOdU2/i p8vc8KxKdF1G53kJiRRzJCGYa2oT26GjBDKGRvFaisZwqqPekACpPCn04cA0uBceqlzQ 2/1A== X-Gm-Message-State: AJIora/Gsu/+tME3kKM0NLmtjhvYHMYcQxcIMYG17tsCXEb7amt7b0Qn TkcCcMF75ddnbVAfdsq5HqM= X-Google-Smtp-Source: ABdhPJxqZWDzakNuE6KjaWfgvQSS+/by8OipbRpgC430xggG4gd/kgHQG9SoHcWJf/IeTObyU0iXwA== X-Received: by 2002:a05:6402:32a6:b0:42d:ed8b:3d8 with SMTP id f38-20020a05640232a600b0042ded8b03d8mr12220196eda.225.1655293858511; Wed, 15 Jun 2022 04:50:58 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:58 -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 v2 12/18] ARM: dts: imx6q-apalis: Add ov5640 mipi csi camera Date: Wed, 15 Jun 2022 13:50:00 +0200 Message-Id: <20220615115006.45672-13-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045100_887153_046B1E5A X-CRM114-Status: GOOD ( 15.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- Changes in v2: - Fixed '-' vs. '_' in node name as pointed out by Fabio - Sorted properties alphabetical in the newly added node 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/imx6qdl-apalis.dtsi index b4742ad85f56..bbd838acb8d6 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -29,6 +29,12 @@ status = "disabled"; }; + clk_ov5640_osc: clk-ov5640-osc { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24000000>; + }; + gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; @@ -110,6 +116,26 @@ regulator-always-on; }; + reg_ov5640_1v8_d_o_vdd: regulator-ov5640-1v8-d-o-vdd { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1800000>; + regulator-name = "DOVDD/DVDD_1.8V"; + /* Note: The CSI module uses on-board 3.3V_SW supply */ + vin-supply = <®_module_3v3>; + }; + + reg_ov5640_2v8_a_vdd: regulator-ov5640-2v8-a-vdd { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-max-microvolt = <2800000>; + regulator-min-microvolt = <2800000>; + regulator-name = "AVDD/AFVDD_2.8V"; + /* Note: The CSI module uses on-board 3.3V_SW supply */ + vin-supply = <®_module_3v3>; + }; + reg_usb_otg_vbus: regulator-usb-otg-vbus { compatible = "regulator-fixed"; pinctrl-names = "default"; @@ -452,7 +478,6 @@ reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* MXM3_13 */ status = "disabled"; }; - }; /* @@ -631,6 +656,30 @@ scl-gpios = <&gpio3 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios = <&gpio3 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; + + ov5640_csi_cam: ov5640_mipi@3c { + compatible = "ovti,ov5640"; + AVDD-supply = <®_ov5640_2v8_a_vdd>; + DOVDD-supply = <®_ov5640_1v8_d_o_vdd>; + DVDD-supply = <®_ov5640_1v8_d_o_vdd>; + clock-names = "xclk"; + clocks = <&clks IMX6QDL_CLK_CKO2>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_cam_mclk>; + /* These GPIOs are muxed with the iomuxc node */ + powerdown-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; + reg = <0x3c>; + reset-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; + status = "disabled"; + + port { + ov5640_to_mipi_csi2: endpoint { + clock-lanes = <0>; + data-lanes = <1 2>; + remote-endpoint = <&mipi_csi_from_ov5640>; + }; + }; + }; }; &ipu1_di1_disp1 { @@ -661,6 +710,22 @@ }; }; +&mipi_csi { + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + port@0 { + reg = <0>; + + mipi_csi_from_ov5640: endpoint { + clock-lanes = <0>; + data-lanes = <1 2>; + remote-endpoint = <&ov5640_to_mipi_csi2>; + }; + }; +}; + &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; From patchwork Wed Jun 15 11:50:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882237 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 382F7C433EF for ; Wed, 15 Jun 2022 11:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=biIfRWBQM+0piWG6u/ZCXhm2HbMTz7Vo7QNRZVDgo3g=; b=MLn87IwrjHspLe KXtyHlZKAHSduouc3Md5phoyIA025ElAiaHrZB7+ALRHRXfYU/CSjr44alnPlwCodaR7Smta6VRTR g0S7jOi7hAij0nrZiDn1sCPfyuT0T6xi5ewFAzJ4yLAjrerQotwat3iCE25+2O1RweoiLeKkRS1Od bw98oqM1kcSFIQmR2zxHoRz742hs4tRFvaeHGAwrmOHePlvdNbeO91Gj/jKPHuQshpwcy1YcXHxWK esmsax9D17IqP7h0Tw/DuRaSWBzQf4z3gMl6n62SptpOZA/QwqbahRFgwFWpiaQ2t4b4BnSDKaPu5 UdY9dUuOFOUeVqnkmKDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RcZ-00EJAk-8H; Wed, 15 Jun 2022 11:55:39 +0000 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY4-00EGiD-45 for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:51:01 +0000 Received: by mail-ej1-x62e.google.com with SMTP id v1so22644905ejg.13 for ; Wed, 15 Jun 2022 04:50:59 -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=9f66p0kMBxY73E/g74soR57z54u2uiQJKAItmpu/tNI=; b=GSbiBARVuzeZzIQ5z37nKh8xLbVn6DtsFP8tGnr0Bssj8MHIPnvcL1QLB4Ld9Ox/Xa v4bEOJ9KAwgqHxCXpLdQs8GgkJAnn43O+qhpB7gbfJa/tU3fDY5o2nzqo6eyxykknhki UClmEgrnZ1003yRiH78VsiAroWIQ1j0Jd/NbWJI++9a/q12FbJ4q76ZOaHubmxOD6lGU 0jf8GhdjbN3jAGWimhGcb1hEA2YYZSG0a8WBHLFXL3jMLQczRe0AndhvFXWjhEhDFnrV yB3MX+d+6UemvLQvTeVu1P7oQa/4XInFw+rKOBlDGcD5TsEJhjByHzApjosuxE1yyuOV pP5g== 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=9f66p0kMBxY73E/g74soR57z54u2uiQJKAItmpu/tNI=; b=bG4tX7zieuY/sDaGo5HLeP8kx19FD888104KB16XFdjOekzRTwsq3tjRqcc1NZOmQS oSG54zDsvEFBSQ2q1M3yvqc8rAL0e4osSovO7ZOk+Mk6KyURZX0DnOsi5rpDAKFckBnH zorqOoJVQR7s0Iu9K3ewG7v5QmSLaWa8lqfewOQwuzVkl7kkiNLSz3diQKcJxVPgHAH+ E94/pKBRD8KfBsSqvUIIhYvvm1omD1MMm6dmkXq5iRYYHaAZo00daPiXj/BrolJvDRY7 Cj2UTZj6JGmbBcR4Wj8iKb8Q8Px69qib8wGwHga7J1rc7111VROpQf+tnS8FUc0M9S0x 5GbA== X-Gm-Message-State: AOAM531qWs+SsMtrtFwHXW1UaciZA6UaDIB0+DW0o/RdmQjdKo6Y2+Ef 61MZFAvehXhvcYGNzhhcoCk= X-Google-Smtp-Source: ABdhPJw3exQGUeLKVBnRIM/7t4HtLaPBNv5i593bexm9gnEmX098Wg1uqI9aXC/jZlj737x5fNriOg== X-Received: by 2002:a17:906:7007:b0:6ff:8028:42e with SMTP id n7-20020a170906700700b006ff8028042emr8206934ejj.278.1655293859642; Wed, 15 Jun 2022 04:50:59 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:59 -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 v2 13/18] ARM: dts: imx6q-apalis: Add adv7280 video input Date: Wed, 15 Jun 2022 13:50:01 +0200 Message-Id: <20220615115006.45672-14-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045100_207796_CC014F49 X-CRM114-Status: GOOD ( 13.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- Changes in v2: - Added "adv,force-bt656-4" property as suggested by Fabio. Note: in my PAL setup I didn't see any noticable change. arch/arm/boot/dts/imx6qdl-apalis.dtsi | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index bbd838acb8d6..6d072aa87952 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -432,6 +432,21 @@ "MXM3_215"; }; +&gpr { + ipu1_csi0_mux { + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + port@1 { + reg = <1>; + ipu1_csi0_mux_from_parallel_sensor: endpoint { + remote-endpoint = <&adv7280_to_ipu1_csi0_mux>; + }; + }; + }; +}; + &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; @@ -657,6 +672,22 @@ sda-gpios = <&gpio3 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; + adv_7280: adv7280@21 { + compatible = "adi,adv7280"; + adv,force-bt656-4; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0>; + reg = <0x21>; + status = "disabled"; + + port { + adv7280_to_ipu1_csi0_mux: endpoint { + bus-width = <8>; + remote-endpoint = <&ipu1_csi0_mux_from_parallel_sensor>; + }; + }; + }; + ov5640_csi_cam: ov5640_mipi@3c { compatible = "ovti,ov5640"; AVDD-supply = <®_ov5640_2v8_a_vdd>; From patchwork Wed Jun 15 11:50:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882239 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 434ACC433EF for ; Wed, 15 Jun 2022 11:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hF4+cHL5kI82a3l81GPcaIR3CNpXZAT9omIFEe0J/2s=; b=1GmQl5I6lJPhU2 xsyTClc20axHVOTTAjLpyRfLg8z8U94QA3cKO9pKKo1+72zebXUNmRcZ1CjcccJ2sXwBqEqeNCBJY vDRwAu/S7wpg3vLO3iK1TP1/YVW47Gkd4LbYwxQXlM84L0I2QL9hO041aSHfc9DmjjS8sS5IlK2+Z GXR3MD3Kyq646BxtuEyc6k4D39QEB0WY5QCAyOo1E5FOVrszH+BF08LlMM3fvZgod4xGspxot5j1Y 0Wz6mhFC2BQV7xWq9k0dH1Q7XWPy+n95gzfvr1qF8alJ3WETrVjiwY00AS5+UJbB45kYqusNgRJh+ YfwH2Xg7pZng1Ct75tvA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Rdu-00EJmN-Bn; Wed, 15 Jun 2022 11:57:02 +0000 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY6-00EGqA-T6 for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:51:04 +0000 Received: by mail-ej1-x62f.google.com with SMTP id v1so22646078ejg.13 for ; Wed, 15 Jun 2022 04:51:01 -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=hG0DQrrpzmf9pK0gpz+otWlL1eUOYhl7swC6XNn6u3Y=; b=TvI48J5Y9XPIJ7/pmfaUV+mPUivD0/X0C1W+6tVLYxiVx8EHhs8ztVAdra6t3ef4xi wOXijsGvskxYvyPjSkNqgwtZA/oasUeJa9p2UUvqvaQfv+B56QEWyEtmvEvuEiIwbmln dQh8cv7So0S0Z/6YR2AjxMceXUETP4AL/KlA3dR4ZWRcizZeYgxJWNgHK+hITZAcjhPl aMOYgqQn7ok+CyPbE8FLlskKr5cZE63PWxVHTYrPJclwyjME4ZyoXzf5JU5XvTvzOQ/4 5oDLYKJiGIhUjfmWIGK0DjZpBrFUs6WiAG0k3lwWDIkZfTRUi2yUdRl99+HhbLszFUnH oVig== 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=hG0DQrrpzmf9pK0gpz+otWlL1eUOYhl7swC6XNn6u3Y=; b=L4Vc13xwO3/1h96U6+sItfniLFuZL5upZU+nB+hjJdqlGy7O6ppgN4Cq1fMmuHhrgZ WKJPNb+xDEd1Uv1DHX/OndcTDOYjgHT1jmaNh4JsY+gRQXvoZdugmIK0G/hk5o9k9vLS df1xxf0m4haE2ZQkE2SRhw90ZLXMGS3abhl8CG1CZY2h1AhIcoN7s3I7PSXt1rNA12DS zM7h/IID/uqO4INJq2Vjm9EgxCd5sEaA6TMOiMrcIXqL3wdVt2zpuzi+u+JMDuiymcBU vEAOp5hQzSbIVvUN9lao6yOv/zMBOirJtb9hmUCBbzmjMDa0osYg9DSmE5GMaAr8v6Ge NoHg== X-Gm-Message-State: AOAM532wkZQB39e5EUUWRq1G/Tup2fxngJvaWipJWSort8kwYoGaXzvU +MtlRBEsDP96Qg77DI4wJq0= X-Google-Smtp-Source: ABdhPJxJav8egmgVGQfvwcuVGKlHqlncBGrHi9htRZb+7ISkG3FS6UxcPQrrfBXt5LALzOvVII6ZXw== X-Received: by 2002:a17:906:3c07:b0:718:e1a7:b834 with SMTP id h7-20020a1709063c0700b00718e1a7b834mr4802775ejg.635.1655293860677; Wed, 15 Jun 2022 04:51:00 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:51:00 -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 v2 14/18] ARM: dts: imx6q-apalis: Clean-up sd card support Date: Wed, 15 Jun 2022 13:50:02 +0200 Message-Id: <20220615115006.45672-15-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045103_007110_1B706920 X-CRM114-Status: GOOD ( 13.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- (no changes since v1) 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/imx6q-apalis-eval.dts index eeb20d7a637d..19aaffd71f3d 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -158,9 +158,6 @@ /* MMC1 */ &usdhc1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; - cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; status = "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 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 = "default"; pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; - cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; bus-width = <4>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 6d072aa87952..4ff46ffd2300 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -832,7 +832,8 @@ /* MMC1 */ &usdhc1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>; + pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; vqmmc-supply = <®_module_3v3>; bus-width = <8>; disable-wp; From patchwork Wed Jun 15 11:50:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882241 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8DB96C433EF for ; Wed, 15 Jun 2022 11:58:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nI7UZd6Q8Gj67JDcixjwq5yaUaMmENzjbcRWkGM3WtQ=; b=41kXEOnnaJ6vsU C9bvfYxVdWPYSM4zExopaIodYlL+nhYwLJsiOUKWe+rz8/0gUZwhwQSl9Nj2FvOhuwKbRcaAymBpr 50qhlBsJpjy4hal4yH+rKUdm0TZN0eM36+RO0i9sUPLA/pI4NyPI6puZM229CEAID3vTlvAZdTL3N kLinr0tHvEDcOXXrNuQJMCLOCp7pTegXO7fvUxwYPPC2+VZTA1obtV9B9p4xCoYIcH7dk09jg0k+T lQvMELxr6iqe0jaj1oMG6uADILUQH6kJB9hcjx5bfMwjWdY5puSDwQf85KRj3ClKrvcc2yJm7GmYy tTg06Gaa6DbrEglPPpcA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1ReS-00EK2S-M3; Wed, 15 Jun 2022 11:57:38 +0000 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY7-00EGrW-8c for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:51:06 +0000 Received: by mail-ej1-x62e.google.com with SMTP id me5so22751932ejb.2 for ; Wed, 15 Jun 2022 04:51:03 -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=Gx9yuVUlvlzFfcIzCpHw8QD0e+WGCkPUwS9OSYRqPco=; b=BWcpyEPTclAh3AgjI+6hqbhwU8P9iD9BxYrQBMrjdLG1K7wU05gscTJyLIaCthnQjq 6av7dV8xfFS3TlwQM9XwDm2U39ZdcH2cR0k9FEopKnrvUYWa+bCGqGrciOm6XqOqvq6b pxDU2BIy0LZl01wrT8xRHCtZeqEfxPD4qY1LdtMrFbSi4cvuTeloeXfWJMGBusPOXEaV iAbb9MLlpkYwFixZ7T9X7bBWtm9Pt8M6WYUW15vdCqSsEUA6c1D4KSuGful1gtD4P2zO U4xcPSW3IwLu9eKo/y7xHEFilc7tE8xwN4DneCprASX2lpSpa0EqdS6cI14/xfz0kLG0 b73g== 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=Gx9yuVUlvlzFfcIzCpHw8QD0e+WGCkPUwS9OSYRqPco=; b=SbFxXNF4B1Uw1NDWnKLWDZ+fgnRQWtL7E7xbDpimmtt1JLArFtNk96C0o28Gd+rog9 6QoO3QdrPAt4MKkb7bjaqu+D9z7XzY9AUWqADZguCsxp9HpQNReblH09KcxnRJiV7dGN WKC6GCtQFHvi+QLvmxCHeC+vX8966Y3EDBtVyiT9Nxv1hUn/8RCZFl07Tb8I/bV8URC+ x1ZI0/do1B4Ck1IuKyPcWc0e4joNHAZV3/NA61P+WhsH8yLP43SzLqg73E+iKMVf6oHO u9m0ME2HJIkZ90ethXevGEu8RSlU55ei5Xtw+W0QkXTRohsYAsuhDs2ZznO4ZrWHX9/E ifRQ== X-Gm-Message-State: AOAM532bGfeOZ3MDDpsGpYXca87FzSobYT+qZ+hcYSZzQSgwLNVKjuJ8 F/k9Ml8fKIWpxdaGmWQFcGM= X-Google-Smtp-Source: AGRyM1t/YjoxRxQtDPFZlpqqhi4PnFVG7zQ/AkCMNbaixcvi3zmLcUnqxeVgtl+tVS0NQFxBT3fccg== X-Received: by 2002:a17:907:7f8d:b0:711:d8db:2714 with SMTP id qk13-20020a1709077f8d00b00711d8db2714mr8510219ejc.63.1655293861983; Wed, 15 Jun 2022 04:51:01 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:51:01 -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 v2 15/18] ARM: dts: imx6q-apalis: Add support for Toradex Ixora V1.2 carrier boards Date: Wed, 15 Jun 2022 13:50:03 +0200 Message-Id: <20220615115006.45672-16-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045103_444690_9E08EFB3 X-CRM114-Status: GOOD ( 25.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- Changes in v2: - removed gpio-keys node. This has been moved to the SoM dtsi in v2 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 | 276 ++++++++++++++++++ 3 files changed, 289 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 d3f1e3075178..428d758fc411 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -550,6 +550,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 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. */ -/dts-v1/; - -#include -#include -#include -#include "imx6q.dtsi" -#include "imx6qdl-apalis.dtsi" +#include "imx6q-apalis-ixora-v1.2.dts" / { model = "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board V1.1"; - compatible = "toradex,apalis_imx6q-ixora-v1.1", - "toradex,apalis_imx6q-ixora", "toradex,apalis_imx6q", + compatible = "toradex,apalis_imx6q-ixora-v1.1", "toradex,apalis_imx6q", "fsl,imx6q"; - aliases { - i2c0 = &i2c1; - i2c1 = &i2c3; - i2c2 = &i2c2; - rtc0 = &rtc_i2c; - rtc1 = &snvs_rtc; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio_keys>; - - wakeup { - label = "Wake-Up"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <10>; - wakeup-source; - }; - }; - - leds { - compatible = "gpio-leds"; - - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_leds_ixora>; - - led4-green { - label = "LED_4_GREEN"; - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; - }; - led4-red { - label = "LED_4_RED"; - gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; - }; - - led5-green { - label = "LED_5_GREEN"; - gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; - }; - - led5-red { - label = "LED_5_RED"; - gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; - }; - }; }; +/delete-node/ &eeprom; +/delete-node/ ®_3v3_vmmc; +/delete-node/ ®_can1_supply; +/delete-node/ ®_can2_supply; + &can1 { - status = "okay"; + /delete-property/ xceiver-supply; }; &can2 { - status = "okay"; -}; - -/* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ -&i2c1 { - status = "okay"; - - /* M41T0M6 real time clock on carrier board */ - rtc_i2c: rtc@68 { - compatible = "st,m41t0"; - reg = <0x68>; - }; -}; - -/* - * I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor on carrier - * board) - */ -&i2c3 { - status = "okay"; -}; - -&pcie { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_reset_moci>; - /* active-high meaning opposite of regular PERST# active-low polarity */ - reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>; - reset-gpio-active-high; - status = "okay"; -}; - -&pwm1 { - status = "okay"; -}; - -&pwm2 { - status = "okay"; -}; - -&pwm3 { - status = "okay"; -}; - -&pwm4 { - status = "okay"; -}; - -®_usb_otg_vbus { - status = "okay"; -}; - -®_usb_host_vbus { - status = "okay"; -}; - -&sata { - status = "okay"; -}; - -&sound_spdif { - status = "okay"; -}; - -&spdif { - status = "okay"; -}; - -&uart1 { - status = "okay"; -}; - -&uart2 { - status = "okay"; -}; - -&uart4 { - status = "okay"; -}; - -&uart5 { - status = "okay"; -}; - -&usbh1 { - vbus-supply = <®_usb_host_vbus>; - status = "okay"; -}; - -&usbotg { - vbus-supply = <®_usb_otg_vbus>; - status = "okay"; + /delete-property/ xceiver-supply; }; /* MMC1 */ &usdhc1 { + /delete-property/ cap-power-off-card; + /delete-property/ pinctrl-1; + /delete-property/ vmmc-supply; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; - bus-width = <4>; - status = "okay"; -}; - -&iomuxc { - pinctrl_leds_ixora: ledsixoragrp { - fsl,pins = < - 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..f9f7d99bd4db --- /dev/null +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts @@ -0,0 +1,276 @@ +// 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 = "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board V1.2"; + compatible = "toradex,apalis_imx6q-ixora-v1.2", "toradex,apalis_imx6q", + "fsl,imx6q"; + + aliases { + i2c0 = &i2c1; + i2c1 = &i2c3; + i2c2 = &i2c2; + rtc0 = &rtc_i2c; + rtc1 = &snvs_rtc; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds_ixora>; + + led4-green { + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; + label = "LED_4_GREEN"; + }; + + led4-red { + gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; + label = "LED_4_RED"; + }; + + led5-green { + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + label = "LED_5_GREEN"; + }; + + led5-red { + gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; + label = "LED_5_RED"; + }; + }; + + reg_3v3_vmmc: regulator-3v3-vmmc { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enable_3v3_vmmc>; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "3v3_vmmc"; + startup-delay-us = <100>; + }; + + reg_can1_supply: regulator-can1-supply { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enable_can1_power>; + regulator-name = "can1_supply"; + }; + + reg_can2_supply: regulator-can2-supply { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio3 15 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enable_can2_power>; + regulator-name = "can2_supply"; + }; +}; + +&can1 { + xceiver-supply = <®_can1_supply>; + status = "okay"; +}; + +&can2 { + xceiver-supply = <®_can2_supply>; + status = "okay"; +}; + +&gpio1 { + pinctrl-names = "default"; + pinctrl-0 = <&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 = <11 GPIO_ACTIVE_HIGH>; /* MXM3 180 */ + output-high; + }; +}; + +/* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ +&i2c1 { + status = "okay"; + + /* M41T0M6 real time clock on carrier board */ + rtc_i2c: rtc@68 { + compatible = "st,m41t0"; + reg = <0x68>; + }; + + eeprom: eeprom@50 { + compatible = "atmel,24c02"; + reg = <0x50>; + pagesize = <16>; + }; +}; + +/* + * I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor on carrier + * board) + */ +&i2c3 { + status = "okay"; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reset_moci>; + /* active-high meaning opposite of regular PERST# active-low polarity */ + reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>; + reset-gpio-active-high; + status = "okay"; +}; + +&pwm1 { + status = "okay"; +}; + +&pwm2 { + status = "okay"; +}; + +&pwm3 { + status = "okay"; +}; + +&pwm4 { + status = "okay"; +}; + +®_usb_host_vbus { + status = "okay"; +}; + +®_usb_otg_vbus { + status = "okay"; +}; + +&sata { + status = "okay"; +}; + +&sound_spdif { + status = "okay"; +}; + +&spdif { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&uart4 { + status = "okay"; +}; + +&uart5 { + status = "okay"; +}; + +&usbh1 { + vbus-supply = <®_usb_host_vbus>; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + status = "okay"; +}; + +/* MMC1 */ +&usdhc1 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; + pinctrl-1 = <&pinctrl_usdhc1_4bit_sleep &pinctrl_mmc_cd_sleep>; + bus-width = <4>; + cap-power-off-card; + vmmc-supply = <®_3v3_vmmc>; + status = "okay"; +}; + +&iomuxc { + pinctrl_enable_3v3_vmmc: enable3v3vmmcgrp { + fsl,pins = < + MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x1b0b0 + >; + }; + + pinctrl_enable_can1_power: enablecan1powergrp { + fsl,pins = < + MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 + >; + }; + + pinctrl_enable_can2_power: enablecan2powergrp { + fsl,pins = < + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x1b0b0 + >; + }; + + pinctrl_uart24_forceoff: uart24forceoffgrp { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__GPIO1_IO11 0x1b0b0 + >; + }; + + pinctrl_leds_ixora: ledsixoragrp { + fsl,pins = < + 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 = < + /* MMC1 CD */ + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x0 + >; + }; + + pinctrl_usdhc1_4bit_sleep: usdhc1-4bitslpgrp { + fsl,pins = < + 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 + >; + }; +}; From patchwork Wed Jun 15 11:50:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882242 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2164C43334 for ; Wed, 15 Jun 2022 11:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pYk+wptUywbz9zfg4Br6GPIcSXM1ZcGAzb+YWzIskls=; b=E5JpDk+fa5CHHZ Q4WSwV/Lc/RFkA4amWkPdYVksjmaqI0gavXzS43jSpMd9841cd9g0jFlxDkVNTkznIuKJlTTWyxG+ qOgLGMFtZcLNAchVGanSjgI0+6sqLflRb8Iak5SJjlvaZFJfIXzFEPUXSVNaKJDBG0oRPp/3Q3xnd ncDedgD//i4b3k5w3P76RXiK5TEEv5dBdG0b2cI60tP1NPtgBHQWoi6LG1x9Xcs2lFFy8zswShzqw YsNk6NFHdcPSZZ2WTmxQVMuajd1Zw3Ghfypzgml3BRmQLlMetj20ALayrrJZ4aZJ628GWyh6dlIOq qa1zPhT5fbozCafGxgsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RfB-00EKME-12; Wed, 15 Jun 2022 11:58:21 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY9-00EGsn-Dr for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:51:07 +0000 Received: by mail-ej1-x635.google.com with SMTP id bg6so22833360ejb.0 for ; Wed, 15 Jun 2022 04:51:04 -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=zSTuZ2t7hCCrfuAfUAIkWHaObpQDE2fE3zF2HruldLs=; b=ln5FWn0385Z1emtIsEMSvzyPVQj600V8Xddp7sktlEE2o0X5IHEEJe+zZcziBxAeaI L079l5X5V8ABLgSAXShBMGIzRZTiZuo00hC+3agDHrNUITGdlo9DCBHbiLswo4IbNTTo W5pYechsn0C/VJHhuN1tsacXFrakv968FofRMYMl5lCkTHroC7wUi44O16uwCWLLmaTn 8++7kO4iu2SIgSwXgFhY8SrbLKho9wIEVsAnW+hUZ8UqPYOTfZDbW6tbIN0Afn5zatrL ioD5wWGvfonA3lLir+iFYUffgxw0LnsctVE634zARgMy4K+YjY4iWUQ3CV+OcIdy6A8j vsBQ== 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=zSTuZ2t7hCCrfuAfUAIkWHaObpQDE2fE3zF2HruldLs=; b=ptTG4JWzws78qbWB3gjLM5/0hm2fK5BSONoZihmm5CVW0ZahsSHeWlPPzWX3iK/rDy IbR3FQYsMsEADucyKSHRx+xRsCa8edDQEW14OpC4DCgtUItpABW1PMC7k897jJ01YmMW F8M54vAc+yaCsCVUw0dfwZKsKW66kF687K4IHXccnKPfroofuxu3wARIp4UTn2y7S2fv HVqw776qXvucoMwGQljiZ2HaGh6EFHS9FKFSbQakchg+m9GE9FextcwGmnvPmV+MSHda hfrODFUvnDZqYaUACTJ/88vosahR0kJsZH2eI6b+ueyn4468ThubTSfBoHSJHnRjO5kc r3Sw== X-Gm-Message-State: AOAM530AWaq6Or1weNxSwr0D7t7Sx0QB1YV1XkB3oYY9XRLXcPJ8jyab u3eIMdOuj7zXVxQOvCuMl+Y= X-Google-Smtp-Source: ABdhPJw7wppeArZ3rP5GRFzy41nguU3d/FX10LZVO5qLp4RlXIHWhjbGmzhHxVTVml/slX4PPyi8nA== X-Received: by 2002:a17:907:3e82:b0:6ff:1e04:a365 with SMTP id hs2-20020a1709073e8200b006ff1e04a365mr8581673ejc.617.1655293863270; Wed, 15 Jun 2022 04:51:03 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:51:02 -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 v2 16/18] ARM: dts: imx6q-apalis: backlight pwm: Simplify inverted backlight Date: Wed, 15 Jun 2022 13:50:04 +0200 Message-Id: <20220615115006.45672-17-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045105_519225_4064B285 X-CRM114-Status: GOOD ( 15.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- (no changes since v1) 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/imx6qdl-apalis.dtsi index 4ff46ffd2300..c134e71f2a09 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -6,6 +6,7 @@ */ #include +#include / { model = "Toradex Apalis iMX6Q/D Module"; @@ -19,13 +20,13 @@ backlight: backlight { compatible = "pwm-backlight"; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <6>; + enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; - enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>; power-supply = <®_module_3v3>; - pwms = <&pwm4 0 5000000>; + pwms = <&pwm4 0 5000000 PWM_POLARITY_INVERTED>; status = "disabled"; }; @@ -776,7 +777,6 @@ }; &pwm4 { - #pwm-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm4>; status = "disabled"; From patchwork Wed Jun 15 11:50:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3E092C43334 for ; Wed, 15 Jun 2022 12:00:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=I2QMX8d4GzlO/mdiMjrjIGP+KzlTPt8z5WLiNznx0Xw=; b=CQGuLtfNLFko4C o0HciIIgF6zbihscXFFE/ry2snyWxfutLWwzxXC0TgvoNOh7n5RB91uZRWYAoxuGgG9uGqLhsuoDP ml6pNXc4iQ4MDR4k+724lWuXvcKVdDah4hMsHX3RFLmus6oinLrZLwoWbsBvB75AuE2S7tOdvZ5NX q+b9wG8VDafbGNJIV/bYy/ExmaTYNYN86zA5iHg54H523NLt9mi+VjtBULaZ04Igoy0LuYFI8ydeH WB7drkTYbaGA0fEZiEmm7D8vwQDR7Kn3T8m1bmii3F1n7XpXHWUAaYc0K+EB1pRCaBJg4t1lBFKUs QQ36fx5B58/5X2i1ZPDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Rg6-00EKg6-MJ; Wed, 15 Jun 2022 11:59:19 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY9-00EGt5-Gk for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:51:07 +0000 Received: by mail-ed1-x529.google.com with SMTP id w27so15731221edl.7 for ; Wed, 15 Jun 2022 04:51:05 -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=BlGiQlFBs9Y0ysQYN1E7ZEh7FdwsGrUOirxOgzSRDic=; b=Vh83g9Cg69Mzkod0rYD8INfjqhWynhwdmyIH2T2drWRXicHIm/Zg3YGG63d+leBafL xGaw+JmzVLzue115lu70DpqHF1CLGbhXOx/nvqSZbow8rBBYkHMPawqsD1fZF0p4kx5E rNic7d5yTG//oHbSSw7kIT9wNHBMKfBTijhE54NWL2Maz5qbfTximhYTVn2CmNdPjf1n Rmu6DADdiUO3H6dp777yOpitN+1h5LKQCn15jN1vQ2NRrXZ4qBoGHJfSjCN/ckwiBRaP kUQ4Vtthc5kfFl2hpT+mBhwBQRsA2rO/U+7fFmlWowevA6sHVL8WSeh3LXMLQf/ielYw sj8Q== 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=BlGiQlFBs9Y0ysQYN1E7ZEh7FdwsGrUOirxOgzSRDic=; b=woOyZfzAe8zegyes+DlpoIG6uxJvJosoUVqiHMpCq1zMUZ5a66/o7vud1DNQUGzoAW GGPEjcA91puOiYjj5SIA7CETMkSFmK6ThbVihcEYLNSiuoujn1k+U/xT8/OSg0CkUPiE ASMo2y2iGDkYnHwkEpRLkw7Umh3WuKlCwvUWrAYcJrFjpkcckiYko3q4XC765cnL9UY6 wCP3/oJCtdCrFfu0GLCFMrYqShjUY0Tm9RbN06n+/Mx/DkuilkL960aM7LdiwftNZn/Z w+J62RnR5vuUw+KzYm0Px1dINs132i64Gw/CeHN569HmSpxpL7IbuPCP1dYa4ebxxaQp Jn1Q== X-Gm-Message-State: AOAM533gYo2QXaigsuKvgVuhmpHjRktxcuVVRCwanX/9uFR75UMEiwgq h75h1mhrbKBgOn112SXlapE= X-Google-Smtp-Source: ABdhPJz9S9PWBAk8rH7sYkTGOj+ge72aDAqj13TtYIlCQj7iYKKydxgnkmOGK52xGlgpxS2z7m+aHA== X-Received: by 2002:a05:6402:40c6:b0:42f:9ff8:62f8 with SMTP id z6-20020a05640240c600b0042f9ff862f8mr12180177edb.95.1655293864380; Wed, 15 Jun 2022 04:51:04 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:51:03 -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 v2 17/18] ARM: dts: imx6q-apalis: backlight pwm: Adapt brightness steps Date: Wed, 15 Jun 2022 13:50:05 +0200 Message-Id: <20220615115006.45672-18-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045105_605171_F24C80F9 X-CRM114-Status: GOOD ( 11.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Max Krummenacher Adapt the brightness steps as the backlight doesn't light up for very low duty cycles. Signed-off-by: Max Krummenacher --- (no changes since v1) 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/imx6qdl-apalis.dtsi index c134e71f2a09..1144e4d106f0 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -20,8 +20,8 @@ backlight: backlight { compatible = "pwm-backlight"; - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; From patchwork Wed Jun 15 11:50:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882244 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7F16DC433EF for ; Wed, 15 Jun 2022 12:01:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iB1nVbPSAU/Yi/ioCFyEjcoCvil/RQ2nEQZ6djn2M0k=; b=HQBSfuGB1rU5z6 ZwBT8xI0yzq24U3hvv3mrN/2RUd6Ay7kFau/CgkrW+s40s4BKgRf4+QMrU6QUet/c+I0Ja4Lmsg/E c3NvhbZsBww4jA+qOzw7ggq2BdtxkNLF9Zisk3PxbDjLi5p6rhkgEzY0R8/OrjotH7rogClFNImFf A7yRm8K7ZCxvJktQ8AC06FUYrlhCDTQ1w7diVlFRmU73Z25GMNo6Yij3KTuFwCmI72SjF1UppSp/9 SWSNWStozV2K3BBN3WZ4LkUIRlBMCLgJvW+4SrO1CBHlfZN7ywXuq6slqV5DhWvkBlCuGQhlzLzET LUZHIPXfGAN9vYMfHQlw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Rgw-00EKzr-Iy; Wed, 15 Jun 2022 12:00:11 +0000 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RYB-00EGtv-V8 for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:51:10 +0000 Received: by mail-ed1-x531.google.com with SMTP id v19so15756667edd.4 for ; Wed, 15 Jun 2022 04:51:06 -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=10+32VK54gywmC65FQtK3Ns/iYunGgukoywkV4SGwPk=; b=XRkloq/aNSv5Cur3xtsLJhUYE3sNt+0TfUjF+uWz37Q35+0ZTU4pt4PZWmNmHgwYYl Ke36uyaLAWlqoBkScu4BwL+emLrjw79HtOd3RkeFYXso9mTHy0zBh6ECH6uYBgoAivP/ 2CHI6lXRJBhmh0HELzaNN6aFsg1bJG0nLGf5m9hm81juPBdPyls22L2XvB2gdQihhe/p Q6J9bIQwKRBgkbfultGT9J5IwYIASuCgzGDTg3bH0Pg9dwUQQnSSDI53t7wUBg0VD2iQ AiurgI55T4HC3/ts6+XbtHu8zDkhsGUKUyqnYS73LFmC2HDB8tVOdEArZ39j+6lbLISL cAeA== 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=10+32VK54gywmC65FQtK3Ns/iYunGgukoywkV4SGwPk=; b=58RHXJE0izR5Fp6VjPCfoLi3dilOELLhCepK2WAGLbAH31r5Bra0HgdzOhf5aTReoK oYadZ+jNAq/h7EHTCS1YQhZv7Ig7uzQyTJ7MIXH5o4Gj0FFEmKMFbd/ijrllU8wFf1ms KqhpI0AC/80KsrGgUKPa6aES+pEFLxGFmduYg7At6nHFgRdLUqT9w7cuoithKhmPXalB DROYVhMHxTB/U+91bDyTgVnfAVsUF5cQUzSt54E1LZN89KCp1AW3vf0ZtEm7sJGzViJv EdMcIctjsictkVOubKpCUm+WN0eIz2ArM14lDY/CUhgMzZCsg5an1ZykygKzM5Xkq7ua rNzQ== X-Gm-Message-State: AOAM533cB5Je0vfAi9Lowht8BMLmPCeKx+NyMjDWxXRF7tPp9Rwxbee0 /iv/ANJBXvW3V4VmPX55rjw= X-Google-Smtp-Source: AGRyM1uqiNsX2pOsZ2hcCnWRAYX/se5jYeXmEkFwwwRhGQFYY9AaYhGT6SHO8Lfx6tWNJWCCr0rgtg== X-Received: by 2002:a05:6402:1941:b0:413:2555:53e3 with SMTP id f1-20020a056402194100b00413255553e3mr12460981edz.164.1655293865434; Wed, 15 Jun 2022 04:51:05 -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 t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:51:05 -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 v2 18/18] ARM: dts: imx6q-apalis: Cleanup Date: Wed, 15 Jun 2022 13:50:06 +0200 Message-Id: <20220615115006.45672-19-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045108_066313_C8E4076A X-CRM114-Status: GOOD ( 15.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: 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 --- Changes in v2: - Moved cleanup for things added in earlier commits of the series to the those commit rather than cleaning up later. - Added reviewed-by tags - Fixed '-' vs. '_' in node name as pointed out by Fabio - Added "adv,force-bt656-4" property as suggested by Fabio. - Added commit "ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi" and followed that in the commit adding the Ixora V1.2. - Rebased on top of imx/dt, 5.19-rc1 arch/arm/boot/dts/imx6q-apalis-eval.dts | 20 +-- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 15 +- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 217 ++++++++++++----------- 3 files changed, 126 insertions(+), 126 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index 19aaffd71f3d..fa160a389870 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -32,21 +32,21 @@ reg_pcie_switch: regulator-pcie-switch { compatible = "regulator-fixed"; - regulator-name = "pcie_switch"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + enable-active-high; gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>; + regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1800000>; + regulator-name = "pcie_switch"; startup-delay-us = <100000>; - enable-active-high; status = "okay"; }; reg_3v3_sw: regulator-3v3-sw { compatible = "regulator-fixed"; - regulator-name = "3.3V_SW"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; regulator-always-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "3.3V_SW"; }; }; @@ -110,11 +110,11 @@ status = "okay"; }; -®_usb_otg_vbus { +®_usb_host_vbus { status = "okay"; }; -®_usb_host_vbus { +®_usb_otg_vbus { status = "okay"; }; @@ -163,8 +163,8 @@ /* SD1 */ &usdhc2 { + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>; - cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index a9daf1bb970f..ce39c6a3f640 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -32,28 +32,27 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; pinctrl-0 = <&pinctrl_leds_ixora>; led4-green { - label = "LED_4_GREEN"; gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; + label = "LED_4_GREEN"; }; led4-red { - label = "LED_4_RED"; gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; + label = "LED_4_RED"; }; led5-green { - label = "LED_5_GREEN"; gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + label = "LED_5_GREEN"; }; led5-red { - label = "LED_5_RED"; gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; + label = "LED_5_RED"; }; }; }; @@ -115,11 +114,11 @@ status = "okay"; }; -®_usb_otg_vbus { +®_usb_host_vbus { status = "okay"; }; -®_usb_host_vbus { +®_usb_otg_vbus { status = "okay"; }; @@ -163,9 +162,9 @@ /* SD1 */ &usdhc2 { + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>; - cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 1144e4d106f0..7c17b91f0965 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -103,18 +103,18 @@ reg_module_3v3: regulator-module-3v3 { compatible = "regulator-fixed"; - regulator-name = "+V3.3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; regulator-always-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "+V3.3"; }; reg_module_3v3_audio: regulator-module-3v3-audio { compatible = "regulator-fixed"; - regulator-name = "+V3.3_AUDIO"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; regulator-always-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "+V3.3_AUDIO"; }; reg_ov5640_1v8_d_o_vdd: regulator-ov5640-1v8-d-o-vdd { @@ -139,63 +139,63 @@ reg_usb_otg_vbus: regulator-usb-otg-vbus { compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_regulator_usbotg_pwr>; - regulator-name = "usb_otg_vbus"; - regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; - enable-active-high; + regulator-min-microvolt = <5000000>; + regulator-name = "usb_otg_vbus"; status = "disabled"; }; /* on module USB hub */ reg_usb_host_vbus_hub: regulator-usb-host-vbus-hub { compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio3 28 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_regulator_usbhub_pwr>; - regulator-name = "usb_host_vbus_hub"; - regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio3 28 GPIO_ACTIVE_HIGH>; + regulator-min-microvolt = <5000000>; + regulator-name = "usb_host_vbus_hub"; startup-delay-us = <2000>; - enable-active-high; status = "okay"; }; reg_usb_host_vbus: regulator-usb-host-vbus { compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_regulator_usbh_pwr>; - regulator-name = "usb_host_vbus"; - regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; - enable-active-high; + regulator-min-microvolt = <5000000>; + regulator-name = "usb_host_vbus"; vin-supply = <®_usb_host_vbus_hub>; status = "disabled"; }; sound { compatible = "fsl,imx-audio-sgtl5000"; - model = "imx6q-apalis-sgtl5000"; - ssi-controller = <&ssi1>; audio-codec = <&codec>; audio-routing = "LINE_IN", "Line In Jack", "MIC_IN", "Mic Jack", "Mic Jack", "Mic Bias", "Headphone Jack", "HP_OUT"; - mux-int-port = <1>; + model = "imx6q-apalis-sgtl5000"; mux-ext-port = <4>; + mux-int-port = <1>; + ssi-controller = <&ssi1>; }; sound_spdif: sound-spdif { compatible = "fsl,imx-audio-spdif"; - model = "imx-spdif"; spdif-controller = <&spdif>; spdif-in; spdif-out; + model = "imx-spdif"; status = "disabled"; }; }; @@ -509,104 +509,105 @@ sda-gpios = <&gpio4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - pmic: pfuze100@8 { + pmic: pmic@8 { compatible = "fsl,pfuze100"; fsl,pmic-stby-poweroff; reg = <0x08>; regulators { sw1a_reg: sw1ab { - regulator-min-microvolt = <300000>; - regulator-max-microvolt = <1875000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <1875000>; + regulator-min-microvolt = <300000>; regulator-ramp-delay = <6250>; }; sw1c_reg: sw1c { - regulator-min-microvolt = <300000>; - regulator-max-microvolt = <1875000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <1875000>; + regulator-min-microvolt = <300000>; regulator-ramp-delay = <6250>; }; sw3a_reg: sw3a { - regulator-min-microvolt = <400000>; - regulator-max-microvolt = <1975000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <1975000>; + regulator-min-microvolt = <400000>; }; swbst_reg: swbst { - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5150000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <5150000>; + regulator-min-microvolt = <5000000>; }; snvs_reg: vsnvs { - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <3000000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <3000000>; + regulator-min-microvolt = <1000000>; }; vref_reg: vrefddr { - regulator-boot-on; regulator-always-on; + regulator-boot-on; }; vgen1_reg: vgen1 { - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1550000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <1550000>; + regulator-min-microvolt = <800000>; }; vgen2_reg: vgen2 { - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1550000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <1550000>; + regulator-min-microvolt = <800000>; }; vgen3_reg: vgen3 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <1800000>; }; vgen4_reg: vgen4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1800000>; }; vgen5_reg: vgen5 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <1800000>; }; vgen6_reg: vgen6 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <1800000>; }; }; }; codec: sgtl5000@a { compatible = "fsl,sgtl5000"; - reg = <0x0a>; + #sound-dai-cells = <0>; + clocks = <&clks IMX6QDL_CLK_CKO>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sgtl5000>; - clocks = <&clks IMX6QDL_CLK_CKO>; + reg = <0x0a>; VDDA-supply = <®_module_3v3_audio>; VDDIO-supply = <®_module_3v3>; VDDD-supply = <&vgen4_reg>; @@ -615,15 +616,15 @@ /* STMPE811 touch screen controller */ stmpe811@41 { compatible = "st,stmpe811"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_touch_int>; - reg = <0x41>; + blocks = <0x5>; + id = <0>; interrupts = <10 IRQ_TYPE_LEVEL_LOW>; - interrupt-parent = <&gpio4>; interrupt-controller; - id = <0>; - blocks = <0x5>; + interrupt-parent = <&gpio4>; irq-trigger = <0x1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_touch_int>; + reg = <0x41>; /* 3.25 MHz ADC clock speed */ st,adc-freq = <1>; /* 12-bit ADC */ @@ -653,9 +654,9 @@ stmpe_adc: stmpe_adc { compatible = "st,stmpe-adc"; + #io-channel-cells = <1>; /* forbid to use ADC channels 3-0 (touch) */ st,norequest-mask = <0x0F>; - #io-channel-cells = <1>; }; }; }; @@ -793,73 +794,73 @@ }; &uart1 { + fsl,dte-mode; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>; - fsl,dte-mode; uart-has-rtscts; status = "disabled"; }; &uart2 { + fsl,dte-mode; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2_dte>; - fsl,dte-mode; uart-has-rtscts; status = "disabled"; }; &uart4 { + fsl,dte-mode; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart4_dte>; - fsl,dte-mode; status = "disabled"; }; &uart5 { + fsl,dte-mode; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart5_dte>; - fsl,dte-mode; status = "disabled"; }; &usbotg { + disable-over-current; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbotg>; - disable-over-current; status = "disabled"; }; /* MMC1 */ &usdhc1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; - cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; - vqmmc-supply = <®_module_3v3>; bus-width = <8>; + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; disable-wp; no-1-8-v; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; + vqmmc-supply = <®_module_3v3>; status = "disabled"; }; /* SD1 */ &usdhc2 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc2>; - vqmmc-supply = <®_module_3v3>; bus-width = <4>; disable-wp; no-1-8-v; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + vqmmc-supply = <®_module_3v3>; status = "disabled"; }; /* eMMC */ &usdhc3 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc3>; - vqmmc-supply = <®_module_3v3>; bus-width = <8>; no-1-8-v; non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3>; + vqmmc-supply = <®_module_3v3>; status = "okay"; }; @@ -876,49 +877,49 @@ &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 >; - pinctrl_apalis_gpio1: gpio2io04grp { + pinctrl_apalis_gpio1: apalisgpio1grp { fsl,pins = < MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0 >; }; - pinctrl_apalis_gpio2: gpio2io05grp { + pinctrl_apalis_gpio2: apalisgpio2grp { fsl,pins = < MX6QDL_PAD_NANDF_D5__GPIO2_IO05 0x130b0 >; }; - pinctrl_apalis_gpio3: gpio2io06grp { + pinctrl_apalis_gpio3: apalisgpio3grp { fsl,pins = < MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x130b0 >; }; - pinctrl_apalis_gpio4: gpio2io07grp { + pinctrl_apalis_gpio4: apalisgpio4grp { fsl,pins = < MX6QDL_PAD_NANDF_D7__GPIO2_IO07 0x130b0 >; }; - pinctrl_apalis_gpio5: gpio6io10grp { + pinctrl_apalis_gpio5: apalisgpio5grp { fsl,pins = < MX6QDL_PAD_NANDF_RB0__GPIO6_IO10 0x130b0 >; }; - pinctrl_apalis_gpio6: gpio6io09grp { + pinctrl_apalis_gpio6: apalisgpio6grp { fsl,pins = < MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09 0x130b0 >; }; - pinctrl_apalis_gpio7: gpio1io02grp { + pinctrl_apalis_gpio7: apalisgpio7grp { fsl,pins = < MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x130b0 >; }; - pinctrl_apalis_gpio8: gpio1io06grp { + pinctrl_apalis_gpio8: apalisgpio8grp { fsl,pins = < MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x130b0 >; @@ -1011,7 +1012,7 @@ >; }; - pinctrl_gpio_bl_on: gpioblon { + pinctrl_gpio_bl_on: gpioblongrp { fsl,pins = < MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x1b0b0 >; @@ -1156,7 +1157,7 @@ >; }; - pinctrl_mmc_cd: gpiommccdgrp { + pinctrl_mmc_cd: mmccdgrp { fsl,pins = < /* MMC1 CD */ MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x000b0 @@ -1187,35 +1188,35 @@ >; }; - pinctrl_regulator_usbh_pwr: gpioregusbhpwrgrp { + pinctrl_regulator_usbh_pwr: regusbhpwrgrp { fsl,pins = < /* USBH_EN */ MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x0f058 >; }; - pinctrl_regulator_usbhub_pwr: gpioregusbhubpwrgrp { + pinctrl_regulator_usbhub_pwr: regusbhubpwrgrp { fsl,pins = < /* USBH_HUB_EN */ MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x0f058 >; }; - pinctrl_regulator_usbotg_pwr: gpioregusbotgpwrgrp { + pinctrl_regulator_usbotg_pwr: regusbotgpwrgrp { fsl,pins = < /* USBO1 power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x0f058 >; }; - pinctrl_reset_moci: gpioresetmocigrp { + pinctrl_reset_moci: resetmocigrp { fsl,pins = < /* RESET_MOCI control */ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x0f058 >; }; - pinctrl_sd_cd: gpiosdcdgrp { + pinctrl_sd_cd: sdcdgrp { fsl,pins = < /* SD1 CD */ MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x000b0 @@ -1235,13 +1236,22 @@ >; }; - pinctrl_touch_int: gpiotouchintgrp { + pinctrl_touch_int: touchintgrp { fsl,pins = < /* STMPE811 interrupt */ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0 >; }; + /* Additional DTR, DSR, DCD */ + pinctrl_uart1_ctrl: uart1ctrlgrp { + fsl,pins = < + 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 = < MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1 @@ -1259,15 +1269,6 @@ >; }; - /* Additional DTR, DSR, DCD */ - pinctrl_uart1_ctrl: uart1ctrlgrp { - fsl,pins = < - 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 = < MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1 @@ -1321,7 +1322,7 @@ >; }; - pinctrl_usdhc1_4bit: usdhc1grp_4bit { + pinctrl_usdhc1_4bit: usdhc1-4bitgrp { fsl,pins = < MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071 MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071 @@ -1332,7 +1333,7 @@ >; }; - pinctrl_usdhc1_8bit: usdhc1grp_8bit { + pinctrl_usdhc1_8bit: usdhc1-8bitgrp { fsl,pins = < MX6QDL_PAD_NANDF_D0__SD1_DATA4 0x17071 MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17071