linux-toradex.git/drivers/net/can/flexcan.c, branch v3.4.2

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

2012-02-04T21:42:19+00:00

Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.

can: replace the dev_dbg/info/err/... with the new netdev_xxx macros

2012-02-03T00:21:26+00:00

Cc: uclinux-dist-devel@blackfin.uclinux.org
Cc: Anant Gole 
Cc: Chris Elston 
Cc: Sebastian Haas 
Cc: Matthias Fuchs 
Signed-off-by: Wolfgang Grandegger 
Acked-by: Sebastian Haas 
Acked-by: Mike Frysinger 
Signed-off-by: Marc Kleine-Budde

can: flexcan: Fix CAN_RAW_RECV_OWN_MSGS and CAN_RAW_LOOPBACK

2012-02-03T00:21:25+00:00

Currently the flexcan driver uses hardware local echo. This blindly
echos all transmitted frames to all receiving sockets, regardless what
CAN_RAW_RECV_OWN_MSGS and CAN_RAW_LOOPBACK are set to.

This patch now submits transmitted frames to be echoed in the transmit
complete interrupt, preserving the reference to the sending
socket. This allows the can protocol to correctly handle the local
echo.

Further this patch moves tx_bytes statistic accounting into the tx_complete
handler.

Signed-off-by: Reuben Dowle 
[mkl: move tx_bytes accounting into tx_complete handler; cleanups]
Signed-off-by: Marc Kleine-Budde

can: flexcan: fix irq flooding by clearing all interrupt sources

2012-02-02T23:24:50+00:00

As pointed out by Reuben Dowle and Lothar Waßmann, the TWRN_INT,
RWRN_INT, BOFF_INT interrupt sources need to be cleared as well
to avoid interrupt flooding, at least for the Flexcan on i.MX28
SOCs. Furthermore, the interrupts are only cleared, if really one
of those interrupt sources are pending (which is not the case for
rx and tx done).

Cc: Reuben Dowle 
Cc: Lothar Waßmann 
Signed-off-by: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde

Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-01-09T22:44:15+00:00

clock management changes for i.MX

Another simple series related to clock management, this time only for
imx.

* tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: mxs: select HAVE_CLK_PREPARE for clock
  clk: add config option HAVE_CLK_PREPARE into Kconfig
  ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
  video: mxsfb: convert to clk_prepare/clk_unprepare
  serial: mxs-auart: convert to clk_prepare/clk_unprepare
  net: flexcan: convert to clk_prepare/clk_unprepare
  mtd: gpmi-lib: convert to clk_prepare/clk_unprepare
  mmc: mxs-mmc: convert to clk_prepare/clk_unprepare
  dma: mxs-dma: convert to clk_prepare/clk_unprepare
  net: fec: add clk_prepare/clk_unprepare
  ARM: mxs: convert platform code to clk_prepare/clk_unprepare
  clk: add helper functions clk_prepare_enable and clk_disable_unprepare

Fix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to
commit 0ebafefcaa7a ("net: fec: add clk_prepare/clk_unprepare") clashing
trivially with commit e163cc97f9ac ("net/fec: fix the .remove code").

net: flexcan: convert to clk_prepare/clk_unprepare

2011-12-28T13:30:47+00:00

The patch converts flexcan driver to clk_prepare/clk_unprepare by
using helper functions clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: Shawn Guo 
Cc: Marc Kleine-Budde 
Cc: David S. Miller

net/can: convert drivers/net/can/* to use module_platform_driver()

2011-11-29T05:25:05+00:00

This patch converts the drivers in drivers/net/can/* to use the
module_platform_driver() macro which makes the code smaller and a bit
simpler.

Cc: Wolfgang Grandegger 
Cc: "David S. Miller" 
Cc: Bhupesh Sharma 
Cc: Jiri Kosina 
Cc: Grant Likely 
Cc: Anatolij Gustschin 
Cc: Paul Bolle 
Cc: Kurt Van Dijck 
Cc: Alexey Dobriyan 
Signed-off-by: Axel Lin 
Acked-by: Marc Kleine-Budde 
Signed-off-by: David S. Miller

flexcan: Prefer device tree clock frequency if available.

2011-08-18T03:36:38+00:00

If our CAN device's device tree node has a clock-frequency property,
then use that value for the can devices clock frequency.  If not, fall
back to asking the platform/mach code for the clock frequency associated
with the flexcan device.

Signed-off-by: Robin Holt 
Acked-by: Wolfgang Grandegger ,
Cc: Kumar Gala 
Cc: Marc Kleine-Budde ,
Cc: U Bhaskar-B22300 
Cc: Scott Wood 
Cc: Grant Likely 
Cc: socketcan-core@lists.berlios.de,
Cc: netdev@vger.kernel.org,
Cc: PPC list 
Cc: devicetree-discuss@lists.ozlabs.org
Signed-off-by: David S. Miller

flexcan: Add of_match to platform_device definition.

2011-08-18T03:36:38+00:00

On powerpc, the OpenFirmware devices are not matched without specifying
an of_match array.  Introduce that array as that is used for matching
on the Freescale P1010 processor.

Signed-off-by: Robin Holt 
Acked-by: Marc Kleine-Budde 
Acked-by: Wolfgang Grandegger 
Cc: U Bhaskar-B22300 
Cc: Grant Likely 
Cc: socketcan-core@lists.berlios.de
Cc: netdev@vger.kernel.org
Cc: PPC list 
Cc: devicetree-discuss@lists.ozlabs.org
Signed-off-by: David S. Miller

flexcan: Abstract off read/write for big/little endian.

2011-08-18T03:36:38+00:00

Make flexcan driver handle register reads in the appropriate endianess.
This was a basic search and replace and then define some inlines.

Signed-off-by: Robin Holt 
Acked-by: Marc Kleine-Budde 
Acked-by: Wolfgang Grandegger 
Cc: U Bhaskar-B22300 
Cc: socketcan-core@lists.berlios.de
Cc: netdev@vger.kernel.org
Cc: PPC list 
Signed-off-by: David S. Miller