Included support for PiMX1 board with SJA1000 on MX_DIS1 expansion board.

[lincan.git] / lincan / src / pcm3680.c

diff --git a/lincan/src/pcm3680.c b/lincan/src/pcm3680.c
index dc3c2745953a07c0b26d2950ff92f8f871c5a2b1..adc42939d9d2db5d65aace088926ab7453602992 100644 (file)
--- a/lincan/src/pcm3680.c
+++ b/lincan/src/pcm3680.c
@@ -11,7 +11,6 @@
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/pcm3680.h"
-#include "../include/i82527.h"
 #include "../include/sja1000p.h"
 
 /*
@@ -85,7 +84,7 @@ int pcm3680_release_io(struct candevice_t *candev)
 int pcm3680_reset(struct candevice_t *candev)
 {
        int i=0;
-       struct chip_t *chip;
+       struct canchip_t *chip;
        int chipnr;
        
        DEBUGMSG("Resetting pcm3680 hardware ...\n");
@@ -140,7 +139,6 @@ int pcm3680_init_hw_data(struct candevice_t *candev)
        return 0;
 }
 
-#define CHIP_TYPE "sja1000p"
 /**
  * template_init_chip_data - Initialize chips
  * @candev: Pointer to candevice/board structure
@@ -172,7 +170,7 @@ int pcm3680_init_hw_data(struct candevice_t *candev)
  */
 int pcm3680_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-       candev->chip[chipnr]->chip_type=CHIP_TYPE;
+       sja1000p_fill_chipspecops(candev->chip[chipnr]);
        candev->chip[chipnr]->chip_base_addr=
                        candev->io_addr + 0x200*chipnr;
        candev->chip[chipnr]->clock = 16000000;
@@ -202,7 +200,7 @@ int pcm3680_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int pcm3680_init_obj_data(struct chip_t *chip, int objnr)
+int pcm3680_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;