imx: ventana: use dt for hwmon

Use dt-bindings for GSC hwmon devices.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

diff --git a/board/gateworks/gw_ventana/gsc.c b/board/gateworks/gw_ventana/gsc.c
index 59fd1b6939a90064f4389e83a8f728c4d4a8d433..324e5dbed2c82521bf3deecbc7188efaaa2a5155 100644 (file)
--- a/board/gateworks/gw_ventana/gsc.c
+++ b/board/gateworks/gw_ventana/gsc.c
@@ -15,10 +15,13 @@
 #include <linux/ctype.h>
 
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 
 #include "ventana_eeprom.h"
 #include "gsc.h"
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /*
  * The Gateworks System Controller will fail to ACK a master transaction if
  * it is busy, which can occur during its 1HZ timer tick while reading ADC's.
@@ -65,24 +68,116 @@ int gsc_i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
        return ret;
 }
 
-static void read_hwmon(const char *name, uint reg, uint size)
+int gsc_get_board_temp(void)
 {
-       unsigned char buf[3];
-       uint ui;
+       const void *fdt = gd->fdt_blob;
+       int node, reg, mode, val;
+       const char *label;
+       u8 buf[2];
+       int ret;
 
-       printf("%-8s:", name);
-       memset(buf, 0, sizeof(buf));
-       if (gsc_i2c_read(GSC_HWMON_ADDR, reg, 1, buf, size)) {
-               puts("fRD\n");
-       } else {
-               ui = buf[0] | (buf[1]<<8) | (buf[2]<<16);
-               if (size == 2 && ui > 0x8000)
-                       ui -= 0xffff;
-               if (ui == 0xffffff)
-                       puts("invalid\n");
-               else
-                       printf("%d\n", ui);
+       node = fdt_node_offset_by_compatible(fdt, -1, "gw,gsc-adc");
+       if (node <= 0)
+               return node;
+       i2c_set_bus_num(0);
+
+       /* iterate over hwmon nodes */
+       node = fdt_first_subnode(fdt, node);
+       while (node > 0) {
+               reg = fdtdec_get_int(fdt, node, "reg", -1);
+               mode = fdtdec_get_int(fdt, node, "gw,mode", -1);
+               label = fdt_stringlist_get(fdt, node, "label", 0, NULL);
+
+               if ((reg == -1) || (mode == -1) || !label) {
+                       printf("invalid dt:%s\n", fdt_get_name(fdt, node, NULL));
+                       continue;
+               }
+
+               if ((mode != 0) || strcmp(label, "temp"))
+                       continue;
+
+               memset(buf, 0, sizeof(buf));
+               ret = gsc_i2c_read(GSC_HWMON_ADDR, reg, 1, buf, sizeof(buf));
+               val = buf[0] | buf[1] << 8;
+               if (val >= 0) {
+                       if (val > 0x8000)
+                               val -= 0xffff;
+                       return val;
+               }
+               node = fdt_next_subnode(fdt, node);
        }
+
+       return 0;
+}
+
+/* display hardware monitor ADC channels */
+int gsc_hwmon(void)
+{
+       const void *fdt = gd->fdt_blob;
+       int node, reg, mode, len, val, offset;
+       const char *label;
+       u8 buf[2];
+       int ret;
+
+       node = fdt_node_offset_by_compatible(fdt, -1, "gw,gsc-adc");
+       if (node <= 0)
+               return node;
+       i2c_set_bus_num(0);
+
+       /* iterate over hwmon nodes */
+       node = fdt_first_subnode(fdt, node);
+       while (node > 0) {
+               reg = fdtdec_get_int(fdt, node, "reg", -1);
+               mode = fdtdec_get_int(fdt, node, "gw,mode", -1);
+               offset = fdtdec_get_int(fdt, node, "gw,voltage-offset-microvolt", 0);
+               label = fdt_stringlist_get(fdt, node, "label", 0, NULL);
+
+               if ((reg == -1) || (mode == -1) || !label)
+                       printf("invalid dt:%s\n", fdt_get_name(fdt, node, NULL));
+
+               memset(buf, 0, sizeof(buf));
+               ret = gsc_i2c_read(GSC_HWMON_ADDR, reg, 1, buf, sizeof(buf));
+               val = buf[0] | buf[1] << 8;
+               if (val >= 0) {
+                       const u32 *div;
+                       int r[2];
+
+                       switch (mode) {
+                       case 0: /* temperature (C*10) */
+                               if (val > 0x8000)
+                                       val -= 0xffff;
+                               printf("%-8s: %d.%ldC\n", label, val / 10, abs(val % 10));
+                               break;
+                       case 1: /* prescaled voltage */
+                               if (val != 0xffff)
+                                       printf("%-8s: %d.%03dV\n", label, val / 1000, val % 1000);
+                               break;
+                       case 2: /* scaled based on ref volt and resolution */
+                               val *= 2500;
+                               val /= 1 << 12;
+
+                               /* apply pre-scaler voltage divider */
+                               div  = fdt_getprop(fdt, node, "gw,voltage-divider-ohms", &len);
+                               if (div && (len == sizeof(uint32_t) * 2)) {
+                                       r[0] = fdt32_to_cpu(div[0]);
+                                       r[1] = fdt32_to_cpu(div[1]);
+                                       if (r[0] && r[1]) {
+                                               val *= (r[0] + r[1]);
+                                               val /= r[1];
+                                       }
+                               }
+
+                               /* adjust by offset */
+                               val += (offset / 1000);
+
+                               printf("%-8s: %d.%03dV\n", label, val / 1000, val % 1000);
+                               break;
+                       }
+               }
+               node = fdt_next_subnode(fdt, node);
+       }
+
+       return 0;
 }
 
 int gsc_info(int verbose)
@@ -103,54 +198,13 @@ int gsc_info(int verbose)
                gsc_i2c_write(GSC_SC_ADDR, GSC_SC_STATUS, 1,
                              &buf[GSC_SC_STATUS], 1);
        }
-       if (!gsc_i2c_read(GSC_HWMON_ADDR, GSC_HWMON_TEMP, 1, buf, 2)) {
-               int ui = buf[0] | buf[1]<<8;
-               if (ui > 0x8000)
-                       ui -= 0xffff;
-               printf(" board temp at %dC", ui / 10);
-       }
+       printf(" board temp at %dC", gsc_get_board_temp() / 10);
        puts("\n");
        if (!verbose)
                return CMD_RET_SUCCESS;
 
-       read_hwmon("Temp",     GSC_HWMON_TEMP, 2);
-       read_hwmon("VIN",      GSC_HWMON_VIN, 3);
-       read_hwmon("VBATT",    GSC_HWMON_VBATT, 3);
-       read_hwmon("VDD_3P3",  GSC_HWMON_VDD_3P3, 3);
-       read_hwmon("VDD_ARM",  GSC_HWMON_VDD_CORE, 3);
-       read_hwmon("VDD_SOC",  GSC_HWMON_VDD_SOC, 3);
-       read_hwmon("VDD_HIGH", GSC_HWMON_VDD_HIGH, 3);
-       read_hwmon("VDD_DDR",  GSC_HWMON_VDD_DDR, 3);
-       read_hwmon("VDD_5P0",  GSC_HWMON_VDD_5P0, 3);
-       if (strncasecmp((const char*) ventana_info.model, "GW553", 5))
-               read_hwmon("VDD_2P5",  GSC_HWMON_VDD_2P5, 3);
-       read_hwmon("VDD_1P8",  GSC_HWMON_VDD_1P8, 3);
-       read_hwmon("VDD_IO2",  GSC_HWMON_VDD_IO2, 3);
-       switch (ventana_info.model[3]) {
-       case '1': /* GW51xx */
-               read_hwmon("VDD_IO3",  GSC_HWMON_VDD_IO4, 3); /* -C rev */
-               break;
-       case '2': /* GW52xx */
-               break;
-       case '3': /* GW53xx */
-               read_hwmon("VDD_IO4",  GSC_HWMON_VDD_IO4, 3); /* -C rev */
-               read_hwmon("VDD_GPS",  GSC_HWMON_VDD_IO3, 3);
-               break;
-       case '4': /* GW54xx */
-               read_hwmon("VDD_IO3",  GSC_HWMON_VDD_IO4, 3); /* -C rev */
-               read_hwmon("VDD_GPS",  GSC_HWMON_VDD_IO3, 3);
-               break;
-       case '5': /* GW55xx */
-               break;
-       case '6': /* GW560x */
-               read_hwmon("VDD_IO4",  GSC_HWMON_VDD_IO4, 3);
-               read_hwmon("VDD_GPS",  GSC_HWMON_VDD_IO3, 3);
-               break;
-       case '9': /* GW590x */
-               read_hwmon("AMONBMON",  GSC_HWMON_VDD_IO3, 3);
-               read_hwmon("BAT_VOLT",  GSC_HWMON_VDD_EXT, 3);
-               read_hwmon("BAT_TEMP",  GSC_HWMON_VDD_IO4, 2);
-       }
+       gsc_hwmon();
+
        return 0;
 }