Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753208AbaKZVsy (ORCPT ); Wed, 26 Nov 2014 16:48:54 -0500 Received: from mail-oi0-f48.google.com ([209.85.218.48]:45510 "EHLO mail-oi0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752934AbaKZVsu (ORCPT ); Wed, 26 Nov 2014 16:48:50 -0500 From: George McCollister Cc: George McCollister , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald , Greg Kroah-Hartman , Srinivas Pandruvada , Sebastian Reichel , Harald Geyer , Reyad Attiyat , Daniel Baluta , linux-api@vger.kernel.org (open list:ABI/API), linux-kernel@vger.kernel.org (open list), linux-iio@vger.kernel.org (open list:IIO SUBSYSTEM AND...), devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM) Subject: [PATCH 1/2] iio: Add support for waveform output Date: Wed, 26 Nov 2014 15:45:40 -0600 Message-Id: <1417038344-3801-1-git-send-email-george.mccollister@gmail.com> X-Mailer: git-send-email 2.1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Output can be held high or low for a specified period of time. Support for waveform capture could be added in the future. Signed-off-by: George McCollister --- Documentation/ABI/testing/sysfs-bus-iio | 7 +++++++ drivers/iio/industrialio-core.c | 3 +++ drivers/staging/iio/Documentation/iio_event_monitor.c | 2 ++ include/linux/iio/types.h | 5 ++++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index d760b02..47df169 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio @@ -1028,3 +1028,10 @@ Contact: linux-iio@vger.kernel.org Description: Raw value of rotation from true/magnetic north measured with or without compensation from tilt sensors. + +What: /sys/bus/iio/devices/iio:deviceX/out_waveformY_hightime_raw +What: /sys/bus/iio/devices/iio:deviceX/out_waveformY_lowtime_raw +KernelVersion: 3.18 +Contact: linux-iio@vger.kernel.org +Description: + Raw value of time for output to be held high or low. diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index af3e76d..343e784 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -70,6 +70,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_CCT] = "cct", [IIO_PRESSURE] = "pressure", [IIO_HUMIDITYRELATIVE] = "humidityrelative", + [IIO_WAVEFORM] = "waveform", }; static const char * const iio_modifier_names[] = { @@ -91,6 +92,8 @@ static const char * const iio_modifier_names[] = { [IIO_MOD_NORTH_TRUE] = "from_north_true", [IIO_MOD_NORTH_MAGN_TILT_COMP] = "from_north_magnetic_tilt_comp", [IIO_MOD_NORTH_TRUE_TILT_COMP] = "from_north_true_tilt_comp", + [IIO_MOD_HIGHTIME] = "hightime", + [IIO_MOD_LOWTIME] = "lowtime", }; /* relies on pairs of these shared then separate */ diff --git a/drivers/staging/iio/Documentation/iio_event_monitor.c b/drivers/staging/iio/Documentation/iio_event_monitor.c index 569d6f8..690f261 100644 --- a/drivers/staging/iio/Documentation/iio_event_monitor.c +++ b/drivers/staging/iio/Documentation/iio_event_monitor.c @@ -49,6 +49,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_CCT] = "cct", [IIO_PRESSURE] = "pressure", [IIO_HUMIDITYRELATIVE] = "humidityrelative", + [IIO_WAVEFORM] = "waveform", }; static const char * const iio_ev_type_text[] = { @@ -108,6 +109,7 @@ static bool event_is_known(struct iio_event_data *event) case IIO_CCT: case IIO_PRESSURE: case IIO_HUMIDITYRELATIVE: + case IIO_WAVEFORM: break; default: return false; diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h index 4a2af8a..d3b0af1 100644 --- a/include/linux/iio/types.h +++ b/include/linux/iio/types.h @@ -30,6 +30,7 @@ enum iio_chan_type { IIO_CCT, IIO_PRESSURE, IIO_HUMIDITYRELATIVE, + IIO_WAVEFORM, }; enum iio_modifier { @@ -59,7 +60,9 @@ enum iio_modifier { IIO_MOD_NORTH_MAGN, IIO_MOD_NORTH_TRUE, IIO_MOD_NORTH_MAGN_TILT_COMP, - IIO_MOD_NORTH_TRUE_TILT_COMP + IIO_MOD_NORTH_TRUE_TILT_COMP, + IIO_MOD_HIGHTIME, + IIO_MOD_LOWTIME, }; enum iio_event_type { -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/