linux-toradex.git/drivers/net/can/sja1000, branch v2.6.32

can: Fix driver Kconfig structure

2009-11-14T03:56:55+00:00

In 2.6.32-rc the new EMS USB CAN driver was contributed and added the Kconfig
entry right behind an entry of the same *vendor*. This teared the SJA1000
based driver selection into pieces.

This fix cleans up the 2.6.32-rc Kconfig files for the CAN drivers and moves
the SJA1000 and USB Kconfig portions into the belonging directories.

As there are many new CAN drivers in the queue getting this cleanup into
2.6.32-rc would massively reduce the problems for the upcoming drivers.

Thanks,
Oliver

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller

net: Fix OF platform drivers coldplug/hotplug when compiled as modules

2009-10-14T21:54:52+00:00

Some OF platform drivers are missing module device tables, so they won't
load automatically on boot. This patch fixes the issue by adding proper
MODULE_DEVICE_TABLE() macros to the drivers.

Signed-off-by: Anton Vorontsov 
Signed-off-by: David S. Miller

ems_pci: fix size of CAN controllers BAR mapping for CPC-PCI v2

2009-09-24T22:39:18+00:00

The driver mapped only 128 bytes of the CAN controller address space when a
CPC-PCI v2 was detected (incl. CPC-104P). This patch will fix it by always
mapping the whole address space (4096 bytes on all boards) of the
corresponding PCI BAR.

Signed-off-by: Sebastian Haas 
Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller

can: sja1000: legacy SJA1000 ISA bus driver

2009-09-04T09:16:16+00:00

This patch adds support for legacy SJA1000 CAN controllers on the ISA
or PC-104 bus. The I/O port or memory address and the IRQ number must
be specified via module parameters:

  insmod sja1000_isa.ko port=0x310,0x380 irq=7,11

for ISA devices using I/O ports or:

  insmod sja1000_isa.ko mem=0xd1000,0xd1000 irq=7,11

for memory mapped ISA devices.

Indirect access via address and data port is supported as well:

  insmod sja1000_isa.ko port=0x310,0x380 indirect=1 irq=7,11

Here is a full list of the supported module parameters:

  port:I/O port number (array of ulong)
  mem:I/O memory address (array of ulong)
  indirect:Indirect access via address and data port (array of byte)
  irq:IRQ number (array of int)
  clk:External oscillator clock frequency (default=16000000 [16 MHz])
      (array of int)
  cdr:Clock divider register (default=0x48 [CDR_CBP | CDR_CLK_OFF])
      (array of byte)
  ocr:Output clock register (default=0x18 [OCR_TX0_PUSHPULL])
      (array of byte)

Note: for clk, cdr, ocr, the first argument re-defines the default
for all other devices, e.g.:

 insmod sja1000_isa.ko mem=0xd1000,0xd1000 irq=7,11 clk=24000000

is equivalent to

 insmod sja1000_isa.ko mem=0xd1000,0xd1000 irq=7,11 \
                       clk=24000000,24000000

Signed-off-by: Wolfgang Grandegger 
Tested-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

can: sja1000: fix network statistics update

2009-09-04T09:16:15+00:00

The member "tx_bytes" of "struct net_device_stats" should be
incremented when the interrupt is done and an "arbitration
lost error" is a TX error and the statistics should be updated
accordingly.

Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller

drivers: Kill now superfluous ->last_rx stores

2009-09-03T06:07:36+00:00

The generic packet receive code takes care of setting
netdev->last_rx when necessary, for the sake of the
bonding ARP monitor.

Signed-off-by: Eric Dumazet 
Acked-by: Neil Horman 
Signed-off-by: David S. Miller

netdev: convert bulk of drivers to netdev_tx_t

2009-09-01T08:14:07+00:00

In a couple of cases collapse some extra code like:
   int retval = NETDEV_TX_OK;
   ...
   return retval;
into
   return NETDEV_TX_OK;

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-07-24T02:03:51+00:00

Conflicts:
	drivers/net/wireless/iwmc3200wifi/netdev.c
	net/wireless/scan.c

can: sja1000: Add support for the new 4 channel EMS CPC-PCI cards

2009-07-24T01:01:02+00:00

This patch adds support to the ems_pci driver for the new, v2,
4 channel CPC-PCI/PCIe/104P CAN cards from EMS Dr. Thomas Wuensche.

Signed-off-by: Sebastian Haas 
Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller

can: sja1000: remove duplicated includes

2009-07-20T19:28:26+00:00

Remove duplicated #include('s) in
  drivers/net/can/sja1000/sja1000.c

Signed-off-by: Huang Weiyi 
Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller