LinCAN driver updated to work on Real-Time Preemption enabled kernel.

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

diff --git a/lincan/src/pimx1.c b/lincan/src/pimx1.c
index 8486882d98ef51a324c9afbd9947e66e27699452..a24ddd81b58946d525623aaba3ec4683d4e3f8d4 100644 (file)
--- a/lincan/src/pimx1.c
+++ b/lincan/src/pimx1.c
@@ -11,6 +11,9 @@
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/sja1000p.h"
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/sja1000p.h"

+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14))
+#include <linux/irq.h>
+#endif /* <2.6.14 */

 #include <asm/arch/hardware.h>
 #include <asm/arch/imx-regs.h>
 
 #include <asm/arch/hardware.h>
 #include <asm/arch/imx-regs.h>
 


@@ -29,7 +32,7 @@
 #define NR_82527 0
 #define NR_SJA1000 1
 
 #define NR_82527 0
 #define NR_SJA1000 1
 

-static can_spinlock_t pimx1_setup_hardware_lock=SPIN_LOCK_UNLOCKED;
+static CAN_DEFINE_SPINLOCK(pimx1_setup_hardware_lock);

 
 int pimx1_setup_hardware(struct candevice_t *candev)
 {
 
 int pimx1_setup_hardware(struct candevice_t *candev)
 {


@@ -40,10 +43,17 @@ int pimx1_setup_hardware(struct candevice_t *candev)
        EIM_CS1U = 0x00000902;
        EIM_CS1L = 0x82820903;
        imx_gpio_mode(PA21_PF_A0);
        EIM_CS1U = 0x00000902;
        EIM_CS1L = 0x82820903;
        imx_gpio_mode(PA21_PF_A0);

+
+    #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14))

        /* Setup IRQ port as input */
        /* Setup IRQ port as input */

+       imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN  | GPIO_PUEN | 17);
+       /* Setup SJA1000 reset as output */
+       imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_OUT | GPIO_DR | 15);
+    #else /* <2.6.14 */

        imx_gpio_mode(GPIO_PORTB | GPIO_IN | GPIO_PUEN | GPIO_GPIO | 17);
        imx_gpio_mode(GPIO_PORTB | GPIO_IN | GPIO_PUEN | GPIO_GPIO | 17);

-       /* Setup SJA1000 reset as ourput */

        imx_gpio_mode(GPIO_PORTB | GPIO_OUT | GPIO_GPIO | 15);
        imx_gpio_mode(GPIO_PORTB | GPIO_OUT | GPIO_GPIO | 15);

+    #endif /* <2.6.14 */
+

        DR(1) |= 1<<15;
        can_spin_unlock_irqrestore(&pimx1_setup_hardware_lock,flags);
 
        DR(1) |= 1<<15;
        can_spin_unlock_irqrestore(&pimx1_setup_hardware_lock,flags);
 


@@ -86,7 +96,8 @@ int pimx1_request_io(struct candevice_t *candev)
                return -ENODEV;
        }
        can_base_addr_fixup(candev, remap_addr);
                return -ENODEV;
        }
        can_base_addr_fixup(candev, remap_addr);

-       CANMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr, candev->io_addr + PIMX1_CAN_IO_RANGE - 1);
+       CANMSG("Registered IO-memory: 0x%lx - 0x%lx (VMA 0x%lx)\n", 
+               candev->io_addr, candev->io_addr + PIMX1_CAN_IO_RANGE - 1, (long)remap_addr);

        return 0;
 }
 
        return 0;
 }
 


@@ -124,7 +135,7 @@ int pimx1_release_io(struct candevice_t *candev)
  */
 void pimx1_write_register(unsigned data, unsigned long address)
 {
  */
 void pimx1_write_register(unsigned data, unsigned long address)
 {

-       /*DEBUGMSG("pimx1_write_register: addr=0x%lx data=0x%x",
+       /*DEBUGMSG("pimx1_write_register: addr=0x%lx data=0x%x\n",

                address,data);*/
        writeb(data,address);
 }
                address,data);*/
        writeb(data,address);
 }