From: "Stéphane Grosjean" <s.grosjean@peak-system.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: linux-can@vger.kernel.org
Subject: Re: [PATCH v10 3/9] can/peak_usb: export ctrlmode_supported to adapter specific
Date: Tue, 27 Jan 2015 22:05:02 +0100 [thread overview]
Message-ID: <1422392697268557815@MailServerPEAK> (raw)
[-- Attachment #1: Type: text/plain, Size: 3128 bytes --]
Hi Mark,
You've got my Ack for this patch (too)(again).
Stéphane.Le 27 janv. 2015 17:41, Marc Kleine-Budde <mkl@pengutronix.de> a écrit :
>
> From: Stephane Grosjean <s.grosjean@peak-system.com>
>
> Export the ctrlmode_supported value from the core file to each adapter specific
> file. This has been mandatory for supporting the new CANFD extension.
>
> Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> drivers/net/can/usb/peak_usb/pcan_usb.c | 1 +
> drivers/net/can/usb/peak_usb/pcan_usb_core.c | 3 +--
> drivers/net/can/usb/peak_usb/pcan_usb_core.h | 1 +
> drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 1 +
> 4 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c
> index d57d3f64a5bf..72427f21edff 100644
> --- a/drivers/net/can/usb/peak_usb/pcan_usb.c
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb.c
> @@ -859,6 +859,7 @@ const struct peak_usb_adapter pcan_usb = {
> .name = "PCAN-USB",
> .device_id = PCAN_USB_PRODUCT_ID,
> .ctrl_count = 1,
> + .ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
> .clock = {
> .freq = PCAN_USB_CRYSTAL_HZ / 2 ,
> },
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
> index 729b80d78322..2768399a52fa 100644
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
> @@ -750,8 +750,7 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,
> dev->can.bittiming_const = &peak_usb_adapter->bittiming_const;
> dev->can.do_set_bittiming = peak_usb_set_bittiming;
> dev->can.do_set_mode = peak_usb_set_mode;
> - dev->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
> - CAN_CTRLMODE_LISTENONLY;
> + dev->can.ctrlmode_supported = peak_usb_adapter->ctrlmode_supported;
>
> netdev->netdev_ops = &peak_usb_netdev_ops;
>
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.h b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
> index 10f2fcac7c13..54fdb5978a05 100644
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.h
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
> @@ -44,6 +44,7 @@ struct peak_usb_device;
> struct peak_usb_adapter {
> char *name;
> u32 device_id;
> + u32 ctrlmode_supported;
> struct can_clock clock;
> const struct can_bittiming_const bittiming_const;
> unsigned int ctrl_count;
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
> index 56855b2b1fa1..03f517160a67 100644
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
> @@ -1016,6 +1016,7 @@ const struct peak_usb_adapter pcan_usb_pro = {
> .name = "PCAN-USB Pro",
> .device_id = PCAN_USBPRO_PRODUCT_ID,
> .ctrl_count = PCAN_USBPRO_CHANNEL_COUNT,
> + .ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
> .clock = {
> .freq = PCAN_USBPRO_CRYSTAL_HZ,
> },
> --
> 2.1.4
>
[-- Attachment #2: Signature.txt --]
[-- Type: text/plain, Size: 151 bytes --]
--
PEAK-System Technik GmbH
Sitz der Gesellschaft Darmstadt
Handelsregister Darmstadt HRB 9183
Geschaeftsfuehrung: Alexander Gach, Uwe Wilhelm
--
next reply other threads:[~2015-01-27 21:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 21:05 Stéphane Grosjean [this message]
2015-01-27 21:07 ` [PATCH v10 3/9] can/peak_usb: export ctrlmode_supported to adapter specific Marc Kleine-Budde
-- strict thread matches above, loose matches on Subject: below --
2015-01-27 21:10 Stéphane Grosjean
2015-01-27 21:10 ` Marc Kleine-Budde
2015-01-27 16:41 [PATCH v10 1/9] can: peak_usb: updates and CANFD support Marc Kleine-Budde
2015-01-27 16:41 ` [PATCH v10 3/9] can/peak_usb: export ctrlmode_supported to adapter specific Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422392697268557815@MailServerPEAK \
--to=s.grosjean@peak-system.com \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox