Support mtcpm CPU board4.3.0a

13 files changed, 429 insertions, 1065 deletions

diff --git a/configure.ac b/configure.ac
index 97499a3..e584de0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mts-io], [4.1.4])
+AC_INIT([mts-io], [4.3.0])
 AC_CONFIG_SRCDIR([util/mts_util_lora2_reset.c])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER([config.h])
diff --git a/io-module/adc.c b/io-module/adc.c
deleted file mode 100644
index 3d5f3d0..0000000
--- a/io-module/adc.c
+++ /dev/null
@@ -1,126 +0,0 @@
-#define AT91SAM9X5_BASE_ADC     0xf804c000
-#define AT91SAM9260_BASE_ADC     0xfffe0000
-
-#define ADC_SHTIME_DEFAULT			0x05
-#define ADC_STARTUP_DEFAULT			0x04
-#define ADC_PRESCALE_DEFAULT			0x3F
-#define ADC_MODE_DEFAULT \
-	((ADC_SHTIME_DEFAULT & 0x0F) << 24) | \
-	((ADC_STARTUP_DEFAULT & 0x1F) << 16) | \
-	((ADC_PRESCALE_DEFAULT & 0x3F) << 8)
-
-#define ADC_CR_OFFSET			0x00
-#define ADC_MR_OFFSET			0x04
-#define ADC_CHER_OFFSET			0x10
-#define ADC_CHDR_OFFSET			0x14
-#define ADC_CHSR_OFFSET			0x18
-#define ADC_SR_OFFSET			0x1C
-#define ADC_LDCR_OFFSET			0x20
-#define ADC_IER_OFFSET			0x14
-#define ADC_IDR_OFFSET			0x28
-#define ADC_IMR_OFFSET			0x2C
-#define ADC_CDR0_OFFSET			0x30
-#define ADC_CDR1_OFFSET			0x34
-#define ADC_CDR2_OFFSET			0x38
-#define ADC_CDR3_OFFSET			0x3C
-
-void __iomem *adc_base;
-struct clk *adc_clk;
-
-#define ADC_CONVERT_RESET(base)			writel(0x01, (base) + ADC_CR_OFFSET)
-#define ADC_CONVERT_START(base)			writel(0x02, (base) + ADC_CR_OFFSET)
-
-static ssize_t mts_attr_show_adc(struct device *dev,
-			struct device_attribute *attr,
-			char *buf)
-{
-	int offset;
-	u32 value;
-	u32 chan_mask;
-
-	if (!DEVICE_CAPA(id_eeprom.capa, CAPA_ADC)) {
-		log_debug("ADC not available");
-		return -ENODEV;
-	}
-
-	if (!strcmp(attr->attr.name, "adc0")) {
-		offset = ADC_CDR0_OFFSET;
-		chan_mask = 0x01;
-	} else if (!strcmp(attr->attr.name, "adc1")) {
-		offset = ADC_CDR1_OFFSET;
-		chan_mask = 0x02;
-	} else if (!strcmp(attr->attr.name, "adc2")) {
-		offset = ADC_CDR2_OFFSET;
-		chan_mask = 0x04;
-	} else if (!strcmp(attr->attr.name, "adc3")) {
-		offset = ADC_CDR3_OFFSET;
-		chan_mask = 0x08;
-	} else {
-		log_notice("adc attr does not exist");
-		return -ENOENT;
-	}
-
-	mutex_lock(&mts_io_mutex);
-
-	// disable all channels and enable the one we want
-	writel(0x0F, adc_base + ADC_CHDR_OFFSET);
-	writel(chan_mask, adc_base + ADC_CHER_OFFSET);
-
-	ADC_CONVERT_START(adc_base);
-
-	// wait for conversion to complete (EOC bit set)
-	value = 0;
-	while (value != chan_mask) {
-		value = readl(adc_base + ADC_SR_OFFSET) & chan_mask;
-		log_debug("ADC_SR EOC [%X]", value);
-	}
-
-	// read result
-	value = readl(adc_base + offset);
-
-	mutex_unlock(&mts_io_mutex);
-
-	return sprintf(buf, "%lu\n", (unsigned long) value);
-}
-
-static DEVICE_ATTR_RO_MTS(dev_attr_adc0, "adc0", mts_attr_show_adc);
-static DEVICE_ATTR_RO_MTS(dev_attr_adc1, "adc1", mts_attr_show_adc);
-static DEVICE_ATTR_RO_MTS(dev_attr_adc2, "adc2", mts_attr_show_adc);
-static DEVICE_ATTR_RO_MTS(dev_attr_adc3, "adc3", mts_attr_show_adc);
-
-static int mts_io_board_adc_probe(struct platform_device *pdev)
-{
-	int err;
-	adc_clk = clk_get(&pdev->dev, "adc_clk");
-	if (adc_clk) {						
-		err = clk_prepare_enable(adc_clk);
-		if (err) {
-			log_error("clock failed to prepare+enable: %d\n", err);
-			return err;
-		}
-		#ifdef CONFIG_SOC_AT91SAM9X5
-		adc_base = ioremap(AT91SAM9X5_BASE_ADC, SZ_16K);
-		#else
-		adc_base = ioremap(AT91SAM9260_BASE_ADC, SZ_16K);
-		#endif
-		if (!adc_base) {
-			log_error("ioremap failed.\n");
-			return -ENOMEM;
-		}
-		ADC_CONVERT_RESET(adc_base);
-		writel(ADC_MODE_DEFAULT, adc_base + ADC_MR_OFFSET);
-		writel(0x000F0F0F, adc_base + ADC_IDR_OFFSET);
-		writel(0x0F, adc_base + ADC_CHDR_OFFSET);				
-	}
-	return 0;
-}
-
-static int mts_io_board_adc_remove(struct platform_device *pdev)
-{
-	if (adc_clk) {
-		int ret;
-		clk_disable_unprepare(adc_clk);									
-	}
-	return 0;
-}
-
diff --git a/io-module/mtcap.c b/io-module/machine/mtcap.c
index bd08d5a..bd08d5a 100644
--- a/io-module/mtcap.c
+++ b/io-module/machine/mtcap.c
diff --git a/io-module/mtcdt.c b/io-module/machine/mtcdt.c
index 69f87f7..575dd1e 100644
--- a/io-module/mtcdt.c
+++ b/io-module/machine/mtcdt.c
@@ -302,7 +302,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = {
 		.name = "GNSS_RESET",
 		.pin = {
 			.gpio = AT91_PIN_PD15,
-			.flags = GPIOF_OUT_INIT_LOW, /* Keep GPS quiet during boot */
+			.flags = GPIOF_OUT_INIT_LOW, /* Keep GPS quiet during boot for EXAR */
 			.label = "gnss-reset",
 		},
 		.capability = CAPA_GPS,
@@ -370,8 +370,10 @@ static DEVICE_ATTR_MTS(dev_attr_eth_reset, "eth-reset",
 	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
 static DEVICE_ATTR_MTS(dev_attr_gnss_int, "gnss-int",
 	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-
+static DEVICE_ATTR_RO_MTS(dev_attr_wifi_mac, "mac-wifi",
+	mts_attr_show_product_info);
+static DEVICE_ATTR_RO_MTS(dev_attr_bluetooth_mac, "mac-bluetooth",
+	mts_attr_show_product_info);
 
 static struct attribute *mtcdt_platform_attributes[] = {
 	&dev_attr_vendor_id.attr,
@@ -454,6 +456,8 @@ static struct attribute *mtcdt_0_1_wifi_bt_attributes[] = {
 		&dev_attr_wifi_bt_reset.attr,
 		&dev_attr_wifi_bt_lpmode.attr,
 		&dev_attr_wifi_bt_int.attr,
+                &dev_attr_bluetooth_mac.attr,
+                &dev_attr_wifi_mac.attr,
 };
 
 static struct attribute *mtcdt_0_1_gnss_attributes[] = {
diff --git a/io-module/machine/mtcpm.c b/io-module/machine/mtcpm.c
new file mode 100644
index 0000000..8167218
--- /dev/null
+++ b/io-module/machine/mtcpm.c
@@ -0,0 +1,297 @@
+#include "mts_io.h"
+
+#define OMAP_GPIO(BANK, GPIO) ((BANK*32)+GPIO)
+/*
+ * Within a struct gpio_pin, there is only one
+ * occurrence of each pin, so there is only one
+ * pin label set for each gpio pin.
+ */
+static struct gpio_pin gpio_pins_mtcpm[] = {
+	{
+		.name = "RADIO_RESET",
+		.pin = {
+			.gpio = OMAP_GPIO(5,9), /* 5_9 */
+			.flags = GPIOF_OUT_INIT_HIGH,
+			.label = "radio-reset",
+		},
+	},
+#if 0
+  /* This goes through the PMIC for now */
+	{
+		.name = "RADIO_POWER",
+		.pin = {
+			.gpio = 0, 
+			.flags = GPIOF_OUT_INIT_HIGH,
+			.label = "radio-power",
+		},
+	},
+#endif
+	{
+		.name = "DEVICE_RESET",
+		.pin = {
+			.gpio = OMAP_GPIO(1,29),
+			.flags = GPIOF_IN,
+			.label = "reset",
+		},
+		.active_low = 1,
+	},
+	{
+		.name = "WIFI_BT_INT",
+		.pin = {
+			.gpio = OMAP_GPIO(4,12), /* 4_12 */
+			.flags = GPIOF_IN,
+			.label = "wifi-bt-int",
+		},
+		.capability = CAPA_BLUETOOTH,
+	},
+	{
+		.name = "WIFI_RESET",
+		.pin = {
+			.gpio = OMAP_GPIO(4,11), /* 4_11 */
+			.flags = GPIOF_OUT_INIT_HIGH,
+			.label = "wlan-enabled",
+		},
+		.capability = CAPA_WIFI,
+		.active_low = 0,
+	},
+	{
+		.name = "BT_RESET",
+		.pin = {
+			.gpio = OMAP_GPIO(4,10), /* 4_10 */
+			.flags = GPIOF_OUT_INIT_HIGH,
+			.label = "bt-enabled",
+		},
+		.capability = CAPA_BLUETOOTH,
+		.active_low = 0,
+	},
+	{
+		.name = "USBHUB_RESET",
+		.pin = {
+			.gpio = OMAP_GPIO(3, 15),
+			.flags = GPIOF_OUT_INIT_HIGH,
+			.label = "usbhub-reset",
+		},
+		.active_low = 0,
+	},
+	{
+		.name = "ETH_RESET",
+		.pin = {
+				.gpio = OMAP_GPIO(4,7), /* 4_7 */ 
+				.flags = GPIOF_OUT_INIT_HIGH,
+				.label = "eth-reset",
+		},
+		.active_low = 0,
+	},
+	{
+		.name = "GNSS_INT",
+		.pin = {
+			.gpio = OMAP_GPIO(5,12), /* 5_12 */
+			.flags = GPIOF_OUT_INIT_HIGH,
+			.label = "gnss-int",
+		},
+		.capability = CAPA_GPS,
+	},
+	{
+		.name = "GNSS_RESET",
+		.pin = {
+			.gpio = OMAP_GPIO(5,10), /* 5_10 */
+			.flags = GPIOF_OUT_INIT_HIGH,
+			.label = "gnss-reset",
+		},
+		.capability = CAPA_GPS,
+		.active_low = 0,
+	},
+#if 0
+    /* Link status comes directly from the MTQ out to the baseboard */
+	{
+		.name = "LS_LED", 
+		.pin = {
+			.gpio = 0,
+			.flags = GPIOF_IN,
+			.label = "led-ls",
+		},
+		.active_low = 1,
+	},
+#endif
+	{
+		.name = "STATUS_LED",
+		.pin = {
+			.gpio = OMAP_GPIO(0, 20),
+			.flags = GPIOF_OUT_INIT_LOW,
+			.label = "led-status",
+		},
+	},
+	{
+		.name = "CD", 
+		.pin = {
+			.gpio = OMAP_GPIO(0, 21),
+			.flags = GPIOF_OUT_INIT_HIGH,
+			.label = "led-cd",
+		},
+	},
+	{
+		.name = "LED1", 
+		.pin = {
+			.gpio = OMAP_GPIO(4, 26),
+			.flags = GPIOF_OUT_INIT_LOW,
+			.label = "led-sig1",
+		},
+	},
+	{
+		.name = "LED2", 
+		.pin = {
+			.gpio = OMAP_GPIO(4, 27),
+			.flags = GPIOF_OUT_INIT_LOW,
+			.label = "led-sig2",
+		},
+	},
+	{
+		.name = "LED3", 
+		.pin = {
+			.gpio = OMAP_GPIO(4, 28),
+			.flags = GPIOF_OUT_INIT_LOW,
+			.label = "led-sig3",
+		},
+	},
+	{ },
+};
+
+static DEVICE_ATTR_MTS(dev_attr_wifi_reset_mtcpm, "wlan-enabled",
+	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
+static DEVICE_ATTR_MTS(dev_attr_bt_reset_mtcpm, "bt-enabled",
+	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
+static DEVICE_ATTR_RO_MTS(dev_attr_wifi_bt_int_mtcpm, "wifi-bt-int",
+	mts_attr_show_gpio_pin);
+static DEVICE_ATTR_MTS(dev_attr_gnss_reset_mtcpm, "gnss-reset",
+	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
+static DEVICE_ATTR_MTS(dev_attr_usbhub_reset_mtcpm, "usbhub-reset",
+	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
+static DEVICE_ATTR_MTS(dev_attr_eth_reset_mtcpm, "eth-reset",
+	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
+static DEVICE_ATTR_MTS(dev_attr_gnss_int_mtcpm, "gnss-int",
+	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
+static DEVICE_ATTR_MTS(dev_attr_lora_reset_mtcpm, "reset",
+		mts_attr_show_lora_gpio_pin, mts_attr_store_lora_gpio_pin);
+static DEVICE_ATTR_RO_MTS(dev_attr_lora_cdone_mtcpm, "cdone",
+		mts_attr_show_lora_gpio_pin);
+static DEVICE_ATTR_MTS(dev_attr_lora_creset_mtcpm, "creset",
+		mts_attr_show_lora_gpio_pin, mts_attr_store_lora_gpio_pin);
+static DEVICE_ATTR_RO_MTS(dev_attr_lora_eui_mtcpm, "eui",
+		mts_attr_show_lora_product_info);
+static DEVICE_ATTR_RO_MTS(dev_attr_lora_product_id_mtcpm, "product-id",
+		mts_attr_show_lora_product_info);
+static DEVICE_ATTR_RO_MTS(dev_attr_lora_hw_version_mtcpm, "hw-version",
+		mts_attr_show_lora_product_info);
+static DEVICE_ATTR_RO_MTS(dev_attr_wifi_mac_mtcpm, "mac-wifi",
+	mts_attr_show_product_info);
+static DEVICE_ATTR_RO_MTS(dev_attr_bluetooth_mac_mtcpm, "mac-bluetooth",
+	mts_attr_show_product_info);
+
+static struct attribute *mtcpm_platform_attributes[] = {
+	&dev_attr_imei.attr,
+	&dev_attr_eth_mac.attr,
+	&dev_attr_reset.attr,
+	&dev_attr_reset_monitor.attr,
+	&dev_attr_reset_monitor_intervals.attr,
+
+	&dev_attr_led_status.attr,
+	&dev_attr_led_cd_gpio.attr,
+	&dev_attr_led_sig1_gpio.attr,
+	&dev_attr_led_sig2_gpio.attr,
+	&dev_attr_led_sig3_gpio.attr,
+
+	&dev_attr_usbhub_reset.attr,
+	&dev_attr_eth_reset.attr,
+        
+  // radio feature is last to be able to 
+  // easily remove radio.
+  // is_radio_power_attr_mtcdt() searches
+  // for this for truncation.
+    &dev_attr_radio_power.attr,  /* Must be first radio attribute */
+	&dev_attr_radio_reset.attr,
+
+	&dev_attr_radio_reset_backoffs.attr,
+	&dev_attr_radio_reset_backoff_index.attr,
+	&dev_attr_radio_reset_backoff_seconds.attr,
+		
+    &dev_attr_wifi_reset_mtcpm.attr,
+	&dev_attr_bt_reset_mtcpm.attr,
+	&dev_attr_wifi_bt_int_mtcpm.attr,
+		
+    &dev_attr_gnss_reset_mtcpm.attr,
+	&dev_attr_gnss_int_mtcpm.attr,
+	&dev_attr_wifi_mac_mtcpm.attr,
+        &dev_attr_bluetooth_mac_mtcpm.attr,
+	NULL,
+};
+
+
+
+static struct attribute_group mtcpm_platform_attribute_group = {
+	.attrs = mtcpm_platform_attributes
+};
+
+static int 
+is_radio_power_attr_mtcpm(struct attribute *attr)
+{
+    return (attr ==  &dev_attr_radio_power.attr);
+}
+
+static struct attribute *mtcpm_lora_attributes[] = {
+		&dev_attr_lora_eui_mtcpm.attr,
+		&dev_attr_lora_product_id_mtcpm.attr,
+		&dev_attr_lora_hw_version_mtcpm.attr,
+		&dev_attr_lora_reset_mtcpm.attr,
+		&dev_attr_lora_cdone_mtcpm.attr,
+		&dev_attr_lora_creset_mtcpm.attr,
+		NULL,
+};
+
+static struct attribute_group mtcpm_lora_attribute_group = {
+	.attrs = mtcpm_lora_attributes
+};
+
+static struct attribute *mtcpm_cpu_attributes[] = {
+	&dev_attr_vendor_id.attr,
+	&dev_attr_product_id.attr,
+	&dev_attr_device_id.attr,
+	&dev_attr_uuid.attr,
+	&dev_attr_hw_version.attr,
+	&dev_attr_imei.attr,
+        NULL,
+};
+
+
+static struct attribute_group mtcpm_cpu_attribute_group = {
+	.attrs = mtcpm_cpu_attributes
+};
+
+static struct kobject *mts_cpu_kobject = NULL;
+
+static int mts_cpu_dir_create(uint8_t hw_version)
+{
+    if (hw_version != MTCPM_0_0)
+        return 0;
+    
+    mts_cpu_kobject = kobject_create_and_add("cpu", &mts_io_platform_device->dev.kobj);
+    if (!mts_cpu_kobject) {
+            log_error("kobject_create_and_add for cpu directory failed");
+            return -ENOMEM;
+    }
+
+    if (sysfs_create_group(mts_cpu_kobject, &mtcpm_cpu_attribute_group)) {
+            log_error("sysfs_create_group failed to create cpu group");
+            return -ENOMEM;
+    }
+
+    return 0;
+}
+
+static void mts_cpu_dir_delete(void)
+{
+	if (mts_cpu_kobject) {
+		kobject_put(mts_cpu_kobject);
+                mts_cpu_kobject = NULL;
+	}
+}
+
diff --git a/io-module/mths.c b/io-module/machine/mths.c
index a51380c..c19598d 100644
--- a/io-module/mths.c
+++ b/io-module/machine/mths.c
@@ -230,7 +230,7 @@ static struct gpio_pin gpio_pins_mths_0_0[] = {
         .name = "GNSS_RESET",
         .pin = {
             .gpio = AT91_PIN_PC6,
-            .flags = GPIOF_OUT_INIT_HIGH,
+            .flags = GPIOF_OUT_INIT_LOW,
             .label = "gnss-reset",
         }
     },
@@ -461,7 +461,7 @@ static struct gpio_pin gpio_pins_mths_0_1[] = {
         .name = "GNSS_RESET",
         .pin = {
             .gpio = AT91_PIN_PC6,
-            .flags = GPIOF_OUT_INIT_HIGH,
+            .flags = GPIOF_OUT_INIT_LOW,
             .label = "gnss-reset",
         }
     },
@@ -795,6 +795,9 @@ static DEVICE_ATTR_MTS(dev_attr_led_f_gpio_mths, "led-f",
 static DEVICE_ATTR_RO_MTS(dev_attr_wifi_mac_mths, "mac-wifi",
     mts_attr_show_product_info);
 
+static DEVICE_ATTR_RO_MTS(dev_attr_bluetooth_mac_mths, "mac-bluetooth",
+    mts_attr_show_product_info);
+
 static DEVICE_ATTR_MTS(dev_attr_wifi_bt_lpwkup_mths, "wifi-bt-lpwkup",
     mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
 
@@ -829,6 +832,7 @@ static struct attribute *mths_0_0_platform_attributes[] = {
     &dev_attr_hw_version.attr,
     &dev_attr_imei.attr,
     &dev_attr_wifi_mac_mths.attr,
+    &dev_attr_bluetooth_mac_mths.attr,
     &dev_attr_has_radio.attr,
 
     &dev_attr_reset.attr,
diff --git a/io-module/mtr.c b/io-module/machine/mtr.c
index e47beae..8664984 100644
--- a/io-module/mtr.c
+++ b/io-module/machine/mtr.c
@@ -885,7 +885,7 @@ static struct gpio_pin gpio_pins_mtrv1_0_1[] = {
 		.name = "GNSS_RESET",
 		.pin = {
 			.gpio = AT91_PIN_PD15,
-			.flags = GPIOF_OUT_INIT_HIGH,
+			.flags = GPIOF_OUT_INIT_LOW,
 			.label = "gnss-reset",
 		}
 	},
@@ -1158,7 +1158,7 @@ static struct gpio_pin gpio_pins_mtrv1_0_2[] = {
 		.name = "GNSS_RESET",
 		.pin = {
 			.gpio = AT91_PIN_PD15,
-			.flags = GPIOF_OUT_INIT_HIGH,
+			.flags = GPIOF_OUT_INIT_LOW,
 			.label = "gnss-reset",
 		}
 	},
@@ -1412,7 +1412,7 @@ static struct gpio_pin gpio_pins_mtrv1_0_3[] = {
                .name = "GNSS_RESET",
                .pin = {
                        .gpio = AT91_PIN_PD15,
-                       .flags = GPIOF_OUT_INIT_HIGH,
+                       .flags = GPIOF_OUT_INIT_LOW,
                        .label = "gnss-reset",
                }
        },
@@ -1740,6 +1740,9 @@ static DEVICE_ATTR_MTS(dev_attr_extserial_dcd_gpio_mtr, "extserial-dcd",
 static DEVICE_ATTR_RO_MTS(dev_attr_wifi_mac_mtr, "mac-wifi",
 	mts_attr_show_product_info);
 
+static DEVICE_ATTR_RO_MTS(dev_attr_bluetooth_mac_mtr, "mac-bluetooth",
+	mts_attr_show_product_info);
+
 static DEVICE_ATTR_MTS(dev_attr_wifi_bt_lpwkup_mtr, "wifi-bt-lpwkup",
 	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
 
@@ -1778,6 +1781,7 @@ static struct attribute *mtr_platform_attributes[] = {
 	&dev_attr_eth_mac.attr,
 	&dev_attr_has_radio.attr,
 	&dev_attr_wifi_mac_mtr.attr,
+	&dev_attr_bluetooth_mac_mtr.attr,
 	&dev_attr_reset.attr,
 	&dev_attr_reset_monitor.attr,
 	&dev_attr_reset_monitor_intervals.attr,
@@ -1831,6 +1835,7 @@ static struct attribute *mtrv1_0_1_platform_attributes[] = {
 	&dev_attr_eth_mac.attr,
 	&dev_attr_has_radio.attr,
 	&dev_attr_wifi_mac_mtr.attr,
+        &dev_attr_bluetooth_mac_mtr.attr,
 
 	&dev_attr_reset.attr,
 	&dev_attr_reset_monitor.attr,
@@ -1887,6 +1892,7 @@ static struct attribute *mtrv1_0_2_platform_attributes[] = {
 	&dev_attr_eth_mac.attr,
 	&dev_attr_has_radio.attr,
 	&dev_attr_wifi_mac_mtr.attr,
+	&dev_attr_bluetooth_mac_mtr.attr,
 
 	&dev_attr_reset.attr,
 	&dev_attr_reset_monitor.attr,
@@ -1946,6 +1952,7 @@ static struct attribute *mtrv1_0_3_platform_attributes[] = {
        &dev_attr_eth_mac.attr,
        &dev_attr_has_radio.attr,
        &dev_attr_wifi_mac_mtr.attr,
+       &dev_attr_bluetooth_mac_mtr.attr,
 
        &dev_attr_reset.attr,
        &dev_attr_reset_monitor.attr,
diff --git a/io-module/mt100eocg.c b/io-module/mt100eocg.c
deleted file mode 100644
index 749b85a..0000000
--- a/io-module/mt100eocg.c
+++ /dev/null
@@ -1,252 +0,0 @@
-#include "at91gpio.h"
-/* Used for both MT100EOCG 0.0 */
-static struct gpio_pin gpio_pins_mt100eocg_0_0[] = {
-	{	
-		.name = "ADC0",
-		.pin = {
-			.label = "adc0",
-			.gpio = AT91_PIN_PC0,
-			.flags = GPIOF_IN,
-		},
-	},
-	{
-		.name = "ADC1",
-		.pin = {
-			.label = "adc1",
-			.gpio = AT91_PIN_PC1,
-			.flags = GPIOF_IN,
-		},
-	},
-	{
-		.name = "ADC2",
-		.pin = {
-			.label = "adc2",
-			.gpio = AT91_PIN_PC2,
-			.flags = GPIOF_IN,
-		},
-	},
-	{
-		.name = "ADC3",
-		.pin = {
-			.label = "adc3",
-			.gpio = AT91_PIN_PC3,
-			.flags = GPIOF_IN,
-		},
-	},
-	{
-		.name = "DTR1",
-		.pin = {
-			.label = "extserial-dtr",
-			.gpio = AT91_PIN_PB18,
-			.flags = GPIOF_IN,
-		},
-		.active_low = 1,
-	},
-	{
-		.name = "DCD1",
-		.pin = {
-			.label = "extserial-dcd",
-			.gpio = AT91_PIN_PB3,
-			.flags = GPIOF_OUT_INIT_HIGH,
-		},
-		.active_low = 1,
-	},	
-	{
-		.name = "ETH0_ENABLED",
-		.pin = {
-			.label = "eth0-enabled",
-			.gpio = AT91_PIN_PB31,
-			.flags = GPIOF_OUT_INIT_HIGH,
-		},
-	},
-	{
-		.name = "ENIO",
-		.pin = {
-			.label = "enio",
-			.gpio = AT91_PIN_PC15,
-			.flags =  GPIOF_OUT_INIT_LOW,
-		},
-	},
-	{
-		.name = "DEVICE_RESET",
-		.pin = {
-			.label = "reset",
-			.gpio = AT91_PIN_PA22,
-			.flags = GPIOF_IN,
-		},
-		.active_low = 1,
-	},
-	{
-		.name = "RSERSRC",
-		.pin = {
-			.label = "rsersrc",
-			.gpio = AT91_PIN_PC7,
-			.flags = GPIOF_OUT_INIT_HIGH,
-		},
-		.active_low = 1,
-	},
-	{
-		.name = "RADIO_RESET",
-		.pin = {
-			.label = "radio-reset",
-			.gpio = AT91_PIN_PB30,
-			.flags = GPIOF_OUT_INIT_HIGH,
-		},
-	},	
-	{
-		.name = "GPIO11",
-		.pin = {
-			.label = "gpio11",
-			.gpio = AT91_PIN_PB19,
-			.flags = GPIOF_OPEN_DRAIN | GPIOF_INIT_HIGH,
-		},
-	},	
-	{
-		.name = "GPIO12",
-		.pin = {
-			.label = "gpio12",
-			.gpio = AT91_PIN_PB20,
-			.flags = GPIOF_OPEN_DRAIN | GPIOF_INIT_HIGH,
-		},
-	},	
-	{
-		.name = "LED2",
-		.pin = {
-			.label = "led2",
-			.gpio = AT91_PIN_PA30,
-			.flags = GPIOF_OUT_INIT_HIGH,
-		},
-		.active_low = 1,
-	},	
-	{
-		.name = "LED3",
-		.pin = {
-			.label = "led3",
-			.gpio = AT91_PIN_PC9,
-#if LED_LS_CONTROLLABLE
-			.flags = GPIOF_OUT_INIT_HIGH,
-#else
-			.flags = GPIOF_IN,
-#endif
-		},
-		.active_low = 1,
-	},
-	/*
-	{
-		.name = "TXD1",
-		.pin = {
-			.gpio = AT91_PIN_PB17,
-			.flags = GPIOF_IN,
-		},
-	},*/
-	{ },
-};
-
-/* mt100eocg specific attributes */
-static DEVICE_ATTR_RO_MTS(dev_attr_extserial_dtr, "extserial-dtr",
-	mts_attr_show_gpio_pin);
-
-static DEVICE_ATTR_MTS(dev_attr_extserial_dcd_gpio, "extserial-dcd",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-static DEVICE_ATTR_MTS(dev_attr_eth0_enabled, "eth0-enabled",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-static DEVICE_ATTR_MTS(dev_attr_enio, "enio",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-static DEVICE_ATTR_MTS(dev_attr_gpo1, "gpo1",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_gpo2, "gpo2",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_gpo3, "gpo3",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_gpo4, "gpo4",
-	mts_attr_show_dout, mts_attr_store_dout);
-
-
-static DEVICE_ATTR_MTS(dev_attr_led1, "led1",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_led2, "led2",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-#if LED_LS_CONTROLLABLE
-static DEVICE_ATTR_MTS(dev_attr_led3, "led3",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-#else
-static DEVICE_ATTR_RO_MTS(dev_attr_led3, "led3", mts_attr_show_gpio_pin);
-#endif
-
-static DEVICE_ATTR_MTS(dev_attr_led4, "led4",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_led5, "led5",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_led6, "led6",
-	mts_attr_show_dout, mts_attr_store_dout);
-
-static DEVICE_ATTR_MTS(dev_attr_gpio11, "gpio11",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-static DEVICE_ATTR_MTS(dev_attr_gpio12, "gpio12",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-static DEVICE_ATTR_MTS(dev_attr_rsersrc, "rsersrc",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-static struct attribute *mt100eocg_platform_attributes[] = {
-	&dev_attr_vendor_id.attr,
-	&dev_attr_product_id.attr,
-	&dev_attr_device_id.attr,
-	&dev_attr_hw_version.attr,
-	&dev_attr_imei.attr,
-	&dev_attr_eth_mac.attr,
-	&dev_attr_has_radio.attr,
-	&dev_attr_reset.attr,
-	&dev_attr_reset_monitor.attr,
-	&dev_attr_reset_monitor_intervals.attr,
-	&dev_attr_extserial_dtr.attr,
-	&dev_attr_extserial_dcd_gpio.attr,
-	&dev_attr_rsersrc.attr,  // AT91_PIN_PC7
-	&dev_attr_radio_reset.attr, // AT91_PIN_PB30
-	&dev_attr_eth0_enabled.attr,
-	&dev_attr_gpio11.attr, // AT91_PIN_PB19
-	&dev_attr_gpio12.attr, // AT91_PIN_PB20
-	&dev_attr_enio.attr,
-// SPI
-	&dev_attr_gpo1.attr, 
-	&dev_attr_gpo2.attr,
-	&dev_attr_gpo3.attr,
-	&dev_attr_gpo4.attr,
-//
-// SPI
-	&dev_attr_led1.attr,
-//
-	&dev_attr_led2.attr, // AT91_PIN_PA30
-	&dev_attr_led3.attr, // AT91_PIN_PC9
-// SPI
-	&dev_attr_led4.attr,
-	&dev_attr_led5.attr,
-	&dev_attr_led6.attr,
-//
-// SPI
-	&dev_attr_gpi5.attr,
-	&dev_attr_gpi6.attr,
-	&dev_attr_gpi7.attr,
-	&dev_attr_gpi8.attr,
-	&dev_attr_gpi9.attr,
-	&dev_attr_gpi10.attr,
-//
-// SPI
-	&dev_attr_board_temperature.attr,
-//
-// adc
-	&dev_attr_adc0.attr,
-	&dev_attr_adc1.attr,
-	&dev_attr_adc2.attr,
-	&dev_attr_adc3.attr,
-
-	NULL,
-};
-
-static struct attribute_group mt100eocg_platform_attribute_group = {
-	.attrs = mt100eocg_platform_attributes
-};
diff --git a/io-module/mts-io.c b/io-module/mts-io.c
index d6bd4f2..f224777 100644
--- a/io-module/mts-io.c
+++ b/io-module/mts-io.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include <linux/clk.h>
+
 #include <linux/delay.h>
 #include <linux/ioctl.h>
 #include <linux/input.h>
@@ -71,11 +71,6 @@ static const struct of_device_id mts_io_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, mts_io_dt_ids);
 
-/* on-board EEPROM */
-static struct mts_id_eeprom_layout id_eeprom;
-
-#include "adc.c"
-
 /*
  * We must call platform_set_drvdata, or else the
  * devres_head for the driver has junk in it, and
@@ -88,11 +83,7 @@ static struct mts_id_eeprom_layout id_eeprom;
  */
 static int mts_io_probe(struct platform_device *pdev)
 {
-    int ret = 0;
-    if (!DEVICE_CAPA(id_eeprom.capa, CAPA_ADC)) {
-        ret = mts_io_board_adc_probe(pdev);
-    }
-    return ret;
+    return 0;
 }
     
 static int mts_io_remove(struct platform_device *pdev)
@@ -113,6 +104,8 @@ static struct platform_driver mts_io_driver = {
 };
 
 
+/* on-board EEPROM */
+static struct mts_id_eeprom_layout id_eeprom;
 static uint8_t mts_hw_version;
 struct platform_device *mts_io_platform_device;
 EXPORT_SYMBOL(mts_io_platform_device);
@@ -135,8 +128,6 @@ static time_t time_now_secs(void);
 /* generic GPIO support */
 #include "gpio.c"
 
-#include "spi.c"
-
 /* generic Button support */
 //#include "buttons.c"
 
@@ -165,8 +156,8 @@ bool sent_extra_long = false;
  *   by a numeric, we have no modem.
  * All other cases, we have a modem.
  */
-static int
-has_radio(const char *product_id, size_t len)
+int
+mts_has_radio(const char *product_id, size_t len)
 {
 	char *p;
 	if (!product_id || ! *product_id)
@@ -203,6 +194,7 @@ has_radio(const char *product_id, size_t len)
 	log_debug("Undefined product-id - has modem");
  	return 1;  /* Product id invalid or empty, so instantiate a radio anyway */
 }
+EXPORT_SYMBOL(mts_has_radio);
 
 /* active-low socket modem reset */
 static ssize_t mts_attr_store_radio_reset(struct device *dev,
@@ -528,7 +520,7 @@ static ssize_t mts_attr_show_product_info(struct device *dev,
 		value = sprintf(buf, "%.32s\n", id_eeprom.product_id);
 	} else if (strcmp(attr->attr.name, "has-radio") == 0) {
 		value = sprintf(buf, "%1d\n",
-                    has_radio(id_eeprom.product_id,sizeof id_eeprom.product_id));
+                    mts_has_radio(id_eeprom.product_id,sizeof id_eeprom.product_id));
 	} else if (strcmp(attr->attr.name, "device-id") == 0) {
 		value = sprintf(buf, "%.32s\n", id_eeprom.device_id);
 	} else if (strcmp(attr->attr.name, "uuid") == 0) {
@@ -558,7 +550,15 @@ static ssize_t mts_attr_show_product_info(struct device *dev,
 			id_eeprom.mac_wifi[3],
 			id_eeprom.mac_wifi[4],
 			id_eeprom.mac_wifi[5]);
-	} else if (strcmp(attr->attr.name, "mac-eth") == 0) {
+	} else if (strcmp(attr->attr.name, "mac-bluetooth") == 0) {
+		value = sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X\n",
+			id_eeprom.mac_bluetooth[0],
+			id_eeprom.mac_bluetooth[1],
+			id_eeprom.mac_bluetooth[2],
+			id_eeprom.mac_bluetooth[3],
+			id_eeprom.mac_bluetooth[4],
+			id_eeprom.mac_bluetooth[5]);
+        } else if (strcmp(attr->attr.name, "mac-eth") == 0) {
 		value = sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X\n",
 			id_eeprom.mac_addr[0],
 			id_eeprom.mac_addr[1],
@@ -617,11 +617,12 @@ static int get_radio_model_from_product_id(void) {
 #include "mts_lora.c"
 
 /* include per-device pins and attributes */
-#include "mtcdt.c"
-#include "mtcap.c"
-#include "mtr.c"
-#include "mths.c"
-#include "mt100eocg.c"
+#include "machine/mtcdt.c"
+#include "machine/mtcap.c"
+#include "machine/mtr.c"
+#include "machine/mths.c"
+#include "machine/mtcpm.c"
+
 /* include capabilities sub-directory support */
 #include "mts_capab.c"
 
@@ -649,15 +650,20 @@ mts_id_eeprom_load(void)
       log_info("Platform EEPROM contents loaded");
     } else {
       log_error("Invalid platform EEPROM length (%d)", fw->size);
+      return -EINVAL;
     }
     
     release_firmware(fw);
   } else {
     log_error("Unable to load EEPROM contents (%d)", ret);
+    return -ENODEV;
   }
     
-        noradio = ! has_radio(id_eeprom.product_id,sizeof id_eeprom.product_id);
-        log_debug("mts_id_eeprom: noradio=%d",noradio);
+	// If we are an MTCPM, the base board sets the radio existance.
+	if (strncmp(id_eeprom.hw_version,HW_VERSION_MTCPM_DASH,sizeof HW_VERSION_MTCPM_DASH) != 0) {
+	    noradio = ! mts_has_radio(id_eeprom.product_id,sizeof id_eeprom.product_id);
+	    log_debug("mts_id_eeprom: noradio=%d",noradio);
+	}
         
 	if (((tmp=HW_VERSION_MTCAP_0_0),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0) ||
             ((tmp=HW_VERSION_MTCAP_0_1),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0) ||
@@ -784,7 +790,7 @@ mts_id_eeprom_load(void)
 
 		attr_group = &mtcdt_0_1_platform_attribute_group;
 		gpio_pins = gpio_pins_mtcdt_0_1;
-        set_buttons(default_buttons);
+		set_buttons(default_buttons);
                 log_info("detected board %s", tmp);
         } else if ((tmp=HW_VERSION_MTCDTIPHP_0_0),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0) {
                 current_blength = attr_blength = sizeof  mtcdt_0_1_platform_attributes;
@@ -831,15 +837,9 @@ mts_id_eeprom_load(void)
 		if (DEVICE_CAPA(id_eeprom.capa, CAPA_LORA)) {
 			attr_group_lora = &mtcdtiphp_0_0_lora_attribute_group;
                 }
-        set_buttons(default_buttons);
+		set_buttons(default_buttons);
 		log_info("detected board %s", tmp);
-	} else if (strncmp(id_eeprom.product_id, PRODUCT_ID_MT100EOCG, strlen(PRODUCT_ID_MT100EOCG)) == 0) {
-		attr_group = &mt100eocg_platform_attribute_group;
-		gpio_pins = gpio_pins_mt100eocg_0_0;
-		mts_hw_version = MT100EOCG_0_0;
-        set_buttons(default_buttons);
-		log_info("detected board %s", HW_VERSION_MT100EOCG_0_0);		
-	} else {
+    } else if ((tmp=HW_VERSION_MTCDT_0_0),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0) {
                 if(noradio) {
                     struct attribute **ap = mtcdt_platform_attribute_group.attrs;
                     while(1) {
@@ -859,9 +859,35 @@ mts_id_eeprom_load(void)
 		attr_group = &mtcdt_platform_attribute_group;
 		gpio_pins = gpio_pins_mtcdt_0_0;
 		mts_hw_version = MTCDT_0_0;
+		set_buttons(default_buttons);
+		log_info("detected board %s", tmp);
+
+    } else if (strncmp(id_eeprom.hw_version, HW_VERSION_MTCPM_0_0, strlen(HW_VERSION_MTCPM_0_0)) == 0) {
+        attr_group = &mtcpm_platform_attribute_group;
+        gpio_pins = gpio_pins_mtcpm;
         set_buttons(default_buttons);
-		log_info("detected board %s", HW_VERSION_MTCDT_0_0);
-	}
+        mts_hw_version = MTCPM_0_0;
+        log_info("detected board %s", HW_VERSION_MTCPM_0_0);
+    } else {
+        int i;
+
+        for(i=0;i<sizeof id_eeprom.hw_version;i++) {
+            if(! id_eeprom.hw_version[i])
+                /* Found NULL so done */
+                break;
+            if(! isprint(id_eeprom.hw_version[i]))
+                break;
+        }
+        log_alert("Unsupported EEPROM settings or device");
+
+        if(i)
+            log_alert("Found unsupported EEPROM HW_VERSION: %.*s",i,id_eeprom.hw_version);
+        log_alert("Check log for HW_VERSION dump");
+
+        print_hex_dump_bytes("HW_VERSION: ", DUMP_PREFIX_OFFSET, id_eeprom.hw_version, sizeof id_eeprom.hw_version);
+
+        return -ENODEV;
+    }
 
 	log_info("sizeof: %lu", (unsigned long) sizeof(struct mts_id_eeprom_layout));