can: janz-ican3: add support for CAL/CANopen firmware

In our department we are using some older Janz ICAN3-modules in our dekstop
pcs. There we have slightly different carrier boards than the janz-cmodio
supported in the kernel sources, called CAN-PCI2 with two submodules. But the
pci configuration regions are identical. So extending the supported pci devices
to the corresponding device ids is sufficient to get the drivers working.

* The old ICAN3-modules with firmware 1.28 need more then 250ms for the restart
  after reset. I've increased the timeout to 500ms.
* The janz_ican3 module uses the raw can services of the Janz-firmware, this
  means firmware must be ICANOS/2. Our ICAN3-modules are equipped with
  CAL/CANopen-firmware, so I must use the appropriate commands for the layer
  management services.

Te driver detects the firmware after module reset and selects the commands
matching the firmware. This affects the bus on/off-command
(ican3_set_bus_state) and the configuration of the bittiming
(ican3_set_bittiming). For better diagnostics the detected firmware string is
presented as sysfs attribute (fwinfo).

Signed-off-by: Andreas Gröger <andreas24groeger@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/Documentation/ABI/testing/sysfs-class-net-janz-ican3 b/Documentation/ABI/testing/sysfs-class-net-janz-ican3
index af25a58..fdbc03a 100644 (file)
--- a/Documentation/ABI/testing/sysfs-class-net-janz-ican3
+++ b/Documentation/ABI/testing/sysfs-class-net-janz-ican3
@@ -8,3 +8,12 @@ Description:
                Default: 1 (termination active)
                Reading: get actual termination state
                Writing: set actual termination state (0=no termination, 1=termination active)
+
+What:          /sys/class/net/<iface>/fwinfo
+Date:          May 2015
+KernelVersion: 3.19
+Contact:       Andreas Gröger <andreas24groeger@gmail.com>
+Description:
+               Firmware stamp of ican3 module
+               Read-only: 32 byte string identification of the ICAN3 module
+               (known values: "JANZ-ICAN3 ICANOS 1.xx", "JANZ-ICAN3 CAL/CANopen 1.xx")

diff --cc drivers/mfd/janz-cmodio.c
Simple merge

diff --cc drivers/net/can/janz-ican3.c
Simple merge