]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
can: m_can: m_can_dev_setup(): add support for bosch mcan version 3.3.0
authorPankaj Sharma <pankj.sharma@samsung.com>
Thu, 26 Nov 2020 04:51:42 +0000 (10:21 +0530)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 20 Jan 2021 13:25:10 +0000 (14:25 +0100)
BugLink: https://bugs.launchpad.net/bugs/1910816
[ Upstream commit 5c7d55bded77da6db7c5d249610e3a2eed730b3c ]

Add support for mcan bit timing and control mode according to bosch mcan IP
version 3.3.0. The mcan version read from the Core Release field of CREL
register would be 33. Accordingly the properties are to be set for mcan v3.3.0

Signed-off-by: Pankaj Sharma <pankj.sharma@samsung.com>
Link: https://lore.kernel.org/r/1606366302-5520-1-git-send-email-pankj.sharma@samsung.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
drivers/net/can/m_can/m_can.c

index f9a2a9ecbac9ed1e8e9b245db0de8f87745273f9..c84114b44ee07a16b6c3984cedbd8f82e4ceafca 100644 (file)
@@ -1337,6 +1337,8 @@ static int m_can_dev_setup(struct m_can_classdev *m_can_dev)
                                                &m_can_data_bittiming_const_31X;
                break;
        case 32:
+       case 33:
+               /* Support both MCAN version v3.2.x and v3.3.0 */
                m_can_dev->can.bittiming_const = m_can_dev->bit_timing ?
                        m_can_dev->bit_timing : &m_can_bittiming_const_31X;