From patchwork Mon Mar 14 16:29: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: 12780462 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 0CEE7C433F5 for ; Mon, 14 Mar 2022 16:34:28 +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=hK+uiAu8Qk4GCvtrgHlQayoGOfpS8IiysFOx3hfPmkI=; b=Sxt1ikcGJcRdV9 rIQtLk6Ki0uNKJ/VYvZV0LTgBKAEi4gxkHNRXT72oCoqBcMOl8WNw22Mmr7QRCCAhQgwwPNXXDThj /mY5Uc913UUY+XSdv7zFecJTR1Oh1pSuZqs11XvE5BP53vWIY7DCcOjT1zlFP7Nneqc2Cm3vRm4HM Q3xvC177mp0ZuswaFA+7bfqO6Lp1xb4l5loU5yv0Xtg9pKp8A46AyXXxdixhFBSrGC6J3O2h/yoOz fRMiN+3/mI3D2t+DrUjgZ1vK2b8m6OQ3gmgKrHt/LxlenOAo/xDY7v4xZw/U4/Jr6XWtXVSeOqhyO Kyv/JqgVTZw6fAZWd47Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnct-0062EH-OB; Mon, 14 Mar 2022 16:32:56 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnaX-00615x-3I for linux-arm-kernel@bombadil.infradead.org; Mon, 14 Mar 2022 16:30:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=erJKWfBVOPAC7/YbLDzpdnGH/84KxFdomOjrDboBHfI=; b=rZRcHFcQvn68kewQd4g4pSTNce Em816CKBwuhO5dGTihQGD3SrsowFP15gTClX7yyVZ7ejieeU4Ube5ZiFCevYh0647z94XjNVJpsma XSlk4JNfwKMAE5B+borqLhsbEQITr2wI0xxDzKx7Xdkj3/2pfSgXooC7Yf12/K8CgDj84c34eUaZo UONW4rbn7whBopDW8EI1Zsmr2eflZw1HtXTSCKQ8X+20/9EUKv/CPljUiHACxHnXNeZEkewZOdyKk pn5i+vjt2GoV/s36hTcCZWeQ6tQ3XoRBEAVXCXFC8Cr2j6gwEl2ASrkax7LrIHHrM9ZhjY95DYlnz HPVdGDvg==; Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnaT-000u8O-P2 for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:30:27 +0000 Received: by mail-wm1-x332.google.com with SMTP id k8-20020a05600c1c8800b003899c7ac55dso9248wms.1 for ; Mon, 14 Mar 2022 09:30:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=erJKWfBVOPAC7/YbLDzpdnGH/84KxFdomOjrDboBHfI=; b=cZCKVB8t8KSxqaj37vNnTAYOOXjtoVKGCKEf45FO/JhqDkD4X1fmmhYmJTvGzZeIqJ YgEXV+OfhEWS+TaNVEt+qLIkzv+0RuGMEjQqndI/t23z3OZvg8bh56CZ7Q2GEPmX0XAT 4Du/N+CcT1mWqYBI9x/UJaXPb5BShIcnen/XjH7DDwUCU48cVbC0d3/cFEa+X8D6APHx tD2sqJU3I7q41mByFWHZHQjlO0blSonXRBDjwQ1L0HARLaN+3BWaTagZbY05hTexYasE 68p3jCSehZESe79but0Dom54DDr9/CcqdqoGH6d46a5ntjU3fw0eMVg4HYlq1Pv5Rcsl Uc+A== 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=erJKWfBVOPAC7/YbLDzpdnGH/84KxFdomOjrDboBHfI=; b=P49m7PR+z8uJ/4u6ixWM7yBINsJojehH7dX4GQuYSfidPvBNRFL5zsq8ADZZC7rBVl a+klCxRNyGaT9cEqmfKu7mhoF8ifkTjerZmhu+bvor3VMu1q8wN8+UM7Upz3Kmk4dFG4 Zh0cTEg3zdiZ3nicqos2XvmpX/3+7eZOa9rEM7XrLyI21uu0wsMQ6nyX+hYptGD0FxzQ GSEeyJaqKpM3G8VPbRuVehixM6K9G0fS4LufQVClRSCl4QNUBiU/8JhHVsEHIsmRAvG3 P1fLzd1wxnqzhirf8Oq4nYuZ98/gA6g7m847kiO5SYB0Q3wUkG5E6/9HQgeJUtqzMYb1 KNkQ== X-Gm-Message-State: AOAM532oeiQBhzMt5oVpTb4svSwQUYizhkhkCI15o0u4RvZGh08ws8CS m0ZcEWklOS6+bzUDdCuztk8= X-Google-Smtp-Source: ABdhPJzg8REEfcJlApAVgv6ga/UP1lVc3QKJ2cYQrHVEOYgQPeWLyQU56sDjkT5peLsoa/G6IPt66w== X-Received: by 2002:a05:600c:21d1:b0:381:4fed:159a with SMTP id x17-20020a05600c21d100b003814fed159amr5422wmj.143.1647275423287; Mon, 14 Mar 2022 09:30:23 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-124.static.upc.ch. [31.10.206.124]) by smtp.gmail.com with ESMTPSA id w10-20020a5d680a000000b001f1dabec837sm13476817wru.113.2022.03.14.09.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 09:30:22 -0700 (PDT) From: Max Krummenacher X-Google-Original-From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 09/14] ARM: dts: imx6dl-colibri: Move common nodes to SoM dtsi Date: Mon, 14 Mar 2022 17:29:53 +0100 Message-Id: <20220314162958.40361-10-max.krummenacher@toradex.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220314162958.40361-1-max.krummenacher@toradex.com> References: <20220314162958.40361-1-max.krummenacher@toradex.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163025_906847_9D86CBA7 X-CRM114-Status: GOOD ( 17.48 ) 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 The following two nodes define module level functionality, move them from the carrier board dts file to the SoM file. While at it, reorder the properties in the gpio-keys node alphabetical. - gpio-keys defining the wakeup pin - memory node The atmel touchscreen node can be used on any carrier board. Move it from the carrier board to the module-level device tree and keep it disabled. Set the default pinmuxing to the dedicated connector available on newer carrier boards and rename the pinctrl labels specifying the INT/Reset signal to a common pattern. pinctrl_atmel_conn - uses 107/106 pins as used on dedicated connector pinctrl_atmel_adap - uses 28/30 pins as used with jumper wires Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 49 ------------------ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 53 ++++++++++++++++++++ 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 535b5c156229..dff2d35e693b 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -17,12 +17,6 @@ compatible = "toradex,colibri_imx6dl-eval-v3", "toradex,colibri_imx6dl", "fsl,imx6dl"; - /* Will be filled by the bootloader */ - memory@10000000 { - device_type = "memory"; - reg = <0x10000000 0>; - }; - aliases { i2c0 = &i2c2; i2c1 = &i2c3; @@ -44,20 +38,6 @@ clock-frequency = <16000000>; clock-output-names = "clk16m"; }; - - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio_keys>; - - wakeup { - label = "Wake-Up"; - gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */ - linux,code = ; - debounce-interval = <10>; - wakeup-source; - }; - }; }; /* Colibri SSP */ @@ -81,21 +61,6 @@ &i2c3 { 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"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pcap_1>; - reg = <0x4a>; - interrupt-parent = <&gpio1>; - interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ - reset-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; /* SODIMM 30 */ - status = "disabled"; - }; - /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0"; @@ -111,20 +76,6 @@ &pinctrl_weim_gpio_5 &pinctrl_weim_gpio_6 &pinctrl_usbh_oc_1 &pinctrl_usbc_id_1 >; - - pinctrl_pcap_1: pcap1grp { - fsl,pins = < - MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 /* SODIMM 28 */ - MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* SODIMM 30 */ - >; - }; - - pinctrl_mxt_ts: mxttsgrp { - fsl,pins = < - MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x130b0 /* SODIMM 107 */ - MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x130b0 /* SODIMM 106 */ - >; - }; }; &pwm1 { diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index 3459bfb5c60b..1c49fd3e6286 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -23,6 +23,20 @@ status = "disabled"; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; + + wakeup { + debounce-interval = <10>; + gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */ + label = "Wake-Up"; + linux,code = ; + wakeup-source; + }; + }; + lcd_display: disp0 { compatible = "fsl,imx-parallel-display"; interface-pix-fmt = "bgr666"; @@ -50,6 +64,12 @@ }; }; + /* Will be filled by the bootloader */ + memory@10000000 { + device_type = "memory"; + reg = <0x10000000 0>; + }; + panel_dpi: panel-dpi { /* * edt,et057090dhu: EDT 5.7" LCD TFT @@ -564,6 +584,17 @@ scl-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; + + atmel_mxt_ts: touchscreen@4a { + compatible = "atmel,maxtouch"; + interrupt-parent = <&gpio2>; + interrupts = <24 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 */ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_atmel_conn>; + reg = <0x4a>; + reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */ + status = "disabled"; + }; }; &ipu1_di0_disp0 { @@ -682,6 +713,28 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbh_oc_1>; + /* Atmel MXT touchsceen + Capacitive Touch Adapter */ + /* NOTE: This pin group conflicts with pin groups + * pinctrl_pwm1/pinctrl_pwm4. Don't use them simultaneously. + */ + pinctrl_atmel_adap: atmeladaptergrp { + fsl,pins = < + MX6QDL_PAD_GPIO_9__GPIO1_IO09 0xb0b1 /* SODIMM 28 */ + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0xb0b1 /* SODIMM 30 */ + >; + }; + + /* Atmel MXT touchsceen + boards with built-in Capacitive Touch Connector */ + /* NOTE: This pin group conflicts with pin groups pinctrl_weim_cs1 and + * pinctrl_weim_cs2. Don't use them simultaneously. + */ + pinctrl_atmel_conn: atmelconnectorgrp { + fsl,pins = < + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0xb0b1 /* SODIMM_107 */ + MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0xb0b1 /* SODIMM_106 */ + >; + }; + pinctrl_audmux: audmuxgrp { fsl,pins = < MX6QDL_PAD_KEY_COL0__AUD5_TXC 0x130b0