From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BB1BC48BE9 for ; Mon, 24 Jun 2019 10:12:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A253205ED for ; Mon, 24 Jun 2019 10:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371166; bh=J5xjZ0JdK0UapEOr+jfVUnHqFAm4TWfgo/4Ge+VZ7Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O70EcIxIvytntFveOdrVPsYuI8/GWdkWqPpD6IqoClQu3khdwInlSawOp49EM8hup KKLk8VwIwHwmJhJqAE2Mm5Nbpxbyc66FtF39qlBpnZ/MsTpvwFECsm+YXuOUckTZ3R 9YJLESYLKoIHRsm4jIlgD0c1gInePQZTv6BgyqLk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729958AbfFXKMp (ORCPT ); Mon, 24 Jun 2019 06:12:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:37440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728067AbfFXKF3 (ORCPT ); Mon, 24 Jun 2019 06:05:29 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B87F1208E3; Mon, 24 Jun 2019 10:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561370728; bh=J5xjZ0JdK0UapEOr+jfVUnHqFAm4TWfgo/4Ge+VZ7Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wzuf7iCPpiHfII103pBXhlW+2cbveJiOBW2+pefn81njAwFbm28RZ28DPreBt5qnR gh1UkZLbb/UG3kngNyAJXYsoitqjZHpnC6FCgh6pSO1LBVA/4s54uvH2O+bawSxsyb 1bRANB3XGyfJNP8JGHRuuGMujExq2HyDFxmkUGds= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shubhrajyoti Datta , Anssi Hannula , Michal Simek , Marc Kleine-Budde Subject: [PATCH 4.19 69/90] can: xilinx_can: use correct bittiming_const for CAN FD core Date: Mon, 24 Jun 2019 17:56:59 +0800 Message-Id: <20190624092318.556365935@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092313.788773607@linuxfoundation.org> References: <20190624092313.788773607@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anssi Hannula commit 904044dd8fff43e289c11a2f90fa532e946a1d8b upstream. Commit 9e5f1b273e6a ("can: xilinx_can: add support for Xilinx CAN FD core") added a new can_bittiming_const structure for CAN FD cores that support larger values for tseg1, tseg2, and sjw than previous Xilinx CAN cores, but the commit did not actually take that into use. Fix that. Tested with CAN FD core on a ZynqMP board. Fixes: 9e5f1b273e6a ("can: xilinx_can: add support for Xilinx CAN FD core") Reported-by: Shubhrajyoti Datta Signed-off-by: Anssi Hannula Cc: Michal Simek Reviewed-by: Shubhrajyoti Datta Cc: linux-stable Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/xilinx_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -1424,7 +1424,7 @@ static const struct xcan_devtype_data xc XCAN_FLAG_RXMNF | XCAN_FLAG_TX_MAILBOXES | XCAN_FLAG_RX_FIFO_MULTI, - .bittiming_const = &xcan_bittiming_const, + .bittiming_const = &xcan_bittiming_const_canfd, .btr_ts2_shift = XCAN_BTR_TS2_SHIFT_CANFD, .btr_sjw_shift = XCAN_BTR_SJW_SHIFT_CANFD, .bus_clk_name = "s_axi_aclk",