From patchwork Wed Aug 7 08:26:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Schenker X-Patchwork-Id: 11081583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02BE31399 for ; Wed, 7 Aug 2019 08:33:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4061289B9 for ; Wed, 7 Aug 2019 08:33:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7B85289BC; Wed, 7 Aug 2019 08:33:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6E190289B9 for ; Wed, 7 Aug 2019 08:33:11 +0000 (UTC) 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:In-Reply-To:References: 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: List-Owner; bh=PeTg3RYpd2K9JR8G8taDWeATeGeGGkm4DpJ1mfVPK8s=; b=IvyvKL05K7YUb6 xSb+pjxcpftlMO/mxGZSkt2N/+3J8TMuAFI4+JMoo1J169XM2aoHjl6zXa6aSReNh44Ph811akdqX tdM7F8KOQ0OI2IH1TcX2anC2N8lvkeolW5N919GVfop5GGR5cV9Py+wKm/86ZiFLsdbMD9x6tTCUq aNPsn/51cTyb754Xw77bu1oPkIvYa3mbIFksuV16NkhY1P3GW4fC2722xANr8TlW24xRoIcYxTPEI Bij8rVNTMPFxl9aVH0vdf4/NDrzqqVTIunomweAc4eGi9HJpLTIkf1eNpPShdaZtzMfH8F5La7Yh+ tqMFsRCNz6HTR4uK1qFQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hvHNe-00009T-Bv; Wed, 07 Aug 2019 08:33:10 +0000 Received: from mail-eopbgr130100.outbound.protection.outlook.com ([40.107.13.100] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hvHHQ-0002vu-G9 for linux-arm-kernel@lists.infradead.org; Wed, 07 Aug 2019 08:26:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QRqLf8sdCSrOfKRY8vG5Tam52KhZAHhx9x+uM2nCrcgSDfgb9h4hp9wIBPTRTy5oxko/OSOPSFMWXbNxIVCgq1i3RseRDhPysbWJOseCpscR/A7lPdLreEojaTY8izLIRM28prbVGz/JQI8M+m+gz4s0EXF/cI5SM8FYKAW94dnTdziJhxmqYap7ilOm4sp02GIi/xY2OuidEQ6Bm4vscEd2TtWIvdZ85XEZDqHbFLoJ4xYu1esaImykHkkwcz6fDd3EWzDcvKONzdWKYUe/mULdAZVHIZ5LFRASP328uxBc6UzMnhKd5dwaAoZYDB6c773+HOp3r/owSAGQD9Xqtw== 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=Zad6bzruiDtMzAzc/vJgaSHxnt2FoS1KzBD88SGmQpY=; b=LW3O6gTTeRy6S8zdwTd1/0tcO0CSBmodda3siyR5E7xOsllHA59hRpP1TvefTZ2L2uIE4gZvrfOX1oY9eZ4Ve2ugc1PC5It0qRZHLYrxdlzH2PFtlZQbDLqDYieJ2lwRLCmstu5HNEUrqhAsaPt5TgMX1Ms0OnIRATukfR8d8Eze2kN1fgcQp6IR0k9o3B3JNHCcb6tfSnhyOoJIo4F6tr86Oj3UFP5gRyfEe6ykIXsvyPfVSM03pBZ9e4Q0pvVFTtF/R2LfJ7YLVt6SYCt/HeacN9Neyrg1YC02KAqvTz+xU+1GaZEBziidQjeyCNuGkZfMSWe4qqDD0oe611yF5A== 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=Zad6bzruiDtMzAzc/vJgaSHxnt2FoS1KzBD88SGmQpY=; b=i2cApbL3kczyR4s0oKaRYW67xTzlCpvOUR9aK52SdTwphWxIcISrep9yuCTGhuLaxYiOsMJBU0FdyomZsG4bjxrcKw7VQMqwmDTAtpdYU9ObOx8bAizE6aQNje8ELm56xQcgArQCMGUUB8Ykvsc3L21PXDyZBmIh8WV14NaA8Y0= Received: from VI1PR0502MB3965.eurprd05.prod.outlook.com (52.134.17.157) by VI1PR0502MB3614.eurprd05.prod.outlook.com (52.134.7.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.16; Wed, 7 Aug 2019 08:26:40 +0000 Received: from VI1PR0502MB3965.eurprd05.prod.outlook.com ([fe80::8405:5b51:b25d:39a2]) by VI1PR0502MB3965.eurprd05.prod.outlook.com ([fe80::8405:5b51:b25d:39a2%6]) with mapi id 15.20.2157.015; Wed, 7 Aug 2019 08:26:40 +0000 From: Philippe Schenker To: Marcel Ziswiler , Max Krummenacher , "stefan@agner.ch" , "devicetree@vger.kernel.org" , Rob Herring , Shawn Guo , Mark Rutland , =?iso-8859-2?q?Michal_Vok=E1=E8?= , Fabio Estevam Subject: [PATCH v3 17/21] ARM: dts: imx6ull: improve can templates Thread-Topic: [PATCH v3 17/21] ARM: dts: imx6ull: improve can templates Thread-Index: AQHVTPnWg3X3des7t06cvcYeXC7LxQ== Date: Wed, 7 Aug 2019 08:26:40 +0000 Message-ID: <20190807082556.5013-18-philippe.schenker@toradex.com> References: <20190807082556.5013-1-philippe.schenker@toradex.com> In-Reply-To: <20190807082556.5013-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: AM4PR0101CA0044.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::12) To VI1PR0502MB3965.eurprd05.prod.outlook.com (2603:10a6:803:23::29) authentication-results: spf=none (sender IP is ) smtp.mailfrom=philippe.schenker@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.22.0 x-originating-ip: [46.140.72.82] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5bb69788-c4eb-4208-d140-08d71b10f87e x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:VI1PR0502MB3614; x-ms-traffictypediagnostic: VI1PR0502MB3614: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1247; x-forefront-prvs: 01221E3973 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(346002)(376002)(396003)(39850400004)(136003)(366004)(199004)(189003)(305945005)(14444005)(6116002)(26005)(81156014)(76176011)(36756003)(3846002)(6486002)(86362001)(6512007)(478600001)(25786009)(71190400001)(2906002)(7416002)(81166006)(256004)(316002)(71200400001)(2201001)(44832011)(53936002)(7736002)(110136005)(8936002)(54906003)(52116002)(66446008)(64756008)(14454004)(99286004)(476003)(102836004)(8676002)(6436002)(1076003)(66556008)(5660300002)(6506007)(2501003)(4326008)(66946007)(486006)(446003)(11346002)(66066001)(68736007)(50226002)(186003)(66476007)(2616005)(386003)(32563001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0502MB3614; 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-message-info: 1L8eUQZRT+ZefmecGypN8bdSP033ouS8+KHeRVZSIa1cM2x32TPBFmPIHwZx/Tt4v//5nhU/0u5AMCbwVqt9XNyGTPBKKZmVkC16e1GoIYiuvkqMrrCeC6/zBwCZRL5ZWNbacgGHCUBPO1k7Dw98y6aVgN6l1jGRY0JZRxALZudshLAE2FqPzfI3qGGa0Qqe4Bl4V3H+fs8AHkWqUg6XRKHZEohJ/DF0c3B8NZDpQhT2eqxvATBYr+w8gSU3sgfaf4TshUxy88ZlIaFMnLxD5Y1C1etEn3NUv3qEekCbdfV376GXl/vXPJ8oPjlPpFvqpuNrPMxJb0PYFqOooQyUJKNLv7RYshOA8UQx+/3sgGSPiqeEXtjWS+zwO9HjxZvwo9nZSauusas8Y5AsxpyPjORdNMQJ7Svl6uAiVJpYEGk= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5bb69788-c4eb-4208-d140-08d71b10f87e X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Aug 2019 08:26:40.0820 (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: X62hpzbVbDrtKVv0UAEcmnVBqOAciRPN9a8r7aL7TCgJjaCVNPXcMO79sGnK7T1MikTlw3RuATZKhLGK4GdOPpfw2vutmlzW395ocHUtf2I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0502MB3614 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190807_012644_619064_DF4216D7 X-CRM114-Status: GOOD ( 12.14 ) 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: Sascha Hauer , "linux-kernel@vger.kernel.org" , Philippe Schenker , NXP Linux Team , 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 X-Virus-Scanned: ClamAV using ClamSMTP From: Max Krummenacher Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63 and move the inactive flexcan nodes to imx6ull-colibri-eval-v3.dtsi where they belong. Note that this commit does not enable flexcan functionality, but rather eases the effort needed to do so. Signed-off-by: Max Krummenacher Signed-off-by: Philippe Schenker --- Changes in v3: None Changes in v2: None arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 12 ++++++++++++ arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri.dtsi | 16 ++++++++++++++-- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi index b6147c76d159..3bee37c75aa6 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -83,6 +83,18 @@ }; }; +&can1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + status = "disabled"; +}; + +&can2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + status = "disabled"; +}; + &i2c1 { status = "okay"; diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi index fb213bec4654..95a11b8bcbdb 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi @@ -15,7 +15,7 @@ &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6>; + &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6 &pinctrl_gpio7>; }; &iomuxc_snvs { diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi index 038d8c90f6df..a0545431b3dc 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -26,7 +26,7 @@ &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5>; + &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index e3220298dd6f..553d4c1f80e9 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -256,6 +256,13 @@ >; }; + pinctrl_flexcan1: flexcan1-grp { + fsl,pins = < + MX6UL_PAD_ENET1_RX_DATA0__FLEXCAN1_TX 0x1b020 + MX6UL_PAD_ENET1_RX_DATA1__FLEXCAN1_RX 0x1b020 + >; + }; + pinctrl_flexcan2: flexcan2-grp { fsl,pins = < MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX 0x1b020 @@ -271,8 +278,6 @@ pinctrl_gpio1: gpio1-grp { fsl,pins = < - MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */ - MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0x74 /* SODIMM 63 */ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0X14 /* SODIMM 77 */ MX6UL_PAD_JTAG_TCK__GPIO1_IO14 0x14 /* SODIMM 99 */ MX6UL_PAD_NAND_CE1_B__GPIO4_IO14 0x14 /* SODIMM 133 */ @@ -325,6 +330,13 @@ >; }; + pinctrl_gpio7: gpio7-grp { /* CAN1 */ + fsl,pins = < + MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */ + MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0x74 /* SODIMM 63 */ + >; + }; + pinctrl_gpmi_nand: gpmi-nand-grp { fsl,pins = < MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9