Skip to content

Commit

Permalink
Merge tag 'staging-5.2-rc1' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/git/gregkh/staging

Pull staging / IIO driver updates from Greg KH:
 "Here is the big staging and iio driver update for 5.2-rc1.

  Lots of tiny fixes all over the staging and IIO driver trees here,
  along with some new IIO drivers.

  The "counter" subsystem was added in here as well, as it is needed by
  the IIO drivers and subsystem.

  Also we ended up deleting two drivers, making this pull request remove
  a few hundred thousand lines of code, always a nice thing to see. Both
  of the drivers removed have been replaced with "real" drivers in their
  various subsystem directories, and they will be coming to you from
  those locations during this merge window.

  There are some core vt/selection changes in here, that was due to some
  cleanups needed for the speakup fixes. Those have all been acked by
  the various subsystem maintainers (i.e. me), so those are ok.

  We also added a few new drivers, for some odd hardware, giving new
  developers plenty to work on with basic coding style cleanups to come
  in the near future.

  Other than that, nothing unusual here.

  All of these have been in linux-next for a while with no reported
  issues, other than an odd gcc warning for one of the new drivers that
  should be fixed up soon"

[ I fixed up the warning myself  - Linus ]

* tag 'staging-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (663 commits)
  staging: kpc2000: kpc_spi: Fix build error for {read,write}q
  Staging: rtl8192e: Remove extra space before break statement
  Staging: rtl8192u: ieee80211: Fix if-else indentation warning
  Staging: rtl8192u: ieee80211: Fix indentation errors by removing extra spaces
  staging: most: cdev: fix chrdev_region leak in mod_exit
  staging: wlan-ng: Fix improper SPDX comment style
  staging: rtl8192u: ieee80211: Resolve ERROR reported by checkpatch
  staging: vc04_services: bcm2835-camera: Compress two lines into one line
  staging: rtl8723bs: core: Use !x in place of NULL comparison.
  staging: rtl8723bs: core: Prefer using the BIT Macro.
  staging: fieldbus: anybus-s: fix wait_for_completion_timeout return handling
  staging: kpc2000: fix up build problems with readq()
  staging: rtlwifi: move remaining phydm .h files
  staging: rtlwifi: strip down phydm .h files
  staging: rtlwifi: delete the staging driver
  staging: fieldbus: anybus-s: rename bus id field to avoid confusion
  staging: fieldbus: anybus-s: keep device bus id in bus endianness
  Staging: sm750fb: Change *array into *const array
  staging: rtl8192u: ieee80211: Fix spelling mistake
  staging: rtl8192u: ieee80211: Replace bit shifting with BIT macro
  ...
  • Loading branch information
torvalds committed May 7, 2019
2 parents cf482a4 + e2a5be1 commit e0dccbd
Show file tree
Hide file tree
Showing 927 changed files with 22,718 additions and 134,361 deletions.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ Santosh Shilimkar <[email protected]>
Santosh Shilimkar <[email protected]>
Sascha Hauer <[email protected]>
S.Çağlar Onur <[email protected]>
Sean Nyekjaer <[email protected]> <[email protected]>
Sebastian Reichel <[email protected]> <[email protected]>
Sebastian Reichel <[email protected]> <[email protected]>
Shiraz Hashim <[email protected]> <[email protected]>
Expand Down
230 changes: 230 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-counter
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
What: /sys/bus/counter/devices/counterX/countY/count
KernelVersion: 5.2
Contact: [email protected]
Description:
Count data of Count Y represented as a string.

What: /sys/bus/counter/devices/counterX/countY/ceiling
KernelVersion: 5.2
Contact: [email protected]
Description:
Count value ceiling for Count Y. This is the upper limit for the
respective counter.

What: /sys/bus/counter/devices/counterX/countY/floor
KernelVersion: 5.2
Contact: [email protected]
Description:
Count value floor for Count Y. This is the lower limit for the
respective counter.

What: /sys/bus/counter/devices/counterX/countY/count_mode
KernelVersion: 5.2
Contact: [email protected]
Description:
Count mode for channel Y. The ceiling and floor values for
Count Y are used by the count mode where required. The following
count modes are available:

normal:
Counting is continuous in either direction.

range limit:
An upper or lower limit is set, mimicking limit switches
in the mechanical counterpart. The upper limit is set to
the Count Y ceiling value, while the lower limit is set
to the Count Y floor value. The counter freezes at
count = ceiling when counting up, and at count = floor
when counting down. At either of these limits, the
counting is resumed only when the count direction is
reversed.

non-recycle:
The counter is disabled whenever a counter overflow or
underflow takes place. The counter is re-enabled when a
new count value is loaded to the counter via a preset
operation or direct write.

modulo-n:
A count value boundary is set between the Count Y floor
value and the Count Y ceiling value. The counter is
reset to the Count Y floor value at count = ceiling when
counting up, while the counter is set to the Count Y
ceiling value at count = floor when counting down; the
counter does not freeze at the boundary points, but
counts continuously throughout.

What: /sys/bus/counter/devices/counterX/countY/count_mode_available
What: /sys/bus/counter/devices/counterX/countY/error_noise_available
What: /sys/bus/counter/devices/counterX/countY/function_available
What: /sys/bus/counter/devices/counterX/countY/signalZ_action_available
KernelVersion: 5.2
Contact: [email protected]
Description:
Discrete set of available values for the respective Count Y
configuration are listed in this file. Values are delimited by
newline characters.

What: /sys/bus/counter/devices/counterX/countY/direction
KernelVersion: 5.2
Contact: [email protected]
Description:
Read-only attribute that indicates the count direction of Count
Y. Two count directions are available: forward and backward.

Some counter devices are able to determine the direction of
their counting. For example, quadrature encoding counters can
determine the direction of movement by evaluating the leading
phase of the respective A and B quadrature encoding signals.
This attribute exposes such count directions.

What: /sys/bus/counter/devices/counterX/countY/enable
KernelVersion: 5.2
Contact: [email protected]
Description:
Whether channel Y counter is enabled. Valid attribute values are
boolean.

This attribute is intended to serve as a pause/unpause mechanism
for Count Y. Suppose a counter device is used to count the total
movement of a conveyor belt: this attribute allows an operator
to temporarily pause the counter, service the conveyor belt,
and then finally unpause the counter to continue where it had
left off.

What: /sys/bus/counter/devices/counterX/countY/error_noise
KernelVersion: 5.2
Contact: [email protected]
Description:
Read-only attribute that indicates whether excessive noise is
present at the channel Y counter inputs.

What: /sys/bus/counter/devices/counterX/countY/function
KernelVersion: 5.2
Contact: [email protected]
Description:
Count function mode of Count Y; count function evaluation is
triggered by conditions specified by the Count Y signalZ_action
attributes. The following count functions are available:

increase:
Accumulated count is incremented.

decrease:
Accumulated count is decremented.

pulse-direction:
Rising edges on signal A updates the respective count.
The input level of signal B determines direction.

quadrature x1 a:
If direction is forward, rising edges on quadrature pair
signal A updates the respective count; if the direction
is backward, falling edges on quadrature pair signal A
updates the respective count. Quadrature encoding
determines the direction.

quadrature x1 b:
If direction is forward, rising edges on quadrature pair
signal B updates the respective count; if the direction
is backward, falling edges on quadrature pair signal B
updates the respective count. Quadrature encoding
determines the direction.

quadrature x2 a:
Any state transition on quadrature pair signal A updates
the respective count. Quadrature encoding determines the
direction.

quadrature x2 b:
Any state transition on quadrature pair signal B updates
the respective count. Quadrature encoding determines the
direction.

quadrature x4:
Any state transition on either quadrature pair signals
updates the respective count. Quadrature encoding
determines the direction.

What: /sys/bus/counter/devices/counterX/countY/name
KernelVersion: 5.2
Contact: [email protected]
Description:
Read-only attribute that indicates the device-specific name of
Count Y. If possible, this should match the name of the
respective channel as it appears in the device datasheet.

What: /sys/bus/counter/devices/counterX/countY/preset
KernelVersion: 5.2
Contact: [email protected]
Description:
If the counter device supports preset registers -- registers
used to load counter channels to a set count upon device-defined
preset operation trigger events -- the preset count for channel
Y is provided by this attribute.

What: /sys/bus/counter/devices/counterX/countY/preset_enable
KernelVersion: 5.2
Contact: [email protected]
Description:
Whether channel Y counter preset operation is enabled. Valid
attribute values are boolean.

What: /sys/bus/counter/devices/counterX/countY/signalZ_action
KernelVersion: 5.2
Contact: [email protected]
Description:
Action mode of Count Y for Signal Z. This attribute indicates
the condition of Signal Z that triggers the count function
evaluation for Count Y. The following action modes are
available:

none:
Signal does not trigger the count function. In
Pulse-Direction count function mode, this Signal is
evaluated as Direction.

rising edge:
Low state transitions to high state.

falling edge:
High state transitions to low state.

both edges:
Any state transition.

What: /sys/bus/counter/devices/counterX/name
KernelVersion: 5.2
Contact: [email protected]
Description:
Read-only attribute that indicates the device-specific name of
the Counter. This should match the name of the device as it
appears in its respective datasheet.

What: /sys/bus/counter/devices/counterX/num_counts
KernelVersion: 5.2
Contact: [email protected]
Description:
Read-only attribute that indicates the total number of Counts
belonging to the Counter.

What: /sys/bus/counter/devices/counterX/num_signals
KernelVersion: 5.2
Contact: [email protected]
Description:
Read-only attribute that indicates the total number of Signals
belonging to the Counter.

What: /sys/bus/counter/devices/counterX/signalY/signal
KernelVersion: 5.2
Contact: [email protected]
Description:
Signal data of Signal Y represented as a string.

What: /sys/bus/counter/devices/counterX/signalY/name
KernelVersion: 5.2
Contact: [email protected]
Description:
Read-only attribute that indicates the device-specific name of
Signal Y. If possible, this should match the name of the
respective signal as it appears in the device datasheet.
36 changes: 36 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
What: /sys/bus/counter/devices/counterX/signalY/index_polarity
KernelVersion: 5.2
Contact: [email protected]
Description:
Active level of index input Signal Y; irrelevant in
non-synchronous load mode.

What: /sys/bus/counter/devices/counterX/signalY/index_polarity_available
What: /sys/bus/counter/devices/counterX/signalY/synchronous_mode_available
KernelVersion: 5.2
Contact: [email protected]
Description:
Discrete set of available values for the respective Signal Y
configuration are listed in this file.

What: /sys/bus/counter/devices/counterX/signalY/synchronous_mode
KernelVersion: 5.2
Contact: [email protected]
Description:
Configure the counter associated with Signal Y for
non-synchronous or synchronous load mode. Synchronous load mode
cannot be selected in non-quadrature (Pulse-Direction) clock
mode.

non-synchronous:
A logic low level is the active level at this index
input. The index function (as enabled via preset_enable)
is performed directly on the active level of the index
input.

synchronous:
Intended for interfacing with encoder Index output in
quadrature clock mode. The active level is configured
via index_polarity. The index function (as enabled via
preset_enable) is performed synchronously with the
quadrature clock on the active level of the index input.
16 changes: 16 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
What: /sys/bus/counter/devices/counterX/countY/prescaler_available
KernelVersion: 5.2
Contact: [email protected]
Description:
Discrete set of available values for the respective Count Y
configuration are listed in this file. Values are delimited by
newline characters.

What: /sys/bus/counter/devices/counterX/countY/prescaler
KernelVersion: 5.2
Contact: [email protected]
Description:
Configure the prescaler value associated with Count Y.
On the FlexTimer, the counter clock source passes through a
prescaler (i.e. a counter). This acts like a clock
divider.
8 changes: 8 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-iio
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_countY_raw
KernelVersion: 4.10
Contact: [email protected]
Description:
This interface is deprecated; please use the Counter subsystem.

Raw counter device counts from channel Y. For quadrature
counters, multiplication by an available [Y]_scale results in
the counts of a single quadrature signal phase from channel Y.
Expand All @@ -1664,6 +1666,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_indexY_raw
KernelVersion: 4.10
Contact: [email protected]
Description:
This interface is deprecated; please use the Counter subsystem.

Raw counter device index value from channel Y. This attribute
provides an absolute positional reference (e.g. a pulse once per
revolution) which may be used to home positional systems as
Expand All @@ -1673,6 +1677,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_count_count_direction_available
KernelVersion: 4.12
Contact: [email protected]
Description:
This interface is deprecated; please use the Counter subsystem.

A list of possible counting directions which are:
- "up" : counter device is increasing.
- "down": counter device is decreasing.
Expand All @@ -1681,6 +1687,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_countY_count_direction
KernelVersion: 4.12
Contact: [email protected]
Description:
This interface is deprecated; please use the Counter subsystem.

Raw counter device counters direction for channel Y.

What: /sys/bus/iio/devices/iio:deviceX/in_phaseY_raw
Expand Down
Loading

0 comments on commit e0dccbd

Please sign in to comment.