From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F3C0C19759 for ; Wed, 7 Aug 2019 08:27:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 09D9B22CBB for ; Wed, 7 Aug 2019 08:27:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="i2cApbL3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387757AbfHGI0y (ORCPT ); Wed, 7 Aug 2019 04:26:54 -0400 Received: from mail-eopbgr130110.outbound.protection.outlook.com ([40.107.13.110]:52856 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387680AbfHGI0o (ORCPT ); Wed, 7 Aug 2019 04:26:44 -0400 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 CC: Philippe Schenker , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Pengutronix Kernel Team , NXP Linux Team , Sascha Hauer 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= Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: quoted-printable 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 @@ }; }; =20 +&can1 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_flexcan1>; + status =3D "disabled"; +}; + +&can2 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_flexcan2>; + status =3D "disabled"; +}; + &i2c1 { status =3D "okay"; =20 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 =3D "default"; pinctrl-0 =3D <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6>; + &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6 &pinctrl_gpio7>; }; =20 &iomuxc_snvs { diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dt= s/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 =3D "default"; pinctrl-0 =3D <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5>; + &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>; =20 }; =20 diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-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 @@ >; }; =20 + pinctrl_flexcan1: flexcan1-grp { + fsl,pins =3D < + MX6UL_PAD_ENET1_RX_DATA0__FLEXCAN1_TX 0x1b020 + MX6UL_PAD_ENET1_RX_DATA1__FLEXCAN1_RX 0x1b020 + >; + }; + pinctrl_flexcan2: flexcan2-grp { fsl,pins =3D < MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX 0x1b020 @@ -271,8 +278,6 @@ =20 pinctrl_gpio1: gpio1-grp { fsl,pins =3D < - 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 @@ >; }; =20 + pinctrl_gpio7: gpio7-grp { /* CAN1 */ + fsl,pins =3D < + 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 =3D < MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9 --=20 2.22.0