7 files changed, 84 insertions, 11 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci
index 34f51100f02..dff1f48d252 100644
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
@@ -210,3 +210,15 @@ Users:
                 firmware assigned instance number of the PCI
                 device that can help in understanding the firmware
                 intended order of the PCI device.
+
+What:           /sys/bus/pci/devices/.../d3cold_allowed
+Date:           July 2012
+Contact:        Huang Ying <ying.huang@intel.com>
+Description:
+                d3cold_allowed is bit to control whether the corresponding PCI
+                device can be put into D3Cold state.  If it is cleared, the
+                device will never be put into D3Cold state.  If it is set, the
+                device may be put into D3Cold state if other requirements are
+                satisfied too.  Reading this attribute will show the current
+                value of d3cold_allowed bit.  Writing this attribute will set
+                the value of d3cold_allowed bit.
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index 5f75f8f7df3..b6fbe514a86 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -220,3 +220,10 @@ Description:
                 If the device doesn't support LTM, the file will read "no".
                 The file will be present for all speeds of USB devices, and will
                 always read "no" for USB 1.1 and USB 2.0 devices.
+
+What:           /sys/bus/usb/devices/.../(hub interface)/portX
+Date:           August 2012
+Contact:        Lan Tianyu <tianyu.lan@intel.com>
+Description:
+                The /sys/bus/usb/devices/.../(hub interface)/portX
+                is usb port device's sysfs directory.
diff --git a/Documentation/ABI/testing/sysfs-class-extcon b/Documentation/ABI/testing/sysfs-class-extcon
index 20ab361bd8c..57a72623291 100644
--- a/Documentation/ABI/testing/sysfs-class-extcon
+++ b/Documentation/ABI/testing/sysfs-class-extcon
@@ -13,7 +13,7 @@ Description:
                 accessory cables have such capability. For example,
                 the 30-pin port of Nuri board (/arch/arm/mach-exynos)
                 may have both HDMI and Charger attached, or analog audio,
-                video, and USB cables attached simulteneously.
+                video, and USB cables attached simultaneously.
 
                 If there are cables mutually exclusive with each other,
                 such binary relations may be expressed with extcon_dev's
@@ -35,7 +35,7 @@ Description:
                 The /sys/class/extcon/.../state shows and stores the cable
                 attach/detach information of the corresponding extcon object.
                 If the extcon object has an optional callback "show_state"
-                defined, the showing function is overriden with the optional
+                defined, the showing function is overridden with the optional
                 callback.
 
                 If the default callback for showing function is used, the
@@ -46,19 +46,19 @@ Description:
                 TA=1
                 EAR_JACK=0
                 #
-                In this example, the extcon device have USB_OTG and TA
+                In this example, the extcon device has USB_OTG and TA
                 cables attached and HDMI and EAR_JACK cables detached.
 
                 In order to update the state of an extcon device, enter a hex
-                state number starting with 0x.
-                 echo 0xHEX > state
+                state number starting with 0x:
+                # echo 0xHEX > state
 
-                This updates the whole state of the extcon dev.
+                This updates the whole state of the extcon device.
                 Inputs of all the methods are required to meet the
-                mutually_exclusive contidions if they exist.
+                mutually_exclusive conditions if they exist.
 
                 It is recommended to use this "global" state interface if
-                you need to enter the value atomically. The later state
+                you need to set the value atomically. The later state
                 interface associated with each cable cannot update
                 multiple cable states of an extcon device simultaneously.
 
@@ -73,7 +73,7 @@ What:		/sys/class/extcon/.../cable.x/state
 Date:           February 2012
 Contact:        MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
-                The /sys/class/extcon/.../cable.x/name shows and stores the
+                The /sys/class/extcon/.../cable.x/state shows and stores the
                 state of cable "x" (integer between 0 and 31) of an extcon
                 device. The state value is either 0 (detached) or 1
                 (attached).
@@ -83,8 +83,8 @@ Date:		December 2011
 Contact:        MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
                 Shows the relations of mutually exclusiveness. For example,
-                if the mutually_exclusive array of extcon_dev is
-                {0x3, 0x5, 0xC, 0x0}, the, the output is:
+                if the mutually_exclusive array of extcon device is
+                {0x3, 0x5, 0xC, 0x0}, then the output is:
                 # ls mutually_exclusive/
                 0x3
                 0x5
diff --git a/Documentation/ABI/testing/sysfs-class-regulator b/Documentation/ABI/testing/sysfs-class-regulator
index e091fa87379..bc578bc6062 100644
--- a/Documentation/ABI/testing/sysfs-class-regulator
+++ b/Documentation/ABI/testing/sysfs-class-regulator
@@ -349,3 +349,24 @@ Description:
 
                 This will be one of the same strings reported by
                 the "state" attribute.
+
+What:           /sys/class/regulator/.../bypass
+Date:           September 2012
+KernelVersion:  3.7
+Contact:        Mark Brown <broonie@opensource.wolfsonmicro.com>
+Description:
+                Some regulator directories will contain a field called
+                bypass.  This indicates if the device is in bypass mode.
+
+                This will be one of the following strings:
+
+                'enabled'
+                'disabled'
+                'unknown'
+
+                'enabled' means the regulator is in bypass mode.
+
+                'disabled' means that the regulator is regulating.
+
+                'unknown' means software cannot determine the state, or
+                the reported state is invalid.
diff --git a/Documentation/ABI/testing/sysfs-driver-wacom b/Documentation/ABI/testing/sysfs-driver-wacom
index 8d55a83d692..7fc781048b7 100644
--- a/Documentation/ABI/testing/sysfs-driver-wacom
+++ b/Documentation/ABI/testing/sysfs-driver-wacom
@@ -1,3 +1,16 @@
+WWhat:          /sys/class/hidraw/hidraw*/device/oled*_img
+Date:           June 2012
+Contact:        linux-bluetooth@vger.kernel.org
+Description:
+                The /sys/class/hidraw/hidraw*/device/oled*_img files control
+                OLED mocro displays on Intuos4 Wireless tablet. Accepted image
+                has to contain 256 bytes (64x32 px 1 bit colour). The format
+                is the same as PBM image 62x32px without header (64 bits per
+                horizontal line, 32 lines). An example of setting OLED No. 0:
+                dd bs=256 count=1 if=img_file of=[path to oled0_img]/oled0_img
+                The attribute is read only and no local copy of the image is
+                stored.
+
 What:           /sys/class/hidraw/hidraw*/device/speed
 Date:           April 2010
 Kernel Version: 2.6.35
diff --git a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
index 814b01354c4..b31e782bd98 100644
--- a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
@@ -5,4 +5,15 @@ Contact:	"Ike Panhc <ike.pan@canonical.com>"
 Description:
                 Control the power of camera module. 1 means on, 0 means off.
 
+What:           /sys/devices/platform/ideapad/fan_mode
+Date:           June 2012
+KernelVersion:  3.6
+Contact:        "Maxim Mikityanskiy <maxtram95@gmail.com>"
+Description:
+                Change fan mode
+                There are four available modes:
+                        * 0 -> Super Silent Mode
+                        * 1 -> Standard Mode
+                        * 2 -> Dust Cleaning
+                        * 4 -> Efficient Thermal Dissipation Mode
 
diff --git a/Documentation/ABI/testing/sysfs-tty b/Documentation/ABI/testing/sysfs-tty
index b138b663bf5..0c430150d92 100644
--- a/Documentation/ABI/testing/sysfs-tty
+++ b/Documentation/ABI/testing/sysfs-tty
@@ -17,3 +17,12 @@ Description:
                  device, like 'tty1'.
                  The file supports poll() to detect virtual
                  console switches.
+
+What:           /sys/class/tty/ttyS0/uartclk
+Date:           Sep 2012
+Contact:        Tomas Hlavacek <tmshlvck@gmail.com>
+Description:
+                 Shows the current uartclk value associated with the
+                 UART port in serial_core, that is bound to TTY like ttyS0.
+                 uartclk = 16 * baud_base
+