From patchwork Wed Oct 16 17:03:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Schenker X-Patchwork-Id: 11193825 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C1E7114ED for ; Wed, 16 Oct 2019 17:03:52 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 8769720663 for ; Wed, 16 Oct 2019 17:03:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rWNOasXB"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="gq7KpqGq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8769720663 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=toradex.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=QDSNBpTpAP5P2iRE8ZsK0bthrEcfWYr0296BKcyVVnc=; b=rWNOasXBntgcxU 2iljto0CtKRkl/3/iembjha2uzaFPhJKAzl5rGyamW0UfHaztZURykcP268Zxk38Hr0LPAoyeiCsa RQwQB5BOoCOuQl6q+yf4ws6r5EEWiYrgC1nQTiKiSinFrLazkyd6d6iY81EWHQTaLi4N5NINiZCTa 8h0nfZj+gxOQe5TQ99ZDV25vDx/zl9iG/Ngm2w13Tu5CIwI+oTzf0nLtnx1l+Cyw/2o91BDEm/d98 xOZCiU0vtiWhVoA0RhWnrombwtIJMaOox6Hs7wz7Zgl5+afFfvf2P/pU3LtiLmes/R/LIYdx1mlg5 /q9cFD7DKek66k25RAEg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKmiG-0001nI-5i; Wed, 16 Oct 2019 17:03:52 +0000 Received: from mail-eopbgr50116.outbound.protection.outlook.com ([40.107.5.116] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKmiC-0001mC-FS for linux-arm-kernel@lists.infradead.org; Wed, 16 Oct 2019 17:03:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UN+vEdqcWrCGnJvnzVPeby67dVp/80P5qY5CkLMg38OItJH3KDdyP2P8nf6+yhlIcV4ty+8h4hYOK2oC0RDsGAJSqMoZjQc57OKu5zR0aLWZ53wnmQ2cHIzziHG7TXo/rdzlGmn7kdM1kEUSj6HXeZyOmy1d5hAU/NKgrbxIQK35UpNifc9HYtRW8UrQBgQyAuo2sRPyoUCYjHQijKQAfDnXLQZvpbEerS2u8ObYHLMzdpYmEvYJADq9/CSnN6Qyp3QOSzVIJdznb2LDjCquPShO61ciHIW6YA8LewQqXdZr/8Xd2e+BFoBk5dEs1Z6eNEPibJe6Tcm5yLtmChEZIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=902Po3pbS8iMr4ClSt636Ubn51ClllqxSRLMbQUwMIk=; b=WY8lJ8HMPeVrIQf0SQwaoQQ0Grdw4/UGGUWf3A51oxqc8JlFMYLc+uUlS2hfiCgj598KSrRRAflPd+AtwCW7iUiH0XG3EVVne7+Y4kQnfgmf9b3VZJP6VffCpPs0TTsqV8LJepjeyvRYVmhLYhDbnfiznSKWuPwJrJliheVK2MT6Fq2QHMRHKvw8G8Z55gKUkaOJ2dLOaUYt64wyMHN5P3G3lYYsBY39b1NNBjlH/+ZI6LggfRcnK/6PtWqf94Pzd/5WUlavlPa+R2b2Z7Q2H6H5aDiL2y6EGN50dsd4lxoEP8LPT4phGh5MjRk277QwzlwOrj+OAPiURyF7fmyV2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=toradex.com; dmarc=pass action=none header.from=toradex.com; dkim=pass header.d=toradex.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=902Po3pbS8iMr4ClSt636Ubn51ClllqxSRLMbQUwMIk=; b=gq7KpqGqcJ0C8bOj6QgE20R3Gz01Ebvd88fDQ0wLeXdvZPDa2s6yulunFSxLT3KP5irKXK14me62S3eeLeaXnmsnSgV7ke5tHuWHfz/Vr/kQcLbE2q0E2+YFV9+b1LilDvU04/gZ8WEEvUTIu14bkwRQ82s7bDfUTnHf1dNR+xk= Received: from VI1PR0502MB3965.eurprd05.prod.outlook.com (52.134.19.20) by VI1PR0502MB3039.eurprd05.prod.outlook.com (10.175.21.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.18; Wed, 16 Oct 2019 17:03:41 +0000 Received: from VI1PR0502MB3965.eurprd05.prod.outlook.com ([fe80::f427:26bb:85cf:abad]) by VI1PR0502MB3965.eurprd05.prod.outlook.com ([fe80::f427:26bb:85cf:abad%7]) with mapi id 15.20.2347.023; Wed, 16 Oct 2019 17:03:41 +0000 From: Philippe Schenker To: "devicetree@vger.kernel.org" , Shawn Guo Subject: [PATCH v2 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c Thread-Topic: [PATCH v2 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c Thread-Index: AQHVhEOpbdbADN9NeE6Hx9OYrwaOig== Date: Wed, 16 Oct 2019 17:03:41 +0000 Message-ID: <20191016170332.2013-1-philippe.schenker@toradex.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To VI1PR0502MB3965.eurprd05.prod.outlook.com (2603:10a6:803:26::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=philippe.schenker@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.23.0 x-originating-ip: [46.140.72.82] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1a8d5d1d-9c71-4c65-37ab-08d7525acb89 x-ms-traffictypediagnostic: VI1PR0502MB3039: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1265; x-forefront-prvs: 0192E812EC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(346002)(396003)(39850400004)(136003)(376002)(366004)(199004)(189003)(2501003)(476003)(102836004)(386003)(6506007)(26005)(7736002)(50226002)(71200400001)(4326008)(478600001)(8676002)(8936002)(186003)(2616005)(3846002)(44832011)(66066001)(7416002)(99286004)(14454004)(6116002)(305945005)(86362001)(486006)(2906002)(71190400001)(110136005)(54906003)(316002)(6436002)(66476007)(5660300002)(256004)(6512007)(14444005)(6486002)(81156014)(81166006)(36756003)(66446008)(66556008)(64756008)(52116002)(66946007)(25786009)(1076003); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0502MB3039; H:VI1PR0502MB3965.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PM8nKlznU7X0S5RkXrafotE4n+ALUwm/WWZ9CjZnPjdXxl6lf4k2hmMZGbXRZRcNqPZ17HDX/273sz8gkrFqNvwfoSH4H4yu2wUoHwD42BIPwGEi8rOKzIcfZOBZoBdLSRZJarl1Wjvh6W7YoiLLwQeyEhMD88ny+y34uep2K2IHdPCV6+gf2s5i9FA97Z9HxLnWmY+XT1jOuH5coxGcXrDpqmv+7M1Scy74CemyPuAQev1QvbAaYirf1u/2NDj8MY9lDvH/3v+OPu0nf+HlsLUL2s+hB/+AGApYTx5Pc/MKy0MsKzESMLMxrOUzqFhxEeHipZbul4bGz/BIW9R7J66beLF4E1Ic7PIDZUV9KIsbnX8CHJ6ivjryZI5cZbKYn1M5ZR40GwztBtE2ipRV39YJqrZuRsjU+g5KujafpSA= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a8d5d1d-9c71-4c65-37ab-08d7525acb89 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Oct 2019 17:03:41.4014 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 5dyTuSXckrbobAOKmPDcbgv1uKhphqy6NZU4/xd4vQ711vr+HwiAwgDZ7i4X/7gJQgMc6VzLHsLyfuNq92XXa9Gbj/RiO2P7J+KuMtW5MUc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0502MB3039 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191016_100348_524167_A870D762 X-CRM114-Status: GOOD ( 11.84 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.5.116 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Max Krummenacher , Stefan Agner , Marcel Ziswiler , Sascha Hauer , "linux-kernel@vger.kernel.org" , Philippe Schenker , Rob Herring , NXP Linux Team , Luka Pivk , Fabio Estevam , Pengutronix Kernel Team , "linux-arm-kernel@lists.infradead.org" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch adds missing i2c recovery modes and corrects wrongly named ones. Signed-off-by: Philippe Schenker --- Changes in v2: - Added scl/sda gpio - Added missing recovery mode to i2c2 on imx6qdl-colibri arch/arm/boot/dts/imx6qdl-apalis.dtsi | 30 +++++++++++++++++++++----- arch/arm/boot/dts/imx6qdl-colibri.dtsi | 18 ++++++++++++---- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 7c4ad541c3f5..86cad6c9f0f9 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -205,8 +205,11 @@ /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ &i2c1 { clock-frequency = <100000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c1>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio5 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; }; @@ -216,8 +219,11 @@ */ &i2c2 { clock-frequency = <100000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c2>; + pinctrl-1 = <&pinctrl_i2c2_gpio>; + scl-gpios = <&gpio4 12 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; pmic: pfuze100@8 { @@ -372,9 +378,9 @@ */ &i2c3 { clock-frequency = <100000>; - pinctrl-names = "default", "recovery"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c3>; - pinctrl-1 = <&pinctrl_i2c3_recovery>; + pinctrl-1 = <&pinctrl_i2c3_gpio>; scl-gpios = <&gpio3 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios = <&gpio3 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; @@ -646,6 +652,13 @@ >; }; + pinctrl_i2c1_gpio: i2c1gpiogrp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26 0x4001b8b1 + MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27 0x4001b8b1 + >; + }; + pinctrl_i2c2: i2c2grp { fsl,pins = < MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 @@ -653,6 +666,13 @@ >; }; + pinctrl_i2c2_gpio: i2c2gpiogrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x4001b8b1 + MX6QDL_PAD_KEY_ROW3__GPIO4_IO13 0x4001b8b1 + >; + }; + pinctrl_i2c3: i2c3grp { fsl,pins = < MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 @@ -660,7 +680,7 @@ >; }; - pinctrl_i2c3_recovery: i2c3recoverygrp { + pinctrl_i2c3_gpio: i2c3gpiogrp { fsl,pins = < MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x4001b8b1 MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x4001b8b1 diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index 019dda6b88ad..8ab9960fc15d 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -166,8 +166,11 @@ */ &i2c2 { clock-frequency = <100000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c2>; + pinctrl-0 = <&pinctrl_i2c2_gpio>; + scl-gpios = <&gpio2 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio3 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; pmic: pfuze100@8 { @@ -312,9 +315,9 @@ */ &i2c3 { clock-frequency = <100000>; - pinctrl-names = "default", "recovery"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c3>; - pinctrl-1 = <&pinctrl_i2c3_recovery>; + pinctrl-1 = <&pinctrl_i2c3_gpio>; scl-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; @@ -509,6 +512,13 @@ >; }; + pinctrl_i2c2_gpio: i2c2grp { + fsl,pins = < + MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x4001b8b1 + MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x4001b8b1 + >; + }; + pinctrl_i2c3: i2c3grp { fsl,pins = < MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 @@ -516,7 +526,7 @@ >; }; - pinctrl_i2c3_recovery: i2c3recoverygrp { + pinctrl_i2c3_gpio: i2c3gpiogrp { fsl,pins = < MX6QDL_PAD_GPIO_3__GPIO1_IO03 0x4001b8b1 MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x4001b8b1