From patchwork Tue Oct 30 08:42:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 10661229 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 08DE53CF1 for ; Tue, 30 Oct 2018 16:10:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E78942A8A6 for ; Tue, 30 Oct 2018 16:10:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5DA32A8B4; Tue, 30 Oct 2018 16:10:47 +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 6DA0D2A8A6 for ; Tue, 30 Oct 2018 16:10:47 +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=G6Wu0VdB42KuupFP1853upYWEp7CMhTNiLA1t8oOgw4=; b=HP92aocQwdxLkf TPrZezZJCZhkLpCVqDMnUhhrYvlJ7Aj7c+5OcpEdbjqCi6C77CZDj6Q9y8BY7uHL8JO1FSLIN1qLS WW/R91lbMSS5R1B28F0dJGhUuZk9LziTFkZKyC1K8EjD2ER0AWe10zxj7XHkaBextUIICgOGNKT1p av+kHoQz1ZGYcRw0UKeiaTLahKzXitq0yHq2RFzZyDWZAYfZW974BT+JrrG1DedEuX5OwoPk+WUrn zOA715RGsj9RQujSfgxeW458ZFZAHkSU/BNWPZrHA/NIqlVJX0ZEN5bv6rvpiD3CuIwWW0APsT503 HV3p24lqPZYY7akG24uA==; 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 1gHWbO-0002zO-8o; Tue, 30 Oct 2018 16:10:46 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHVuM-00031O-AB for linux-arm-kernel@bombadil.infradead.org; Tue, 30 Oct 2018 15:26:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=MIME-Version:Content-Transfer-Encoding: Content-Type:In-Reply-To:References:Message-ID:Date:Subject:CC:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=gymtkmyv6rFOO6B298WaESK7cXf2Cl8P9YW6zl4FmwA=; b=f6iBJmz3T/sJ/9j5aJY9BTHwzQ 0V0Ji+DKJ0n1JL/kX7k1hYwKBbYMjLvHL3aEFwcslXgSliDyldPCOUWal57lTRj/rty2wLysxt5KK w4jJvPvK8JdT6kxERESeip9ZSzU6HNH7gPuSW2CqJ7sKIwi+nCOIPI7aQ549wbayNIMoxZyHvrO6s jmdmhCb5qmkx0OCw/wuV2F+6MEs0oVLfAxy2bOZfNVYZifLNpI3OVcdchGFWUezkL+LLSNqUSKpLe w35MtD2CZuySUUwFocncde6GCxPPev0GN2RZkXLfy9LPeENXmh9f0nGZTfi4QfwfTUs7IMLpEek1c UXmv5s5w==; Received: from mail-db5eur01on0056.outbound.protection.outlook.com ([104.47.2.56] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHQAR-0004AQ-6i for linux-arm-kernel@lists.infradead.org; Tue, 30 Oct 2018 09:18:33 +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=gymtkmyv6rFOO6B298WaESK7cXf2Cl8P9YW6zl4FmwA=; b=nS1UcH4qmWnoEfiwxrZQRcbYJ4zponyjPn4U6KARPG4BKmjECocJllfX+O4Kr4buVXICy8Nu6oG9F6SvkhHLT9Q2RugKnH9rpMeALj96OS/Gx7mNJzox2FmgXh/PH1BylsO2AL6QthAXf4TekoZnghqJwrSmnrHyGbuk2dl3+sw= Received: from DB7PR04MB4618.eurprd04.prod.outlook.com (52.135.138.152) by DB7PR04MB4427.eurprd04.prod.outlook.com (52.135.137.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.19; Tue, 30 Oct 2018 08:42:47 +0000 Received: from DB7PR04MB4618.eurprd04.prod.outlook.com ([fe80::51ba:96d4:721e:f6a9]) by DB7PR04MB4618.eurprd04.prod.outlook.com ([fe80::51ba:96d4:721e:f6a9%5]) with mapi id 15.20.1273.027; Tue, 30 Oct 2018 08:42:47 +0000 From: Joakim Zhang To: "shawnguo@kernel.org" , "s.hauer@pengutronix.de" Subject: [PATCH V2 3/3] ARM: dts: sabreauto: Add flexcan support Thread-Topic: [PATCH V2 3/3] ARM: dts: sabreauto: Add flexcan support Thread-Index: AQHUcCyIGORNf3a2+UCEyOg35tyqnQ== Date: Tue, 30 Oct 2018 08:42:47 +0000 Message-ID: <20181030083954.26440-4-qiangqing.zhang@nxp.com> References: <20181030083954.26440-1-qiangqing.zhang@nxp.com> In-Reply-To: <20181030083954.26440-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: SG2PR0302CA0022.apcprd03.prod.outlook.com (2603:1096:3:2::32) 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; DB7PR04MB4427; 6:j4Z15dHP3vniFwFAi6DDfp9lKw8kol3MtNA2AelRhDZkg/FAaPBGzl5ZrJWSqrAq/HkNtrubl6K6K2XzwO3iXezAZgxuAqfxZ8/FsLB7MQFcaMHW+FmRZtnEvlyfrpzpz9BPfct+5ULS9tfAqOANIUjLFL6whO33xmtmTZPTD7RUSUn5one/IzbUeweKUXhDfJGhVdXRt9X0X/qeQbE90apkHgeZ0FxXUtLTepXJYQHo/WnI0OueVqTrfxhz/5z6gKQz4PefKHysDYf9yummjZ460pVCJfGZ37C/yBLijlURi9z0Dx11clmdR+JloU97/Ck31OyAdzHjnxWvgBb/Sh0aLf4HjqZeUlJN89P7ffkUi7TNcdWpvfhFZZKvSYcWOXmkRTG0BrjbfzKEERIyVHjb+llczTY8zxRPBT53cZuoc+lVjXYqHZaxhVGxD9Qe/9+IuJRzqKVHP449kJmPFw==; 5:QMyAxH7sh8+dLgDnDGou34zbJHx/1aU+QPt0F2zNGLdF2x6wa8ur1fIg//8+laRL4N5Lun+wjYrgRtxRan7zdLQr0OSOO6NQC1mhbRoejy4zlrSQV4sprIFW95b/5iHLEmcBdZgQdMctBfFTPvYIpYKP1yveasLPbxlTRfQP3pY=; 7:AxTsYKuPXGcWKOY9BQlOJrMAgbiDVhLhX1bxSdPk8bEQj95aVKTG//1m8tCs3BIawWDExPH/sG5GYKwsaIZvuEO0uGvu6zpOhE5gyyqmz5TeDycZ8+BXjAiKpMYwgCBGejIrmLlg2R6lGN6Ig6I2Cw== x-ms-office365-filtering-correlation-id: e0cee2d0-5703-48ac-a4c2-08d63e43aaa0 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR04MB4427; x-ms-traffictypediagnostic: DB7PR04MB4427: 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)(93006095)(93001095)(10201501046)(3002001)(3231382)(944501410)(52105095)(6055026)(148016)(149066)(150057)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:DB7PR04MB4427; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB4427; x-forefront-prvs: 08417837C5 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(39860400002)(346002)(136003)(396003)(366004)(199004)(189003)(6506007)(71200400001)(54906003)(7736002)(71190400001)(110136005)(316002)(99286004)(53936002)(6512007)(5250100002)(6436002)(66066001)(305945005)(97736004)(14444005)(256004)(2501003)(8676002)(102836004)(575784001)(105586002)(81166006)(14454004)(52116002)(4326008)(25786009)(81156014)(1076002)(106356001)(3846002)(6116002)(5660300001)(86362001)(186003)(386003)(2906002)(8936002)(68736007)(478600001)(36756003)(50226002)(486006)(6486002)(76176011)(26005)(446003)(2900100001)(476003)(2616005)(11346002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4427; 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: CCUnqIktZfLOnGiTlqlCKjO0XWH6t7MKQ8Ef/yJVgsuU8cxsZpnR+Y2Q7BNXix0FKNqVc3I73LgYrkAvm0ty9gr8gbRX6wpYKD4VVa3JLunxFpBj8S+puTpyELwZ1YdCS5A1/pBNez8e8YXi7yEB/6LfQ/NhNZTZ0mf1gohiy13SXzi5+GgTqSEi9B4PZ+HXQByWIKlEnG7md/HjqlgxdPrRd3XBp5aygnLt45zpvpcTsA9+r1xolCYa4O3V55aa//7+oKlb/QG53QT4O0YZ5bSF7abofEijbPX5xKHN40Jqj4CoLtStZDN7nxp9rI/PdRyTeCTDVU3iH6Ap7oRuf9lCPp5MskMBWtGIOpttVf4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0cee2d0-5703-48ac-a4c2-08d63e43aaa0 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Oct 2018 08:42:47.0792 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4427 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181030_091831_280549_307CB006 X-CRM114-Status: GOOD ( 19.46 ) 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 | 14 ++++++ .../arm/boot/dts/imx6q-sabreauto-flexcan1.dts | 14 ++++++ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 47 +++++++++++++++++++ 3 files changed, 75 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..4ebcc283f549 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2013 Freescale Semiconductor, Inc. + +#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..e7e684656f09 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2013 Freescale Semiconductor, Inc. + +#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..c1111b972b46 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,20 @@ status = "okay"; }; +&can1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + 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 +527,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