From patchwork Mon Aug 12 14:21: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: 11089961 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 540F3746 for ; Mon, 12 Aug 2019 14:27:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 429272845E for ; Mon, 12 Aug 2019 14:27:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35E062848F; Mon, 12 Aug 2019 14:27:27 +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 B6F3B27FE4 for ; Mon, 12 Aug 2019 14:27:26 +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=o3IPRKwP8AZ0WEo0+KJZagpueimtjFdi7aJjHLpaduM=; b=ItYfEMT/Ws0m4T Tva2wPeiyhrUqtJxOFXYOZCBiJM19tYsJhg9DjQJ464iCRpAleeR7y5OXeDrYpx8K1NQq+diUfbQb qCZJmk3qbKcEAuB3as0554TYXTRqKknRbOajGdnEjJXssoj0UwvVagHJ1X3l65sM9gBEWLJERcN9F OgvxxxJ22L02VdQDxr3akdWL3wlRMwMaQX7ADjHS+aaw3pkGg6oyqVzVNPsN434srtAFJxgAEkB+X QyAdVlzXu+uqzSy+6f6PeLX5/qyKBblUW9+TUOyup76GgKwKjvurO4OIab/hf9Nlu1tQ8EjwfnPQW rETLNMdsDaDomAugPsmA==; 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 1hxBID-0007Kv-O2; Mon, 12 Aug 2019 14:27:26 +0000 Received: from mail-ve1eur01on0711.outbound.protection.outlook.com ([2a01:111:f400:fe1f::711] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxBCn-0001e3-4Z for linux-arm-kernel@lists.infradead.org; Mon, 12 Aug 2019 14:21:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C812ZtbApt+RGCKAPX7aN4oROgJkPA8GxVLNk5bJL6yazbrrF3md2jEoodYyxpHSu/VJMM7jqHxMSj2LhKNT9WnReDq7ojvNa49ZD4+PJWrSJtdbn+mssFX8Ur6By5+FFpYHqpGJAfSYrClpvYUThuuitMdRPRJtnPSTligCwogDimfMkVaiLDbjBYMYZ3FSj2pA2Lp6txZq6IRCXLSjcz36deZVC9iv9JnYUMCVCjDKX7qQL/v2rMHxN4HMkXASn7hyAp582s6IteDoU9qlb7aMXSXT/nHJp9e8T6OvsS6yYxgxsbpVuV6Su6ElkAtNn8zN0cUVmPLY/yZBA0z/ng== 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=gPkOseLBB1BoR6gCR072kWsNuiP2GOdelo3+ZSFMAw4=; b=DoXdFpnrXqJ4Y6CfbgcJ3/haRW8PaBBhJ3A4/8hkJ5kIn68eHrbPZQ9giWFOb6e59/rVfLia2+CRJmLC5HUNuMxxHoL/nDBzUElWzrYuziuv7H70Zsf+AiI6l1Ri3bphxjyDMlnEQpfWcLHVarveoc7Q+RmRZI9r4g8LKfBwOErvsbybcidlyXuQZV/zE8rxVrTimcnhm9jy4Aq+u4MXuYQDQJMfrBpFjyn4hTnF9YcJNr1DrEI+UJvLfkXIxUycvtBSTnjVgOz97FSfcGfvHKv9/yXcUJSDedSVgsJmm2wNLUFU/xCTVHoKZo53Kbqiqk9XWpV0Bgif5aqu8zPCkQ== 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=gPkOseLBB1BoR6gCR072kWsNuiP2GOdelo3+ZSFMAw4=; b=Q1LDICZWeA2V+1DIS4Kv1j3eMEfYLTCtgzaHDgEV4FPNUpWZuudib4hLcv8ojwblbv1TiHjvx1PrbQ4I1Ds9jrZAWBQdfmK7feQUY3gwrdfFJeSp10Y3aLQqesJCHcCCWqlranAm5TfnjHUdJguUByhBpVUonrAcGcCiIDpBAlM= Received: from VI1PR0502MB3965.eurprd05.prod.outlook.com (52.134.17.157) by VI1PR0502MB2942.eurprd05.prod.outlook.com (10.175.26.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.21; Mon, 12 Aug 2019 14:21:42 +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.022; Mon, 12 Aug 2019 14:21:42 +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 v4 17/21] ARM: dts: imx6ull: improve can templates Thread-Topic: [PATCH v4 17/21] ARM: dts: imx6ull: improve can templates Thread-Index: AQHVURlDPLPwUxcCdkKwWI1vd7kU8A== Date: Mon, 12 Aug 2019 14:21:41 +0000 Message-ID: <20190812142105.1995-18-philippe.schenker@toradex.com> References: <20190812142105.1995-1-philippe.schenker@toradex.com> In-Reply-To: <20190812142105.1995-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: VI1P194CA0055.EURP194.PROD.OUTLOOK.COM (2603:10a6:803:3c::44) 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: bcee2d3f-8969-4a59-f4a7-08d71f306572 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:VI1PR0502MB2942; x-ms-traffictypediagnostic: VI1PR0502MB2942: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1417; x-forefront-prvs: 012792EC17 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(376002)(136003)(39850400004)(346002)(366004)(396003)(199004)(189003)(5660300002)(54906003)(110136005)(316002)(478600001)(6486002)(86362001)(2201001)(66066001)(53936002)(6116002)(1076003)(3846002)(2906002)(4326008)(25786009)(66446008)(64756008)(66556008)(66946007)(66476007)(6436002)(8676002)(11346002)(476003)(2616005)(446003)(256004)(81166006)(81156014)(2501003)(44832011)(6512007)(14444005)(486006)(50226002)(71200400001)(71190400001)(7416002)(8936002)(36756003)(52116002)(7736002)(305945005)(99286004)(102836004)(386003)(14454004)(76176011)(186003)(6506007)(26005)(32563001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0502MB2942; 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: mzuktvfXb3+aLktiqhe53DY3E+hYg/L4y6fnLJRe+dQNvLo7IvyKjITMK1QnINEuhk+8Rqdm3ZXokH9SPFzuUlTQFfxzNlJCg3Uzr6FLhZi43s4W59WRB6Kh1taVbiIc/PydmZVIc//tB1cM1OhmQrMLARNWGZ8YFPQ86daYov/6UiXbtcQirtilD3/YPxRBeEx1rrHKa+GZVqW4IN7Drv5coqkVPoxATD4UeIVnMjcmmDC7ReRO28XQD73JZ86TsMYuByn7QEoZnJpUdFzaht4wd6fm1tuyelhzPXc0tIolzWJwpLyTh8w4n2ZIrqR0aAmoJmTCvpExN70myiLvRdE6sJ1YJYeIOjlWvGR6iZJ4Qcdi55C9+dPV+NBykG80kaYa+Y1b//T5X5sXBW6jtmtu3166oyGO2S/y6o7+NF4= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: bcee2d3f-8969-4a59-f4a7-08d71f306572 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Aug 2019 14:21:41.8977 (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: pA16Dw7NubCy365zcDkqO4lvgdwoHVVSUGcakAV0GE2olqkYNeM1LaJrd75CPY0P88H9FcCTsIT//fq2vCUdj+7IhOBrgF3vT5rwRx+66zc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0502MB2942 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190812_072149_256934_00399BD6 X-CRM114-Status: GOOD ( 12.61 ) 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 Reviewed-by: Oleksandr Suvorov --- Changes in v4: - Move can nodes to module deviceteree include imx6ull-colibri.dtsi Changes in v3: None Changes in v2: None .../arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri.dtsi | 28 +++++++++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) 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..6d850d997e1e 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -54,6 +54,18 @@ vref-supply = <®_module_3v3_avdd>; }; +&can1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + status = "disabled"; +}; + +&can2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + status = "disabled"; +}; + /* Colibri SPI */ &ecspi1 { cs-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>; @@ -256,6 +268,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 +290,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 +342,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