From patchwork Tue Jul 17 03:38:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 10528013 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6694C600D0 for ; Tue, 17 Jul 2018 03:41:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E31B28780 for ; Tue, 17 Jul 2018 03:41:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4271E28C7A; Tue, 17 Jul 2018 03:41:02 +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 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 E3CA028780 for ; Tue, 17 Jul 2018 03:41:01 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=7Bs9Mumk/u2JffqEpJkd5cIVgj6lf2Pk6fV3bw4U7aA=; b=K0zL6W3XeAXZ7P4gtwKr2xdP08 qglA6IRxyMICF0WTVQEOxcaraRwtCX4P8v8VyenvAVdo5dfGl7Wfu3EklPkmFDiCxiWOMCml84z9y 7K6Xx5m9sdecdv/T5NvYYwFep1QT9k1pMWPDdxIIQaA1t+UL14ma7Doq3DOdK0SwpxsDMoxBefBwu nPD0wwqlOV0DvBz+Gt7gvi0G+mZROqmiVmu1DzVbXKg8HDkMFvY84/BJcSMO8y/HEUqYQx2VwlRwM 7vz8vtDvmpFl2VxKx/4RhVw/Pr+FBA/mbiDVQ11iy6UKfh9qGEUEQxUmpv8DhAShTJ2Q4GKEIHaau C0HoCrqg==; 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 1ffGr9-0008ND-TA; Tue, 17 Jul 2018 03:40:55 +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 1ffGqz-0007we-9H for linux-arm-kernel@lists.infradead.org; Tue, 17 Jul 2018 03:40:47 +0000 Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id C822F440609; Tue, 17 Jul 2018 06:40:29 +0300 (IDT) From: Baruch Siach To: Russell King , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Subject: [PATCH 2/2] ARM: dts: hummingboard2: describe optional can bus Date: Tue, 17 Jul 2018 06:38:03 +0300 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: <8c90900a5d7538d26ec93287ca4787c1dd97fbce.1531798683.git.baruch@tkos.co.il> References: <8c90900a5d7538d26ec93287ca4787c1dd97fbce.1531798683.git.baruch@tkos.co.il> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180716_204045_568733_364BD3FA X-CRM114-Status: GOOD ( 10.75 ) 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 , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 576437936a60..8b32a7abf2da 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>; @@ -515,6 +516,13 @@ MX6QDL_PAD_EIM_D24__UART3_RX_DATA 0x40013000 >; }; + + pinctrl_hummingboard2_flexcan1: hummingboard2-flexcan1 { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b1 + MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b1 + >; + }; }; }; @@ -587,6 +595,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>; };