From: Greg Kroah-Hartman Date: Wed, 13 Jun 2012 23:57:09 +0000 (-0700) Subject: Merge branch 'staging-linus' into staging-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=89a86a2da30a6a90dda719874092905cd762b7ef;p=linux-beck.git Merge branch 'staging-linus' into staging-next We need this for the pstore fixes that went into the staging-linus branch, so that things apply properly for the pstore/android code merge. Signed-off-by: Greg Kroah-Hartman --- 89a86a2da30a6a90dda719874092905cd762b7ef diff --cc Documentation/ABI/testing/sysfs-bus-iio index e0f68f6a0e2a,cfedf63cce15..05449c68952c --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio @@@ -343,11 -355,28 +356,29 @@@ KernelVersion: 2.6.3 Contact: linux-iio@vger.kernel.org Description: Writing 1 causes output Y to enter the power down mode specified - by the corresponding outY_powerdown_mode. Clearing returns to - normal operation. Y may be suppressed if all outputs are - controlled together. + by the corresponding outY_powerdown_mode. DAC output stage is + disconnected from the amplifier. Clearing returns to normal + operation. Y may be suppressed if all outputs are controlled + together. + What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency + KernelVersion: 3.4.0 + Contact: linux-iio@vger.kernel.org + Description: + Output frequency for channel Y in Hz. The number must always be + specified and unique if the output corresponds to a single + channel. + + What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase + KernelVersion: 3.4.0 + Contact: linux-iio@vger.kernel.org + Description: + Phase in radians of one frequency/clock output Y + (out_altvoltageY) relative to another frequency/clock output + (out_altvoltageZ) of the device X. The number must always be + specified and unique if the output corresponds to a single + channel. + What: /sys/bus/iio/devices/iio:deviceX/events KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org