From patchwork Wed Oct 24 11:14:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 10654541 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 71C3513BF for ; Wed, 24 Oct 2018 11:17:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6264E2A496 for ; Wed, 24 Oct 2018 11:17:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51A9C2A4DC; Wed, 24 Oct 2018 11:17:29 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 AEF6B2A496 for ; Wed, 24 Oct 2018 11:17:28 +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=91lS0I26ySaH3HuxVgEGpeB2qB1laiirn3ApOtk749M=; b=QRM8vh0oGazq7k OSVm6a+qg/or3kr2rXk9c1IauMe3ouc/7f4JxaxxLCpmdfygDbp5mwAGrTRfppKvoBp3Aik/EGvSJ Ihm+DGgg4bcFafRa2Z/Nvp+oEXPQOPwhSjm9vNxp13Ct4kRGT78kUmk8DOzldjrHmkRIrH+jMVrSt 7LO0wvJEjUd/6o68fm3iLubxIJGv3eJNb6TfQ9B0r00IYov5wvLxkxAbJL7/dNqRsISxkC/MnZm2C 9pBqxTt+ZbWonmSCbWkNg9KbOFskFO64xhfR0WZi7Eeh20Uw/n0Q1Pjse6AxAEffFFbFclAm/Ws8f AqL5eFkYRSGONk3UeZHQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gFHA2-0007DI-UA; Wed, 24 Oct 2018 11:17:15 +0000 Received: from mail-he1eur02on0625.outbound.protection.outlook.com ([2a01:111:f400:fe05::625] helo=EUR02-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gFH7p-0004m9-VN for linux-arm-kernel@lists.infradead.org; Wed, 24 Oct 2018 11:15:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OrGjWWQV3eRH0X4pthW9+U29QX4cZ5RmLQX3zlM5ums=; b=dBuQbpvO5PDPt1gotXpNCpXMhU1woN3qdAbY+VVN4tO/vNyClv8XaD7pkupou7zcI0xNtzhkRpGGKdGhdiQXlVs5eOmXJMuInsQgshjV5xakYGnfk1Mn29+Y98RtrvzaGgd/YXL0Cc65yp4PzDtgIh6Q+Gq+R9WfMnHJXVjyZFM= Received: from DB7PR04MB4618.eurprd04.prod.outlook.com (52.135.138.152) by DB7PR04MB4138.eurprd04.prod.outlook.com (52.135.130.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.18; Wed, 24 Oct 2018 11:14:42 +0000 Received: from DB7PR04MB4618.eurprd04.prod.outlook.com ([fe80::51ba:96d4:721e:f6a9]) by DB7PR04MB4618.eurprd04.prod.outlook.com ([fe80::51ba:96d4:721e:f6a9%4]) with mapi id 15.20.1250.028; Wed, 24 Oct 2018 11:14:42 +0000 From: Joakim Zhang To: "shawnguo@kernel.org" , "s.hauer@pengutronix.de" Subject: [PATCH V1 3/3] ARM: dts: sabreauto: Add flexcan support Thread-Topic: [PATCH V1 3/3] ARM: dts: sabreauto: Add flexcan support Thread-Index: AQHUa4rCncfeoBYpBkmKYYSezC6GHw== Date: Wed, 24 Oct 2018 11:14:42 +0000 Message-ID: <20181024111213.2724-4-qiangqing.zhang@nxp.com> References: <20181024111213.2724-1-qiangqing.zhang@nxp.com> In-Reply-To: <20181024111213.2724-1-qiangqing.zhang@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1 x-clientproxiedby: SG2PR06CA0098.apcprd06.prod.outlook.com (2603:1096:3:14::24) To DB7PR04MB4618.eurprd04.prod.outlook.com (2603:10a6:5:36::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=qiangqing.zhang@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [92.121.68.129] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR04MB4138; 6:Y3rXkxBaB5AWa8bWiDRx0skNBlA5IVgRtPM5Pmjy1qemZXelJ8/AI3MjJbFDOqmA5br9DfhIWAzdYimm/oM+IObXELWhD5ZJCxpLNtsQXMtHoSOju54nSLVa7jFQLtZSIlJLQFE59iJuijg9WOqKARTnSWvGRL6G1U2zX0aReYEGFBDmY9dseXaZ6uQ66yb6X1pCPB4YN+V5lvoMOjyJ9/2YgIAJfLxeoPPTt3hMG569drsVkl0DeAG5DGIBN/lKtNz0bmYCxmH67Lm+EBYzq1+kZr8o4R8ibTaDaaf88y3Gi9oyKhC7FsUmqi/tn9O8UVONOSzj7mx6FV5b/rvkgVS32Q1gJaIl1wxp9YiVbTnbE++k8fCizT77vHcmpBFt+azl14SSke8vYi+E7AfGoI5VM1Vsmxb8irlOOFvfQvSk8jyVx5iZ7x37aLRcrK1NC1J8UaY6l5pL1OhNkyCCDw==; 5:kDf41XkG4sk0qiA1VakX5utCzo1dgqC5NruS6eWIWt7Q87up4naiaMpILsFcUZj4trLJz5B1LGNXGghKcnY9KjmGyw+4aGe3uVn5cBnJihq8YZ0SzS+s76FkAKzGHbFS3w/kis/1H5DOuxRl2YG+6B6tmqm/ZdjdnP5Hd7cv2RQ=; 7:2gxMUutPkAwmj2qdKlf7OmlefV/gpB8NNzZu+exvuKgc+39QbypFA5028crvef8EfoNiADvV+oMwXRjPXvaPs40znUJWACrEPWitanvJtiO3Fv6zZ05sS8zn/KvyJCN2Z2TF6kVc0x0k549+y6s1kw== x-ms-office365-filtering-correlation-id: cffc47ba-fe9d-4bd9-2edb-08d639a1e53b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DB7PR04MB4138; x-ms-traffictypediagnostic: DB7PR04MB4138: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:DB7PR04MB4138; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB4138; x-forefront-prvs: 083526BF8A x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(136003)(366004)(346002)(39860400002)(376002)(199004)(189003)(81166006)(26005)(54906003)(66066001)(105586002)(14454004)(86362001)(8936002)(575784001)(2906002)(186003)(11346002)(478600001)(71200400001)(71190400001)(25786009)(106356001)(5660300001)(76176011)(305945005)(50226002)(386003)(486006)(102836004)(7736002)(81156014)(14444005)(316002)(110136005)(4326008)(256004)(8676002)(68736007)(2616005)(476003)(52116002)(6506007)(6486002)(53936002)(97736004)(2900100001)(6436002)(99286004)(446003)(36756003)(6512007)(5250100002)(2501003)(1076002)(3846002)(6116002)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4138; H:DB7PR04MB4618.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: r18Ymqv3N3I5yxZKhP0QgMZNTs+0vh7eWYRkqoChN+/yP4W+MMDl2fvERP7dvF+CjutxvFgNq2znq4PiFkqSH/lNKTbKHCv42v7V9WMgWnvdoeiLERCT1RMxFIbh0nI1NzIaqRZgilmprZu8MJ0JRPsRT3tn9FvBlTpbYolFEn3eub0QqJuS+7Gs8wguS50AlvjE3DivzhXZDSkDfn5xLjM3i6XDf/t2d2Vpt6SAijjn8a7DxEF27yqMCjHcsu7YbqdxHsH53git24KAbdgTbaoiPzipcsuM4U1EWOrelIzi1IFyVy1MPJlRq8jxmGMFmnw7FUfblWNeG0wyYAN90tKD7td8lMPSBF8S7afq0HU= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cffc47ba-fe9d-4bd9-2edb-08d639a1e53b X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Oct 2018 11:14:42.1007 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4138 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181024_041458_058566_E0F13533 X-CRM114-Status: GOOD ( 19.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "A.s. Dong" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Joakim Zhang , "robh+dt@kernel.org" , dl-linux-imx , "kernel@pengutronix.de" , Fabio Estevam , "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: Dong Aisheng The flexcan1 is pin conflict with fec. So we add a new dts file with flexcan1 enabled with fec disabled for user to use. Signed-off-by: Dong Aisheng Signed-off-by: Joakim Zhang --- .../boot/dts/imx6dl-sabreauto-flexcan1.dts | 19 ++++++++ .../arm/boot/dts/imx6q-sabreauto-flexcan1.dts | 19 ++++++++ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 48 +++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts create mode 100644 arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts diff --git a/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts b/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts new file mode 100644 index 000000000000..963e0b559d60 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "imx6dl-sabreauto.dts" + +&can1{ + status = "okay"; +}; + +&fec { + /* pin conflict with flexcan1 */ + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts b/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts new file mode 100644 index 000000000000..2648437a983f --- /dev/null +++ b/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "imx6q-sabreauto.dts" + +&can1{ + status = "okay"; +}; + +&fec { + /* pin conflict with flexcan1 */ + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index a10f0ad0bfb1..205f063ee5a4 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -101,6 +101,25 @@ enable-active-high; }; + reg_can_en: regulator-can-en { + compatible = "regulator-fixed"; + regulator-name = "can-en"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&max7310_b 6 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_can_stby: regulator-can-stby { + compatible = "regulator-fixed"; + regulator-name = "can-stby"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&max7310_b 5 GPIO_ACTIVE_HIGH>; + enable-active-high; + vin-supply = <®_can_en>; + }; + sound-cs42888 { compatible = "fsl,imx6-sabreauto-cs42888", "fsl,imx-audio-cs42888"; @@ -279,6 +298,21 @@ status = "okay"; }; +&can1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + pinctrl-assert-gpios = <&max7310_b 3 GPIO_ACTIVE_HIGH>; /* TX */ + xceiver-supply = <®_can_stby>; + status = "disabled"; /* pin conflict with fec */ +}; + +&can2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + xceiver-supply = <®_can_stby>; + status = "okay"; +}; + &gpmi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>; @@ -494,6 +528,20 @@ >; }; + pinctrl_flexcan1: flexcan1grp { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x17059 + MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x17059 + >; + }; + + pinctrl_flexcan2: flexcan2grp { + fsl,pins = < + MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x17059 + MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x17059 + >; + }; + pinctrl_gpio_keys: gpiokeysgrp { fsl,pins = < MX6QDL_PAD_SD2_CMD__GPIO1_IO11 0x1b0b0