From patchwork Wed Jan 30 16:18:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 10788923 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 C28BD17E9 for ; Wed, 30 Jan 2019 16:20:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B047A2FD08 for ; Wed, 30 Jan 2019 16:20:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4AF22FD0D; Wed, 30 Jan 2019 16:20:24 +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 5B0A02FD08 for ; Wed, 30 Jan 2019 16:20:24 +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:References:In-Reply-To: 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=fjX2FvUcK7rfVsrM+o+EbhGP9Il7YCsvhYKhKw6jWTc=; b=o233dgCJdo8DWN Z3WRwxUJwEPVPTwjtfrgMhSmiCPhIFPB5uHO4AhUhAwwK9NbhtLSn+h8UKyW5C2kjylfXy2enyOGu dm8j0+KzXkM9W7GVL688e2sE2N4Iu75wfhq29sE4q5TJINwrGieAR+PN1Wv9xrrJqDIoVL4c/ByL9 jMrCFCzaH22TG75zeyxrj81BMZNRjFpHaTtJTdJLk3RRj/c7KRECBYtddFjlwdE5f8SqyE59HHZgJ 6T1QwnKPyQdHmSYjOiiB6JeyQ6phJL541N9R2H8EDP9C7fPu4JOdwiaz4Z95BI7mMORIQOstcs8lX B7vpXHzmpDeSf+mBzl+g==; 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 1gosb8-0003V3-ER; Wed, 30 Jan 2019 16:20:22 +0000 Received: from guitar.tcltek.co.il ([192.115.133.116] helo=mx.tkos.co.il) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gosZe-0001IC-EJ for linux-arm-kernel@lists.infradead.org; Wed, 30 Jan 2019 16:18:54 +0000 Received: from sapphire.lan (unknown [10.0.4.3]) by mx.tkos.co.il (Postfix) with ESMTP id 98D8B440AC2; Wed, 30 Jan 2019 18:18:44 +0200 (IST) From: Baruch Siach To: Russell King , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Subject: [PATCH 4/4] ARM: dts: hummingboard2: describe optional can bus Date: Wed, 30 Jan 2019 18:18:41 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190130_081850_713399_EFC108A3 X-CRM114-Status: UNSURE ( 9.13 ) X-CRM114-Notice: Please train this message. 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: Baruch Siach , Jon Nettleton , 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 A Hummingboard assembly option provides CAN bus connector for the i.MX6 provided FlexCAN peripheral. Keep disabled by default. Note the conflict with HDMI pin mux. Signed-off-by: Baruch Siach --- arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi index c5b5c6d3306f..2008be6fbee4 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi @@ -206,6 +206,7 @@ status = "okay"; }; +/* Conflicts with the CAN bus option */ &hdmi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_hdmi>; @@ -523,6 +524,13 @@ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 >; }; + + pinctrl_hummingboard2_flexcan1: hummingboard2-flexcan1 { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b1 + MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b1 + >; + }; }; }; @@ -596,6 +604,13 @@ status = "okay"; }; +/* Optional CAN bus. Conflicts with HDMI CEC. */ +&can1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_flexcan1>; + status = "disabled"; +}; + &vcc_3v3 { vin-supply = <&v_3v2>; };