From patchwork Wed Oct 24 11:14:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 10654537 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 054CA13A4 for ; Wed, 24 Oct 2018 11:15:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E97542A496 for ; Wed, 24 Oct 2018 11:15:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD4E82A4DC; Wed, 24 Oct 2018 11:15:46 +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 59E202A496 for ; Wed, 24 Oct 2018 11:15:46 +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=etTuTQasaspChDzLUh7A01iKxpGQDVUuOImB9lfECpE=; b=QhInisY3JCqPBE ei53w1GxbWmKLeen3EkdEuv81AkLswF8jYGN9antSDy0yS+kV3PZrcZpROu0Bq6Wk7SiCkL5Jv5Qr pCpUBSk19FEDuoapgnSQFj/TgEcCYRUzHL5rMB/fU+/1MInNkZL9akc/PGjNsh2iIBXH1jYPuJAeA M/PtFkAp+Zb/aLwYO1TGi6Ps4bL1rzrCajNNqAujDtsgkO0bQ3NJXdZKRD/tSXNR1VqdwoPZJMxyT 2bE2Uvgtj9ZZaJor84ut1swXuahBO0VfjZlb4/xD4Uza6c4750AAKl10O7PtgVhZdew358PrcJpv/ ewwgEy+mYd4qbHCjoMNA==; 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 1gFH8Q-0006Kz-Sp; Wed, 24 Oct 2018 11:15:34 +0000 Received: from mail-eopbgr50059.outbound.protection.outlook.com ([40.107.5.59] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gFH7d-0004lC-Pp for linux-arm-kernel@lists.infradead.org; Wed, 24 Oct 2018 11:14:47 +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=q6RFQBN14js9hCmMPCvwAV6KjlMYwgH/qU74mFz0AMA=; b=dmo/vpJAL8gAPhyoFpoNIlRb4Ebllmi60vzupbV/96ORvNXgdIAtjxAS6zZ1/6NTo5q2aIr2IxHHOryeq4DGsBzGqdoIelVWezr6GGsJCwNckm9EWCJ49pqn1K/V1woW1h603ISWpI0hYve1qBcwzvPku7UTzIGuo9QYMpaYtDo= Received: from DB7PR04MB4618.eurprd04.prod.outlook.com (52.135.138.152) by DB7PR04MB4764.eurprd04.prod.outlook.com (20.176.233.86) 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:33 +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:33 +0000 From: Joakim Zhang To: "shawnguo@kernel.org" , "s.hauer@pengutronix.de" Subject: [PATCH V1 1/3] ARM: dts: imx6sx-sdb: Add flexcan support Thread-Topic: [PATCH V1 1/3] ARM: dts: imx6sx-sdb: Add flexcan support Thread-Index: AQHUa4q9ILUSRFdE4kCmy3L98c/r6Q== Date: Wed, 24 Oct 2018 11:14:33 +0000 Message-ID: <20181024111213.2724-2-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; DB7PR04MB4764; 6:KMOTjOVMgbwAEKW8I2oiPpPy2/miKuKgExTnqZDsaj2YMl8vupc0KtCku5HyeAOBudBPTvBdzygvmgUyYGaes7Ah3GYJmyzZVQ61W7IJMp6x+hpr+R7iLha1BiquVKSRbKnigjccKgBZcNHEhxUTubjAhozjZ3v5Ks1QKmBf0FYGiaUDKK5ax1agI+aa/cuhB/i4aNHBRueb+DkGgO/RD/mYzhV9jtcQ3jJ2BMn+I5MPU7J+dIvKaZOcSfD18lCFqlHOGcYBp+SYMPDmIH9m3ToKym4rdToRQsbbjBVWz9qChsz84FxZ1b3n4VGCGbFSQTLK5fWatV+X99YLKLZFUEzZxUDa3feOBN/e56BkUKSjSPWhvDq/AQEqGq2cEmIMTn9Jm2rKEBMsLXT5VtuGcvByPCwQ5Xc4cHBfW8076A+QMDk1Kwq+NAbcWMscjtJCXNh5RHrtvxViijGkEVcbjg==; 5:GIjVkrpSWxyo+mpJDBM7NGO/ZHTgoyt0a+vU8IvKkqy2ViZB7fx42mPXGrHUX3W/Qe8cqX0QAk2pOWfA/Qo1nD1tjdxKpBj7EwRbeHVpDimEiNJolGWpVYquOmP4Efx1vvKgjzD6nvOkmCRanp5zpMHj4LKPeXo4PgKEVOvxDo0=; 7:CQjy0dFAYjFhYQDTq2/rskyXi9fxCRRqOTjz6dBsl2SjNPI/LuojVaPm7rFlzA7c7R38uQWW5XFRGOwZ9vn/vYmiGLfXhmnR91nC3XJHeaHWM3oIbmXgn/KtN6zv4hOlwa/3odfB3axHvOUq1ac43g== x-ms-office365-filtering-correlation-id: bd9c4dcc-4cb5-456d-8ed4-08d639a1e00d 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:DB7PR04MB4764; x-ms-traffictypediagnostic: DB7PR04MB4764: 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)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:DB7PR04MB4764; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB4764; x-forefront-prvs: 083526BF8A x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(136003)(376002)(39860400002)(396003)(366004)(199004)(189003)(26005)(8676002)(575784001)(86362001)(53936002)(6486002)(2906002)(81166006)(81156014)(6512007)(68736007)(5660300001)(14454004)(186003)(25786009)(71190400001)(316002)(8936002)(71200400001)(4326008)(36756003)(486006)(256004)(386003)(6506007)(2900100001)(2616005)(476003)(97736004)(6436002)(99286004)(52116002)(3846002)(305945005)(66066001)(50226002)(11346002)(446003)(6116002)(110136005)(76176011)(54906003)(2501003)(102836004)(7736002)(1076002)(5250100002)(105586002)(106356001)(478600001)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4764; 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: sE/HKKm7+WnLCNwmQk4il9u75/A4jPc/GvLoB7hZCauOI6QFFr2xcVWZlj5hNVOpqpj9nhU566VESmNirkNrTyxY4f6OasXvFOPNkB6ku4qavQRgqqSzLHo1KS/gdstr5skoBP4klTPRD4y0zoRJI9FFsUUTumUYTxCynZ0IdJCS5AQE+7tazA8kSkHijcPpNXg2HUq7DCxny61jBsqWAh6vMYUEhFGrtspGgDjCswkWxoG22AgBXMA59VBHQnYJxeamHLkWa5RwMI16O/bllpm3+nOCnI5bwQkNBJeyHHPLpr+xuopE/RcIQfxxlVkw26MR/7gALtCHu89gh8jNhlEVGRU5zqEmG7M/R+jujJs= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd9c4dcc-4cb5-456d-8ed4-08d639a1e00d X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Oct 2018 11:14:33.4131 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4764 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181024_041445_843669_E46E3BB4 X-CRM114-Status: GOOD ( 14.57 ) 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 CAN transceiver is different on RevA and RevB board. It's active high on RevA while active low on Rev B. Signed-off-by: Dong Aisheng Signed-off-by: Joakim Zhang --- arch/arm/boot/dts/imx6sx-sdb-reva.dts | 12 ++++++++ arch/arm/boot/dts/imx6sx-sdb.dts | 5 ++++ arch/arm/boot/dts/imx6sx-sdb.dtsi | 42 +++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/arch/arm/boot/dts/imx6sx-sdb-reva.dts b/arch/arm/boot/dts/imx6sx-sdb-reva.dts index 9cc6ff206aea..d98dcf00b9c4 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-reva.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-reva.dts @@ -10,6 +10,18 @@ / { model = "Freescale i.MX6 SoloX SDB RevA Board"; + + /* Transceiver EN/STBY is active high on RevA board */ + reg_can_en: regulator-can-en { + gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_can_stby: regulator-can-stby { + gpio = <&gpio4 27 GPIO_ACTIVE_HIGH>; + enable-active-high; + vin-supply = <®_can_en>; + }; }; &i2c1 { diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts index 6dd9bebfe027..092b8de142a8 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts @@ -10,6 +10,11 @@ / { model = "Freescale i.MX6 SoloX SDB RevB Board"; + + /* Transceiver EN/STBY is active low on RevB board */ + reg_can_stby: regulator-can-stby { + gpio = <&gpio4 27 GPIO_ACTIVE_LOW>; + }; }; &i2c1 { diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi index 53b3408b5fab..4de2473293aa 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi @@ -138,6 +138,20 @@ regulator-max-microvolt = <5000000>; }; + reg_can_en: regulator-can-en { + compatible = "regulator-fixed"; + regulator-name = "can-en"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + reg_can_stby: regulator-can-stby { + compatible = "regulator-fixed"; + regulator-name = "can-stby"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + sound { compatible = "fsl,imx6sx-sdb-wm8962", "fsl,imx-audio-wm8962"; model = "wm8962-audio"; @@ -204,6 +218,20 @@ status = "okay"; }; +&flexcan1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + xceiver-supply = <®_can_stby>; + status = "okay"; +}; + +&flexcan2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + xceiver-supply = <®_can_stby>; + status = "okay"; +}; + &i2c3 { clock-frequency = <100000>; pinctrl-names = "default"; @@ -399,6 +427,20 @@ >; }; + pinctrl_flexcan1: flexcan1grp { + fsl,pins = < + MX6SX_PAD_QSPI1B_DQS__CAN1_TX 0x1b020 + MX6SX_PAD_QSPI1A_SS1_B__CAN1_RX 0x1b020 + >; + }; + + pinctrl_flexcan2: flexcan2grp { + fsl,pins = < + MX6SX_PAD_QSPI1B_SS1_B__CAN2_RX 0x1b020 + MX6SX_PAD_QSPI1A_DQS__CAN2_TX 0x1b020 + >; + }; + pinctrl_gpio_keys: gpio_keysgrp { fsl,pins = < MX6SX_PAD_CSI_DATA04__GPIO1_IO_18 0x17059