| ce816fa88cca083c47ab9000b2138a83043a78be |
|
08-Apr-2014 |
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
If the renamed symbol is defined lib/iomap.c implements ioport_map and
ioport_unmap and currently (nearly) all platforms define the port
accessor functions outb/inb and friend unconditionally. So
HAS_IOPORT_MAP is the better name for this.
Consequently NO_IOPORT is renamed to NO_IOPORT_MAP.
The motivation for this change is to reintroduce a symbol HAS_IOPORT
that signals if outb/int et al are available. I will address that at
least one merge window later though to keep surprises to a minimum and
catch new introductions of (HAS|NO)_IOPORT.
The changes in this commit were done using:
$ git grep -l -E '(NO|HAS)_IOPORT' | xargs perl -p -i -e 's/\b((?:CONFIG_)?(?:NO|HAS)_IOPORT)\b/$1_MAP/'
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
| 02729c3d08c9334d03d61d365ff2408514a46c81 |
|
31-Jan-2014 |
Florian Vaussard <florian.vaussard@epfl.ch> |
can: sja1000: fuse of_platform into platform
The OpenFirmware probe can be merged into the standard platform
probe to leverage common code.
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Tested-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| 3fd33497f80aa528ded0db2851b48638635d5caa |
|
27-Mar-2013 |
Marc Kleine-Budde <mkl@pengutronix.de> |
can: sja1000: limit PEAK PCAN-PC Card to HAS_IOPORT
This patch limits the PEAK PCAN-PC Card driver to systems with ioports. Fixes a
compile time breakage on SH:
drivers/net/can/sja1000/peak_pcmcia.c:626:2: error:
implicit declaration of function 'ioport_unmap'
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| af5fd6da40412002bd2ba3293fd11fe862e15d80 |
|
09-Aug-2012 |
Marc Kleine-Budde <mkl@pengutronix.de> |
can: sja1000: correct indention of Kconfig help text
This patch changes the indention of the Kconfig help text to the default
<tab> + 2 <space>.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| 6586c5d74e8c2883ed1246aae81275efb777c088 |
|
20-Jul-2012 |
Marc Kleine-Budde <mkl@pengutronix.de> |
can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block
This patch adds an 'if CAN_DEV...endif' Block around the CAN driver
symbols in drivers/net/can/Kconfig. So the 'depends on CAN' dependencies
can be removed.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| 04df25107345451575a2c57843271cfe71d4c64c |
|
04-Oct-2012 |
Andreas Larsson <andreas@gaisler.com> |
can: sja1000: Make sja1000_of_platform selectable and compilable on SPARC
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| e4bc6c06569a90512169d98a11b3eb2ec18da4ae |
|
16-Oct-2012 |
Muhammad Ghias <mghias@connecttech.com> |
can: sja1000: plx_pci: add support for Connect Tech Inc's Canpro/104-Plus Opto CAN board
Patch adds support for CANpro/104-Plus Opto CAN board. Board uses PLX9030
bridge and two NXP SJA1000 CAN controllers. Patch is generated and tested with
kernel 3.6.1.
Signed-off-by: Muhammad Ghias <mghias@connecttech.com>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
[mkl: minor adjustments to commit message]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| 59bf896406471ac49d124b3e5f4edcafe28e5360 |
|
17-Apr-2012 |
Masanari Iida <standby24x7@gmail.com> |
Fix "the the" in various Kconfig
Fix typo "the the" in various Kconfig.
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
| 2b61972b74219d21ef1e91178349bdb840357688 |
|
02-Mar-2012 |
Stephane Grosjean <s.grosjean@peak-system.com> |
can: sja1000: add support for PEAK-System PCMCIA card
This patch adds support to the PCAN-PC Card PCMCIA card from
PEAK-System Technik (www.peak-system.com). This card is a CAN interface
for the PC Card slot. It is available as a single or dual-channel version.
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| e6d9c80b7ca1504411ad6d7acdb8683e4ae1c9cd |
|
02-Mar-2012 |
Stephane Grosjean <s.grosjean@peak-system.com> |
can: peak_pci: add support of some new PEAK-System PCI cards
This patch adds the support of some new PEAK-System PCI cards in the CAN
network sub-system. These are:
PCAN-PCIeC (PCI-ExpressCard)
PCAN-mminiPCI (mini-PCI)
PCAN-PCI (PCI next-gen)
This patch also adds the control of the blinking leds of the PCAN-PCIeC.
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| e08534b57e79fa722e3136b79868a725a8eea0f0 |
|
12-Dec-2011 |
James Kime <kime@ixxat.de> |
can: plx_pci: add support for IXXAT PCI cards
This patch adds support for IXXAT passive CAN controllers
Signed-off-by: James Kime <kime@ixxat.de>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| 1839a6c6f1eb8c0e20dc87d57024a85707f1a2f8 |
|
24-Nov-2011 |
Wolfgang Grandegger <wg@grandegger.com> |
can: sja1000_isa: convert to platform driver to support x86_64 systems
This driver is currently not supported on x86_64 systems because the
"isa_driver" interface is used (CONFIG_ISA=y). To overcome this
limitation, the driver is converted to a platform driver, similar to
the serial 8250 driver.
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| fd734c6f25aea4b2b44b045e489aec67b388577e |
|
23-Sep-2011 |
Oliver Hartkopp <socketcan@hartkopp.net> |
can/sja1000: add driver for EMS PCMCIA card
This patch adds the driver for the SJA1000 based PCMCIA card 'CPC-Card' from
EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Markus Plessing <plessing@ems-wuensche.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| 38034518c086fc48232b641cab97396a615864d0 |
|
12-Sep-2011 |
Wolfgang Grandegger <wg@grandegger.com> |
can/sja1000: driver for PEAK PCAN PCI/PCIe cards
This patch add the peak_pci driver for the PCAN PCI/PCIe cards (1, 2, 3
or 4 channels) from PEAK Systems (http://www.peak-system.com).
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| 2d3359f8b9e6b3d6339b7e72f8e82275058eb13c |
|
18-Oct-2010 |
Andre B. Oliveira <anbadeol@gmail.com> |
can: tscan1: add driver for TS-CAN1 boards
Add driver for Technologic Systems TS-CAN1 PC104 peripheral boards.
Signed-off-by: Andre B. Oliveira <anbadeol@gmail.com>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| 82e381775f6da6b29ae625e73a2ea18844eb4825 |
|
07-Apr-2010 |
Matthias Fuchs <matthias.fuchs@esd.eu> |
can: Add esd board support to plx_pci CAN driver
This patch adds support for SJA1000 based PCI CAN interface cards
from electronic system design gmbh.
Some changes have been done on the common code:
- esd boards must not have the 2nd local interupt enabled (PLX9030/9050)
- a new path for PLX9056/PEX8311 chips has been added
- new plx9056 reset function has been implemented
- struct plx_card_info got a reset function entry
In detail the following additional boards are now supported:
CAN-PCI/200 (PCI)
CAN-PCI/266 (PCI)
CAN-PMC266 (PMC module)
CAN-PCIe/2000 (PCI Express)
CAN-CPCI/200 (Compact PCI, 3U)
CAN-PCI104 (PCI104)
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| 24c4a3b29255f9f8bc48d93597a58256b5a1f83f |
|
01-Feb-2010 |
Pavel Cheblakov <P.B.Cheblakov@inp.nsk.su> |
can: add support for CAN interface cards based on the PLX90xx PCI bridge
This driver is for CAN interface cards based on the PLX90xx PCI bridge.
Driver supports now:
- Adlink PCI-7841/cPCI-7841 card (http://www.adlinktech.com/)
- Adlink PCI-7841/cPCI-7841 SE card
- Marathon CAN-bus-PCI card (http://www.marathon.ru/)
- TEWS TECHNOLOGIES TPMC810 card (http://www.tews.com/)
Changes since v1:
- Added some defines for static inline int plx_pci_check_sja1000(...)
- static struct pci_device_id plx_pci_tbl[] replaced by
static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl)
- Typo fixed
Signed-off-by: Pavel Cheblakov <P.B.Cheblakov@inp.nsk.su>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| b93cf3f0bb45560d2ce62bdcc2181c40660cfdbf |
|
12-Nov-2009 |
Oliver Hartkopp <oliver@hartkopp.net> |
can: Fix driver Kconfig structure
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 <oliver@hartkopp.net>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
|