From patchwork Tue Oct 30 08:42:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 10661219 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 65D1814BD for ; Tue, 30 Oct 2018 16:07:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E3C2287A2 for ; Tue, 30 Oct 2018 16:07:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F5832A78E; Tue, 30 Oct 2018 16:07:44 +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 CE81F287A2 for ; Tue, 30 Oct 2018 16:07:43 +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=CYrseArOViRwMF zDXpDljs6esqaXVz7nQlO6Ho4JdSDN3vM2mxS6vYt+ttmOQPzO83cd2Te/qD/UhGD0wnjkiuirhkW ewNKxr0LYNPVPWnAN6hTFpqqIbRQ9Vifm0YBB1MKUUBgKtdBqjFuWiwVFU6MV9NIvjopbsUvbhDru s5JEU6Qqyh2FMF08sPJJOPe8GAp0fC0fc3D3shIvcrp3BtenVNzhGOTa4KNAgxKB155Ljr2QGjtts QXT+NIZBdwqLekVZk2RikDAD7ydbwfS7tLLfEnFHiszzMxfppXLyWuVW+E36eXjz6T9iUteWtzjod ZWo5orEdSd6CYhz568TQ==; 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 1gHWYP-0006p6-OM; Tue, 30 Oct 2018 16:07:42 +0000 Received: from mail-eopbgr00060.outbound.protection.outlook.com ([40.107.0.60] helo=EUR02-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHVpe-0000pR-JK for linux-arm-kernel@lists.infradead.org; Tue, 30 Oct 2018 15:21: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=q6RFQBN14js9hCmMPCvwAV6KjlMYwgH/qU74mFz0AMA=; b=K6UhNFIZdpDWhAUffWxjQDvE++TOLX2z/QajIMaY1mTQOVuFG/ptTZA+LzCdVbkixIEF+GsOF316o6iF9KbiPFjeRueFVa4cvm/mLtqv/cT36XOhReyY0Lt8ZYqAgckIEz2CRu5GKmaSmIvfHo9ugfARKCraYjMav5b1d3Vtr4Y= Received: from DB7PR04MB4618.eurprd04.prod.outlook.com (52.135.138.152) by DB7PR04MB4538.eurprd04.prod.outlook.com (52.135.138.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.21; Tue, 30 Oct 2018 08:42:38 +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:38 +0000 From: Joakim Zhang To: "shawnguo@kernel.org" , "s.hauer@pengutronix.de" Subject: [PATCH V2 1/3] ARM: dts: imx6sx-sdb: Add flexcan support Thread-Topic: [PATCH V2 1/3] ARM: dts: imx6sx-sdb: Add flexcan support Thread-Index: AQHUcCyDhSho9jiNaEyC5yT7iVjQXg== Date: Tue, 30 Oct 2018 08:42:38 +0000 Message-ID: <20181030083954.26440-2-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; DB7PR04MB4538; 6:WCbAzL4qBqLy04Y/b0R7LdsUDmjDmmWlLi0pQC1w8rwaUIBbh/IMB5YnH8XqprxQTLicazu60Ii8ZqYOfnF4Zq1YOGDAcHWiFUZssKo5pQcleuVauY1rEbjn10ptsgOXWdw1P3NTYG4VAXb6u2CPK9DSpyV+U5FRgmgKzvAs+5hjWKjJI0IRiA7eRGq1evdefQitqR/e8vaBWIVC6evSC9apBUck1VRZ736RxI3aSZNPkQgfPcCNQ3x/wWzGO7o8NwGSwLCCZSxj1PyTh2L2uBdkE9Q79MiSJmnWCgrKB3Mz7W9WBETQ2q/HICpOSx5257YgiQX6CVNQ9f9RldO6vbXJ6YxUOM/Ouw5g4zxKqZbffBoucU5DxskRRxQKAoTlkM/BcK60ITLEiaSc5tOsvMx3aUU9RuoAZaQr2OJ4Zeg7P7+NKk5fjwSp2sGtqt+Fmueg+Yj7n/CU4VqGdd6MYA==; 5:Q1QFrn2KPFX55w94CHyiq+lAK4FuLEr84FUHrxxblmR8U8b1Pr0sUo1L/Vsb83uXleDJViC5YVltUK+qQHJwYX1KypQ9dynuSJl8EuXopA6G8NNCEDFrd3npgDlSaXb8XbM+fSmeVEEPNP9f1s2vWigQxRdRQFspokeqfYBEwTM=; 7:7mOo2sjWzAncWGHFlogSOfB9t6tTM22QMfrmxHITHkMYqjopsbXDd/4QAZbyMMdEirjiG7wSV8jgkqgrwJOl/g3KIwJMyPXQBLJbRG0nTKO/Zx+m3f+RUr71kZ9F/sWfSoamCEUH6g4di+0SdcBIYg== x-ms-office365-filtering-correlation-id: c95082cb-42f2-4628-4015-08d63e43a57e 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:DB7PR04MB4538; x-ms-traffictypediagnostic: DB7PR04MB4538: 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)(10201501046)(3002001)(93006095)(93001095)(3231382)(944501410)(52105095)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:DB7PR04MB4538; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB4538; x-forefront-prvs: 08417837C5 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(39860400002)(376002)(136003)(199004)(189003)(386003)(6436002)(81166006)(575784001)(446003)(110136005)(52116002)(26005)(53936002)(305945005)(1076002)(54906003)(50226002)(71190400001)(476003)(81156014)(7736002)(36756003)(4326008)(2906002)(486006)(14454004)(25786009)(2616005)(6512007)(5250100002)(66066001)(86362001)(316002)(11346002)(6486002)(256004)(3846002)(6116002)(71200400001)(97736004)(102836004)(2900100001)(8676002)(8936002)(186003)(76176011)(99286004)(2501003)(478600001)(106356001)(68736007)(6506007)(5660300001)(105586002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4538; 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: witjaFbJ0A7Y4AF7RzuLrzSlLtMtOAIqP5Q+BTduAsyVopHPAZZMrzeAtSTObQMBkgZ4oa4C3ZEOQs0SMciSmbd2AfNJ2LWyaezUlIvHsOqH8YMvoAswhK/Ij3ikhM5wQ2wivuNmwo7p4lkouGb5alktD+iGuemkSiure1fjJR/J/aeWArTsV46zwf+8LfCxXnApbCNp1cDPuoc2ELZRpTcCDy9eZPtOetbjrwSLVXKBCQeSQWOLmtM5Y36qiF0DJf23taLe3uJ/FAbHdmBlsHhMe0BoUXeWO/A5sUA6JJkmTJAzjsbZfR23myoxqNXm7sqZxbXbflfvApPLis3KzZ859RULjEQjHp+gqxQxF18= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c95082cb-42f2-4628-4015-08d63e43a57e X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Oct 2018 08:42:38.3161 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4538 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181030_082126_684034_D42D70BE X-CRM114-Status: GOOD ( 14.59 ) 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