---

yaml
---
r: 339450
b: refs/heads/master
c: 81bcd8b
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f1c64f410e4394ecefadd7a597a7c20368a65fc
+refs/heads/master: 81bcd8b795229c70d7244898efe282846e3b14ce

trunk/Documentation/ABI/testing/sysfs-bus-iio

@@ -189,14 +189,6 @@ Description:
 		A computed peak value based on the sum squared magnitude of
 		the underlying value in the specified directions.
 
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_raw
-KernelVersion:	3.8
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Raw pressure measurement from channel Y. Units after
-		application of scale and offset are kilopascal.
-
 What:		/sys/bus/iio/devices/iio:deviceX/in_accel_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_accel_x_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_accel_y_offset
@@ -205,8 +197,6 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_tempY_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_temp_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_offset
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -236,8 +226,6 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_magn_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_magn_x_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_magn_y_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_magn_z_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_scale
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -257,8 +245,6 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibbias
 What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibbias
 What:		/sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibbias
 What:		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_calibbias
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_calibbias
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -276,8 +262,6 @@ What		/sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibscale
 What		/sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibscale
 what		/sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale
 what		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_calibscale
-What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_calibscale
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -291,8 +275,6 @@ What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available
 What:		/sys/.../iio:deviceX/out_voltageX_scale_available
 What:		/sys/.../iio:deviceX/out_altvoltageX_scale_available
 What:		/sys/.../iio:deviceX/in_capacitance_scale_available
-What:		/sys/.../iio:deviceX/in_pressure_scale_available
-What:		/sys/.../iio:deviceX/in_pressureY_scale_available
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -712,8 +694,6 @@ What:		/sys/.../buffer/scan_elements/in_voltageY_en
 What:		/sys/.../buffer/scan_elements/in_voltageY-voltageZ_en
 What:		/sys/.../buffer/scan_elements/in_incli_x_en
 What:		/sys/.../buffer/scan_elements/in_incli_y_en
-What:		/sys/.../buffer/scan_elements/in_pressureY_en
-What:		/sys/.../buffer/scan_elements/in_pressure_en
 KernelVersion:	2.6.37
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -727,8 +707,6 @@ What:		/sys/.../buffer/scan_elements/in_voltageY_type
 What:		/sys/.../buffer/scan_elements/in_voltage_type
 What:		/sys/.../buffer/scan_elements/in_voltageY_supply_type
 What:		/sys/.../buffer/scan_elements/in_timestamp_type
-What:		/sys/.../buffer/scan_elements/in_pressureY_type
-What:		/sys/.../buffer/scan_elements/in_pressure_type
 KernelVersion:	2.6.37
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -773,8 +751,6 @@ What:		/sys/.../buffer/scan_elements/in_magn_z_index
 What:		/sys/.../buffer/scan_elements/in_incli_x_index
 What:		/sys/.../buffer/scan_elements/in_incli_y_index
 What:		/sys/.../buffer/scan_elements/in_timestamp_index
-What:		/sys/.../buffer/scan_elements/in_pressureY_index
-What:		/sys/.../buffer/scan_elements/in_pressure_index
 KernelVersion:	2.6.37
 Contact:	linux-iio@vger.kernel.org
 Description:

trunk/Documentation/ABI/testing/sysfs-class-devfreq

@@ -11,24 +11,23 @@ What:		/sys/class/devfreq/.../governor
 Date:		September 2011
 Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
-		The /sys/class/devfreq/.../governor show or set the name of the
+		The /sys/class/devfreq/.../governor shows the name of the
 		governor used by the corresponding devfreq object.
 
 What:		/sys/class/devfreq/.../cur_freq
 Date:		September 2011
 Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
 		The /sys/class/devfreq/.../cur_freq shows the current
-		frequency of the corresponding devfreq object. Same as
-		target_freq when get_cur_freq() is not implemented by
-		devfreq driver.
+		frequency of the corresponding devfreq object.
 
-What:		/sys/class/devfreq/.../target_freq
-Date:		September 2012
-Contact:	Rajagopal Venkat <rajagopal.venkat@linaro.org>
+What:		/sys/class/devfreq/.../central_polling
+Date:		September 2011
+Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
-		The /sys/class/devfreq/.../target_freq shows the next governor
-		predicted target frequency of the corresponding devfreq object.
+		The /sys/class/devfreq/.../central_polling shows whether
+		the devfreq ojbect is using devfreq-provided central
+		polling mechanism or not.
 
 What:		/sys/class/devfreq/.../polling_interval
 Date:		September 2011
@@ -44,37 +43,10 @@ Description:
 		(/sys/class/devfreq/.../central_polling is 0), this value
 		may be useless.
 
-What:		/sys/class/devfreq/.../trans_stat
-Date:		October 2012
-Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
-Descrtiption:
-		This ABI shows the statistics of devfreq behavior on a
-		specific device. It shows the time spent in each state and
-		the number of transitions between states.
-		In order to activate this ABI, the devfreq target device
-		driver should provide the list of available frequencies
-		with its profile.
-
 What:		/sys/class/devfreq/.../userspace/set_freq
 Date:		September 2011
 Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
 		The /sys/class/devfreq/.../userspace/set_freq shows and
 		sets the requested frequency for the devfreq object if
 		userspace governor is in effect.
-
-What:		/sys/class/devfreq/.../available_frequencies
-Date:		October 2012
-Contact:	Nishanth Menon <nm@ti.com>
-Description:
-		The /sys/class/devfreq/.../available_frequencies shows
-		the available frequencies of the corresponding devfreq object.
-		This is a snapshot of available frequencies and not limited
-		by the min/max frequency restrictions.
-
-What:		/sys/class/devfreq/.../available_governors
-Date:		October 2012
-Contact:	Nishanth Menon <nm@ti.com>
-Description:
-		The /sys/class/devfreq/.../available_governors shows
-		currently available governors in the system.

trunk/Documentation/ABI/testing/sysfs-devices-power

@@ -204,34 +204,3 @@ Description:
 
 		This attribute has no effect on system-wide suspend/resume and
 		hibernation.
-
-What:		/sys/devices/.../power/pm_qos_no_power_off
-Date:		September 2012
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../power/pm_qos_no_power_off attribute
-		is used for manipulating the PM QoS "no power off" flag.  If
-		set, this flag indicates to the kernel that power should not
-		be removed entirely from the device.
-
-		Not all drivers support this attribute.  If it isn't supported,
-		it is not present.
-
-		This attribute has no effect on system-wide suspend/resume and
-		hibernation.
-
-What:		/sys/devices/.../power/pm_qos_remote_wakeup
-Date:		September 2012
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../power/pm_qos_remote_wakeup attribute
-		is used for manipulating the PM QoS "remote wakeup required"
-		flag.  If set, this flag indicates to the kernel that the
-		device is a source of user events that have to be signaled from
-		its low-power states.
-
-		Not all drivers support this attribute.  If it isn't supported,
-		it is not present.
-
-		This attribute has no effect on system-wide suspend/resume and
-		hibernation.

trunk/Documentation/ABI/testing/sysfs-tty

@@ -26,115 +26,3 @@ Description:
 		 UART port in serial_core, that is bound to TTY like ttyS0.
 		 uartclk = 16 * baud_base
 
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/type
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Shows the current tty type for this port.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/line
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Shows the current tty line number for this port.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/port
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Shows the current tty port I/O address for this port.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/irq
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Shows the current primary interrupt for this port.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/flags
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Show the tty port status flags for this port.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/xmit_fifo_size
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Show the transmit FIFO size for this port.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/close_delay
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Show the closing delay time for this port in ms.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/closing_wait
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Show the close wait time for this port in ms.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/custom_divisor
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Show the custom divisor if any that is set on this port.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/io_type
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Show the I/O type that is to be used with the iomem base
-		 address.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/iomem_base
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 The I/O memory base for this port.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.
-
-What:		/sys/class/tty/ttyS0/iomem_reg_shift
-Date:		October 2012
-Contact:	Alan Cox <alan@linux.intel.com>
-Description:
-		 Show the register shift indicating the spacing to be used
-		 for accesses on this iomem address.
-
-		 These sysfs values expose the TIOCGSERIAL interface via
-		 sysfs rather than via ioctls.

trunk/Documentation/DocBook/gadget.tmpl

@@ -671,7 +671,7 @@ than a kernel driver.
 <para>There's a USB Mass Storage class driver, which provides
 a different solution for interoperability with systems such
 as MS-Windows and MacOS.
-That <emphasis>Mass Storage</emphasis> driver uses a
+That <emphasis>File-backed Storage</emphasis> driver uses a
 file or block device as backing store for a drive,
 like the <filename>loop</filename> driver.
 The USB host uses the BBB, CB, or CBI versions of the mass

trunk/Documentation/DocBook/uio-howto.tmpl

@@ -719,62 +719,6 @@ framework to set up sysfs files for this region. Simply leave it alone.
 	</para>
 </sect1>
 
-<sect1 id="using uio_dmem_genirq">
-<title>Using uio_dmem_genirq for platform devices</title>
-	<para>
-	In addition to statically allocated memory ranges, they may also be
-	a desire to use dynamically allocated regions in a user space driver.
-	In particular, being able to access memory made available through the
-	dma-mapping API, may be particularly useful.  The
-	<varname>uio_dmem_genirq</varname> driver provides a way to accomplish
-	this.
-	</para>
-	<para>
-	This driver is used in a similar manner to the
-	<varname>"uio_pdrv_genirq"</varname> driver with respect to interrupt
-	configuration and handling.
-	</para>
-	<para>
-	Set the <varname>.name</varname> element of
-	<varname>struct platform_device</varname> to
-	<varname>"uio_dmem_genirq"</varname> to use this driver.
-	</para>
-	<para>
-	When using this driver, fill in the <varname>.platform_data</varname>
-	element of <varname>struct platform_device</varname>, which is of type
-	<varname>struct uio_dmem_genirq_pdata</varname> and which contains the
-	following elements:
-	</para>
-	<itemizedlist>
-	<listitem><varname>struct uio_info uioinfo</varname>: The same
-	structure used as the  <varname>uio_pdrv_genirq</varname> platform
-	data</listitem>
-	<listitem><varname>unsigned int *dynamic_region_sizes</varname>:
-	Pointer to list of sizes of dynamic memory regions to be mapped into
-	user space.
-	</listitem>
-	<listitem><varname>unsigned int num_dynamic_regions</varname>:
-	Number of elements in <varname>dynamic_region_sizes</varname> array.
-	</listitem>
-	</itemizedlist>
-	<para>
-	The dynamic regions defined in the platform data will be appended to
-	the <varname> mem[] </varname> array after the platform device
-	resources, which implies that the total number of static and dynamic
-	memory regions cannot exceed <varname>MAX_UIO_MAPS</varname>.
-	</para>
-	<para>
-	The dynamic memory regions will be allocated when the UIO device file,
-	<varname>/dev/uioX</varname> is opened.
-	Simiar to static memory resources, the memory region information for
-	dynamic regions is then visible via sysfs at
-	<varname>/sys/class/uio/uioX/maps/mapY/*</varname>.
-	The dynmaic memory regions will be freed when the UIO device file is
-	closed. When no processes are holding the device file open, the address
-	returned to userspace is ~0.
-	</para>
-</sect1>
-
 </chapter>
 
 <chapter id="userspace_driver" xreflabel="Writing a driver in user space">