diff options
| author | Andreas Larsson <andreas@gaisler.com> | 2012-10-04 15:59:10 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-11-27 09:49:32 +0100 |
| commit | 04df25107345451575a2c57843271cfe71d4c64c (patch) | |
| tree | ae7e5f7e2068cac9a7b4fd369c45ef401e971c40 /drivers/net/can/sja1000 | |
| parent | can: kvaser_usb: Add support for Kvaser CAN/USB devices (diff) | |
| download | linux-04df25107345451575a2c57843271cfe71d4c64c.tar.xz linux-04df25107345451575a2c57843271cfe71d4c64c.zip | |
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>
Diffstat (limited to 'drivers/net/can/sja1000')
| -rw-r--r-- | drivers/net/can/sja1000/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/sja1000_of_platform.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig index 559be87a0904..92f73c708a3d 100644 --- a/drivers/net/can/sja1000/Kconfig +++ b/drivers/net/can/sja1000/Kconfig @@ -21,7 +21,7 @@ config CAN_SJA1000_PLATFORM config CAN_SJA1000_OF_PLATFORM tristate "Generic OF Platform Bus based SJA1000 driver" - depends on PPC_OF + depends on OF ---help--- This driver adds support for the SJA1000 chips connected to the OpenFirmware "platform bus" found on embedded systems with diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c index f2683eb6a3d5..e45258d4369b 100644 --- a/drivers/net/can/sja1000/sja1000_of_platform.c +++ b/drivers/net/can/sja1000/sja1000_of_platform.c @@ -42,6 +42,8 @@ #include <linux/can/dev.h> #include <linux/of_platform.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> #include <asm/prom.h> #include "sja1000.h" @@ -59,13 +61,13 @@ MODULE_LICENSE("GPL v2"); static u8 sja1000_ofp_read_reg(const struct sja1000_priv *priv, int reg) { - return in_8(priv->reg_base + reg); + return ioread8(priv->reg_base + reg); } static void sja1000_ofp_write_reg(const struct sja1000_priv *priv, int reg, u8 val) { - out_8(priv->reg_base + reg, val); + iowrite8(val, priv->reg_base + reg); } static int __devexit sja1000_ofp_remove(struct platform_device *ofdev) |