staging: comedi: amplc_dio200: enable enhanced features of PCIe boards

The new PCIe boards PCIe215, PCIe236 and PCIe296 have some enhanced
features (over the older boards), although none of these features are
supported by this driver yet.

Enable the enhanced features in hardware and use `dio200_layouts[]` to
indicate which boards support the enhanced features.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index cf53e84c3bc4ddfb25367a407c794efae404335c..1fc6d63398eb891d2330e800dbc099e80411ade6 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -269,6 +269,9 @@
 #define DIO200_YGAT_SCE                0x1c    /* Group Y gate selection register */
 #define DIO200_ZGAT_SCE                0x1d    /* Group Z gate selection register */
 #define DIO200_INT_SCE         0x1e    /* Interrupt enable/status register */
+/* Extra registers for new PCIe boards */
+#define DIO200_ENHANCE         0x20    /* 1 to enable enhanced features */
+#define DIO200_VERSION         0x24    /* Hardware version register */
 
 /*
  * Macros for constructing value for DIO_200_?CLK_SCE and
@@ -457,6 +460,7 @@ struct dio200_layout {
        unsigned char sdinfo[DIO200_MAX_SUBDEVS];       /* depends on sdtype */
        char has_int_sce;       /* has interrupt enable/status register */
        char has_clk_gat_sce;   /* has clock/gate selection registers */
+       char has_enhancements;  /* has enhanced features */
 };
 
 static const struct dio200_layout dio200_layouts[] = {
@@ -519,6 +523,7 @@ static const struct dio200_layout dio200_layouts[] = {
                                     0x10, 0x14, 0x00, 0x3F},
                          .has_int_sce = 1,
                          .has_clk_gat_sce = 1,
+                         .has_enhancements = 1,
                          },
        [pcie236_layout] = {
                          .n_subdevs = 8,
@@ -528,6 +533,7 @@ static const struct dio200_layout dio200_layouts[] = {
                                     0x10, 0x14, 0x00, 0x3F},
                          .has_int_sce = 1,
                          .has_clk_gat_sce = 1,
+                         .has_enhancements = 1,
                          },
        [pcie296_layout] = {
                          .n_subdevs = 8,
@@ -537,6 +543,7 @@ static const struct dio200_layout dio200_layouts[] = {
                                     0x10, 0x14, 0x00, 0x3F},
                          .has_int_sce = 1,
                          .has_clk_gat_sce = 1,
+                         .has_enhancements = 1,
                          },
 #endif
 };
@@ -1571,6 +1578,8 @@ static int dio200_pcie_board_setup(struct comedi_device *dev)
        }
        writel(0x80, brbase + 0x50);
        iounmap(brbase);
+       /* Enable "enhanced" features of board. */
+       dio200_write8(dev, DIO200_ENHANCE, 1);
        return 0;
 }