]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Staging: ipack/devices/ipoctal: initialize the device in probe function
authorSamuel Iglesias Gonsálvez <siglesias@igalia.com>
Fri, 13 Jul 2012 11:33:14 +0000 (13:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jul 2012 02:11:37 +0000 (19:11 -0700)
Initialize the device when registering it. Sometimes the user access to it
and the device is in an unknown state, so it could fail.

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ipack/devices/ipoctal.c

index a1aae40ce68de643fbce818012c4f3a177492b94..fd0e30132ca247565dc05993ed79749100cd9d6a 100644 (file)
@@ -411,6 +411,20 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
        for (i = 0; i < NR_CHANNELS ; i++) {
                ipoctal_write_io_reg(ipoctal, &ipoctal->chan_regs[i].u.w.cr,
                                     CR_DISABLE_RX | CR_DISABLE_TX);
+               ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[i].u.w.cr,
+                                    CR_CMD_RESET_RX);
+               ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[i].u.w.cr,
+                                    CR_CMD_RESET_TX);
+               ipoctal_write_io_reg(ipoctal,
+                                    &ipoctal->chan_regs[i].u.w.mr,
+                                    MR1_CHRL_8_BITS | MR1_ERROR_CHAR |
+                                    MR1_RxINT_RxRDY); /* mr1 */
+               ipoctal_write_io_reg(ipoctal,
+                                    &ipoctal->chan_regs[i].u.w.mr,
+                                    0); /* mr2 */
+               ipoctal_write_io_reg(ipoctal,
+                                    &ipoctal->chan_regs[i].u.w.csr,
+                                    TX_CLK_9600  | RX_CLK_9600);
        }
 
        for (i = 0; i < IP_OCTAL_NB_BLOCKS; i++) {