linux-toradex.git/drivers/net/can, branch v3.18-rc5

drivers/net/can/Kconfig: Let CAN_AT91 depend on HAS_IOMEM

2014-10-03T22:52:03+00:00

CAN_AT91 needs HAS_IOMEM, so depends on it. The related error (with
allmodconfig under um):

    CC [M]  drivers/net/can/at91_can.o
  drivers/net/can/at91_can.c: In function ‘at91_can_probe’:
  drivers/net/can/at91_can.c:1329:2: error: implicit declaration of function ‘ioremap_nocache’ [-Werror=implicit-function-declaration]
  addr = ioremap_nocache(res->start, resource_size(res));
    ^
  drivers/net/can/at91_can.c:1329:7: warning: assignment makes pointer from integer without a cast [enabled by default]
    addr = ioremap_nocache(res->start, resource_size(res));
         ^
  drivers/net/can/at91_can.c:1384:2: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration]
    iounmap(addr);
    ^

Signed-off-by: Chen Gang 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-09-23T16:09:27+00:00

Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller

can: at91_can: add missing prepare and unprepare of the clock

2014-09-18T09:15:37+00:00

In order to make the driver work with the common clock framework, this patch
converts the clk_enable()/clk_disable() to
clk_prepare_enable()/clk_disable_unprepare(). While there, add the missing
error handling.

Signed-off-by: David Dueck 
Signed-off-by: Anthony Harivel 
Acked-by: Boris Brezillon 
Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde

can: flexcan: increase FLEXCAN_MCR_MAXMB() macro to 7 bits

2014-09-18T09:15:36+00:00

This patch increases the mask in the FLEXCAN_MCR_MAXMB() to 7 bits as in the
newer flexcan cores the MAXMB field is 7 bits wide.

Reported-by: David Jander 
Signed-off-by: Marc Kleine-Budde

can: flexcan: put TX mailbox into TX_INACTIVE mode after tx-complete

2014-09-18T09:15:27+00:00

After sending a RTR frame the TX mailbox becomes a RX_EMPTY mailbox. To avoid
side effects when the RX-FIFO is full, this patch puts the TX mailbox into
TX_INACTIVE mode in the transmission complete interrupt handler. This, of
course, leaves a race window between the actual completion of the transmission
and the handling of tx-complete interrupt. However this is the best we can do
without busy polling the tx complete interrupt.

Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde

can: flexcan: implement workaround for errata ERR005829

2014-09-18T09:15:20+00:00

This patch implements the workaround mentioned in ERR005829:

    ERR005829: FlexCAN: FlexCAN does not transmit a message that is enabled to
    be transmitted in a specific moment during the arbitration process.

Workaround: The workaround consists of two extra steps after setting up a
message for transmission:

Step 8: Reserve the first valid mailbox as an inactive mailbox (CODE=0b1000).
If RX FIFO is disabled, this mailbox must be message buffer 0. Otherwise, the
first valid mailbox can be found using the "RX FIFO filters" table in the
FlexCAN chapter of the chip reference manual.

Step 9: Write twice INACTIVE code (0b1000) into the first valid mailbox.

Signed-off-by: David Jander 
Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde

can: flexcan: correctly initialize mailboxes

2014-09-18T09:15:15+00:00

Apparently mailboxes may contain random data at startup, causing some of them
being prepared for message reception. This causes overruns being missed or even
confusing the IRQ check for trasmitted messages, increasing the transmit
counter instead of the error counter.

This patch initializes all mailboxes after the FIFO as RX_INACTIVE.

Signed-off-by: David Jander 
Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde

can: flexcan: mark TX mailbox as TX_INACTIVE

2014-09-18T09:15:09+00:00

This patch fixes the initialization of the TX mailbox. It is now correctly
initialized as TX_INACTIVE not RX_EMPTY.

Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde

can: peak_pci: add PCI ID definition pcie card variant

2014-09-18T09:15:09+00:00

Add PCI ID definition for the single channel PCAN ExpressCard 34 adapter. Due
to the subsystem id evaluation the correct number of channels (here 1) is
created at initialization time. Tested including the LED functionality.

Signed-off-by: Oliver Hartkopp 
Acked-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: c_can_platform: fix parameters of c_can_hw_raminit_ti()

2014-09-18T09:14:30+00:00

Pass the correct 'mask' and 'value' bits to c_can_hw_raminit_wait_ti(). They
seem to have been swapped in the usage instances.

Reported-by: Jay Schroeder 
Signed-off-by: Roger Quadros 
Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde