From 4a5972d1d1b0a96d02a4616c70f99b1d9888a221 Mon Sep 17 00:00:00 2001 From: Tom Knot Date: Wed, 4 Jul 2018 14:11:34 +0200 Subject: [PATCH] Removed secondary ao mode (as it is always voltage) --- modules/unipi/src/unipi_spi.h | 2 +- modules/unipi/src/unipi_sysfs.c | 8 ++++++-- modules/unipi/src/unipi_sysfs.h | 2 +- version.txt | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/unipi/src/unipi_spi.h b/modules/unipi/src/unipi_spi.h index 8b97e63..a332a87 100644 --- a/modules/unipi/src/unipi_spi.h +++ b/modules/unipi/src/unipi_spi.h @@ -321,7 +321,7 @@ static const struct iio_info neuronspi_sec_ai_info = { static const struct iio_info neuronspi_sec_ao_info = { .write_raw = neuronspi_iio_sec_ao_write_raw, .driver_module = THIS_MODULE, - .attrs = &neuron_sec_ao_group, + //.attrs = &neuron_sec_ao_group, }; // These defines need to be at the end diff --git a/modules/unipi/src/unipi_sysfs.c b/modules/unipi/src/unipi_sysfs.c index 83866cd..d114626 100644 --- a/modules/unipi/src/unipi_sysfs.c +++ b/modules/unipi/src/unipi_sysfs.c @@ -1163,7 +1163,7 @@ static DEVICE_ATTR(sys_gpio_ro_base, 0440, neuronspi_spi_gpio_show_ro_base, NULL static DEVICE_ATTR(mode_ai_voltage_current, 0660, neuronspi_iio_show_stm_ai_mode, neuronspi_iio_store_stm_ai_mode); static DEVICE_ATTR(mode_ao_voltage_current_resistance, 0660, neuronspi_iio_show_stm_ao_mode, neuronspi_iio_store_stm_ao_mode); static DEVICE_ATTR(mode_ai_voltage_current_resistance, 0660, neuronspi_iio_show_external_ai_mode, neuronspi_iio_store_external_ai_mode); -static DEVICE_ATTR(mode_ao_voltage, 0660, neuronspi_iio_show_external_ao_mode, neuronspi_iio_store_external_ao_mode); +//static DEVICE_ATTR(mode_ao_voltage, 0660, neuronspi_iio_show_external_ao_mode, neuronspi_iio_store_external_ao_mode); static struct attribute *neuron_plc_attrs[] = { &dev_attr_model_name.attr, @@ -1240,10 +1240,12 @@ static struct attribute *neuron_sec_ai_attrs[] = { NULL, }; -static struct attribute *neuron_sec_ao_attrs[] = { +/* + * static struct attribute *neuron_sec_ao_attrs[] = { &dev_attr_mode_ao_voltage.attr, NULL, }; +*/ static struct attribute_group neuron_plc_attr_group = { .attrs = neuron_plc_attrs, @@ -1277,9 +1279,11 @@ const struct attribute_group neuron_sec_ai_group = { .attrs = neuron_sec_ai_attrs, }; +/* const struct attribute_group neuron_sec_ao_group = { .attrs = neuron_sec_ao_attrs, }; +*/ const struct attribute_group *neuron_plc_attr_groups[] = { &neuron_plc_attr_group, diff --git a/modules/unipi/src/unipi_sysfs.h b/modules/unipi/src/unipi_sysfs.h index 560b3a8..1c2ac3b 100644 --- a/modules/unipi/src/unipi_sysfs.h +++ b/modules/unipi/src/unipi_sysfs.h @@ -30,7 +30,7 @@ extern u32 unipi_custom_speed_value; extern const struct attribute_group neuron_stm_ai_group; extern const struct attribute_group neuron_stm_ao_group; extern const struct attribute_group neuron_sec_ai_group; -extern const struct attribute_group neuron_sec_ao_group; +//extern const struct attribute_group neuron_sec_ao_group; extern const struct attribute_group *neuron_plc_attr_groups[]; extern const struct attribute_group *neuron_board_attr_groups[]; diff --git a/version.txt b/version.txt index 496ccd0..4fc3d8f 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:76(ef0de24) LatestCommit:Wed Jul 4 12:49:07 CEST 2018 +Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:77(ee9a708) LatestCommit:Wed Jul 4 14:11:35 CEST 2018 -- 2.34.1