[ATM] s/uni driver overwrites 8-/16-bit mode.

diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index b4ff66fa760f157ed4eb22e749380eb94e596d25..548f4ead189f385bae42fba7da95980a95c81f24 100644 (file)
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -297,7 +297,7 @@ int suni_init(struct atm_dev *dev)
        mri = GET(MRI); /* reset SUNI */
        PUT(mri | SUNI_MRI_RESET,MRI);
        PUT(mri,MRI);
-       PUT(0,MT); /* disable all tests */
+       PUT((GET(MT) & SUNI_MT_DS27_53),MT); /* disable all tests */
        REG_CHANGE(SUNI_TPOP_APM_S,SUNI_TPOP_APM_S_SHIFT,SUNI_TPOP_S_SONET,
            TPOP_APM); /* use SONET */
        REG_CHANGE(SUNI_TACP_IUCHP_CLP,0,SUNI_TACP_IUCHP_CLP,

diff --git a/drivers/atm/suni.h b/drivers/atm/suni.h
index ae6d39abbddf1bef2f34ae1e9d6bf7273b896e06..d14c835abc97e44f0a03452970aec0eb54168a59 100644 (file)
--- a/drivers/atm/suni.h
+++ b/drivers/atm/suni.h
@@ -198,6 +198,7 @@
 #define SUNI_MT_IOTST          0x04    /* RW, enable test mode */
 #define SUNI_MT_DBCTRL         0x08    /* W, control data bus by CSB pin */
 #define SUNI_MT_PMCTST         0x10    /* W, PMC test mode */
+#define SUNI_MT_DS27_53                0x80    /* RW, select between 8- or 16- bit */
 
 
 #define SUNI_IDLE_PATTERN       0x6a    /* idle pattern */