]> git.sur5r.net Git - groeck-nct6775/commitdiff
Enable both VIN3 and AUXTIN
authorGuenter Roeck <linux@roeck-us.net>
Sat, 6 Apr 2013 06:23:42 +0000 (23:23 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Sat, 6 Apr 2013 06:23:42 +0000 (23:23 -0700)
Both are reported at the same time on SuperMicro C7H61.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
nct6775.c

index bc85a2f2fdb9cae7f1b66bea01894e9eefa06832..6e856313c56a5c401d8e52ede6c396e0ebea0832 100644 (file)
--- a/nct6775.c
+++ b/nct6775.c
@@ -3223,43 +3223,6 @@ static int nct6775_probe(struct platform_device *pdev)
        }
 #endif /* USE_ALTERNATE */
 
-       switch (data->kind) {
-       case nct6775:
-               break;
-       case nct6776:
-               /*
-                * On NCT6776, AUXTIN and VIN3 pins are shared.
-                * Only way to detect it is to check if AUXTIN is used
-                * as a temperature source, and if that source is
-                * enabled.
-                *
-                * If that is the case, disable in6, which reports VIN3.
-                * Otherwise disable temp3.
-                */
-               if (data->have_temp & (1 << 2)) {
-                       u8 reg = nct6775_read_value(data,
-                                                   data->reg_temp_config[2]);
-                       if (reg & 0x01)
-                               data->have_temp &= ~(1 << 2);
-                       else
-                               data->have_in &= ~(1 << 6);
-               }
-               break;
-       case nct6779:
-               /*
-                * Shared pins:
-                *      VIN4 / AUXTIN0
-                *      VIN5 / AUXTIN1
-                *      VIN6 / AUXTIN2
-                *      VIN7 / AUXTIN3
-                *
-                * There does not seem to be a clean way to detect if VINx or
-                * AUXTINx is active, so for keep both sensor types enabled
-                * for now.
-                */
-               break;
-       }
-
        /* Initialize the chip */
        nct6775_init_device(data);