Merge: Changed baudrate calculation to consider DSC selection.

Merge commit 'remotes/sf-ocera-lincan/master'

diff --git a/lincan/src/i82527.c b/lincan/src/i82527.c
index 00dd885b652dca00b028385f32c48c54f4ae232d..66bdc553cd1918ae136c7c9901641289f874c5d3 100644 (file)
--- a/lincan/src/i82527.c
+++ b/lincan/src/i82527.c
@@ -131,7 +131,8 @@ int i82527_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,
        if (i82527_enable_configuration(chip))
                return -ENODEV;
 
-       clock /=2;
+       if(chip->int_cpu_reg & iCPU_DSC)
+               clock /=2;
 
        /* tseg even = round down, odd = round up */
        for (tseg=(0+0+2)*2; tseg<=(MAX_TSEG2+MAX_TSEG1+2)*2+1; tseg++) {

diff --git a/lincan/src/pip.c b/lincan/src/pip.c
index f0a04de451439ffedb7486260db7ccf52bb7acbe..add0feefe88d58924591366d5ebf2113525b1406 100644 (file)
--- a/lincan/src/pip.c
+++ b/lincan/src/pip.c
@@ -107,7 +107,7 @@ int pip_init_chip_data(struct candevice_t *candev, int chipnr)
 {
        i82527_fill_chipspecops(candev->chip[chipnr]);
        candev->chip[chipnr]->chip_base_addr = candev->io_addr;
-       candev->chip[chipnr]->clock = 16000000;
+       candev->chip[chipnr]->clock = 8000000;
        candev->chip[chipnr]->int_cpu_reg = 0;
        candev->chip[chipnr]->int_clk_reg = iCLK_SL1;
        candev->chip[chipnr]->int_bus_reg = iBUS_CBY;