diff options
author | David S. Miller <davem@davemloft.net> | 2014-08-23 14:12:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-23 14:12:08 -0400 |
commit | f9474ddfaa009ead12bba44fa8fd49dc4536a124 (patch) | |
tree | a1738a74ac909d84cc80af674d7c0b78af10a413 /Documentation | |
parent | 989e04c5bc3ff77d65e1f0d87bf7904dfa30d41c (diff) | |
parent | a45e92a599e77ee6a850eabdd0141633fde03915 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pulling to get some TIPC fixes that a net-next series depends
upon.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DocBook/drm.tmpl | 2 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | 12 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/pci/designware-pcie.txt | 4 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/pci/ti-pci.txt | 59 | ||||
-rw-r--r-- | Documentation/filesystems/Locking | 6 | ||||
-rw-r--r-- | Documentation/laptops/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/laptops/toshiba_haps.txt | 76 |
7 files changed, 154 insertions, 7 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 1d3756d3176c..bacefc5b222e 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
@@ -315,7 +315,7 @@ char *date;</synopsis> | |||
315 | <function>drm_dev_unregister()</function> followed by a call to | 315 | <function>drm_dev_unregister()</function> followed by a call to |
316 | <function>drm_dev_unref()</function>. | 316 | <function>drm_dev_unref()</function>. |
317 | </para> | 317 | </para> |
318 | !Edrivers/gpu/drm/drm_stub.c | 318 | !Edrivers/gpu/drm/drm_drv.c |
319 | </sect2> | 319 | </sect2> |
320 | <sect2> | 320 | <sect2> |
321 | <title>Driver Load</title> | 321 | <title>Driver Load</title> |
diff --git a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt index 1486497a24c1..ce6a1a072028 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | |||
@@ -4,11 +4,13 @@ Specifying interrupt information for devices | |||
4 | 1) Interrupt client nodes | 4 | 1) Interrupt client nodes |
5 | ------------------------- | 5 | ------------------------- |
6 | 6 | ||
7 | Nodes that describe devices which generate interrupts must contain an either an | 7 | Nodes that describe devices which generate interrupts must contain an |
8 | "interrupts" property or an "interrupts-extended" property. These properties | 8 | "interrupts" property, an "interrupts-extended" property, or both. If both are |
9 | contain a list of interrupt specifiers, one per output interrupt. The format of | 9 | present, the latter should take precedence; the former may be provided simply |
10 | the interrupt specifier is determined by the interrupt controller to which the | 10 | for compatibility with software that does not recognize the latter. These |
11 | interrupts are routed; see section 2 below for details. | 11 | properties contain a list of interrupt specifiers, one per output interrupt. The |
12 | format of the interrupt specifier is determined by the interrupt controller to | ||
13 | which the interrupts are routed; see section 2 below for details. | ||
12 | 14 | ||
13 | Example: | 15 | Example: |
14 | interrupt-parent = <&intc1>; | 16 | interrupt-parent = <&intc1>; |
diff --git a/Documentation/devicetree/bindings/pci/designware-pcie.txt b/Documentation/devicetree/bindings/pci/designware-pcie.txt index d0d15ee42834..ed0d9b9fff2b 100644 --- a/Documentation/devicetree/bindings/pci/designware-pcie.txt +++ b/Documentation/devicetree/bindings/pci/designware-pcie.txt | |||
@@ -2,6 +2,10 @@ | |||
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible: should contain "snps,dw-pcie" to identify the core. | 4 | - compatible: should contain "snps,dw-pcie" to identify the core. |
5 | - reg: Should contain the configuration address space. | ||
6 | - reg-names: Must be "config" for the PCIe configuration space. | ||
7 | (The old way of getting the configuration address space from "ranges" | ||
8 | is deprecated and should be avoided.) | ||
5 | - #address-cells: set to <3> | 9 | - #address-cells: set to <3> |
6 | - #size-cells: set to <2> | 10 | - #size-cells: set to <2> |
7 | - device_type: set to "pci" | 11 | - device_type: set to "pci" |
diff --git a/Documentation/devicetree/bindings/pci/ti-pci.txt b/Documentation/devicetree/bindings/pci/ti-pci.txt new file mode 100644 index 000000000000..3d217911b313 --- /dev/null +++ b/Documentation/devicetree/bindings/pci/ti-pci.txt | |||
@@ -0,0 +1,59 @@ | |||
1 | TI PCI Controllers | ||
2 | |||
3 | PCIe Designware Controller | ||
4 | - compatible: Should be "ti,dra7-pcie"" | ||
5 | - reg : Two register ranges as listed in the reg-names property | ||
6 | - reg-names : The first entry must be "ti-conf" for the TI specific registers | ||
7 | The second entry must be "rc-dbics" for the designware pcie | ||
8 | registers | ||
9 | The third entry must be "config" for the PCIe configuration space | ||
10 | - phys : list of PHY specifiers (used by generic PHY framework) | ||
11 | - phy-names : must be "pcie-phy0", "pcie-phy1", "pcie-phyN".. based on the | ||
12 | number of PHYs as specified in *phys* property. | ||
13 | - ti,hwmods : Name of the hwmod associated to the pcie, "pcie<X>", | ||
14 | where <X> is the instance number of the pcie from the HW spec. | ||
15 | - interrupts : Two interrupt entries must be specified. The first one is for | ||
16 | main interrupt line and the second for MSI interrupt line. | ||
17 | - #address-cells, | ||
18 | #size-cells, | ||
19 | #interrupt-cells, | ||
20 | device_type, | ||
21 | ranges, | ||
22 | num-lanes, | ||
23 | interrupt-map-mask, | ||
24 | interrupt-map : as specified in ../designware-pcie.txt | ||
25 | |||
26 | Example: | ||
27 | axi { | ||
28 | compatible = "simple-bus"; | ||
29 | #size-cells = <1>; | ||
30 | #address-cells = <1>; | ||
31 | ranges = <0x51000000 0x51000000 0x3000 | ||
32 | 0x0 0x20000000 0x10000000>; | ||
33 | pcie@51000000 { | ||
34 | compatible = "ti,dra7-pcie"; | ||
35 | reg = <0x51000000 0x2000>, <0x51002000 0x14c>, <0x1000 0x2000>; | ||
36 | reg-names = "rc_dbics", "ti_conf", "config"; | ||
37 | interrupts = <0 232 0x4>, <0 233 0x4>; | ||
38 | #address-cells = <3>; | ||
39 | #size-cells = <2>; | ||
40 | device_type = "pci"; | ||
41 | ranges = <0x81000000 0 0 0x03000 0 0x00010000 | ||
42 | 0x82000000 0 0x20013000 0x13000 0 0xffed000>; | ||
43 | #interrupt-cells = <1>; | ||
44 | num-lanes = <1>; | ||
45 | ti,hwmods = "pcie1"; | ||
46 | phys = <&pcie1_phy>; | ||
47 | phy-names = "pcie-phy0"; | ||
48 | interrupt-map-mask = <0 0 0 7>; | ||
49 | interrupt-map = <0 0 0 1 &pcie_intc 1>, | ||
50 | <0 0 0 2 &pcie_intc 2>, | ||
51 | <0 0 0 3 &pcie_intc 3>, | ||
52 | <0 0 0 4 &pcie_intc 4>; | ||
53 | pcie_intc: interrupt-controller { | ||
54 | interrupt-controller; | ||
55 | #address-cells = <0>; | ||
56 | #interrupt-cells = <1>; | ||
57 | }; | ||
58 | }; | ||
59 | }; | ||
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index b18dd1779029..f1997e9da61f 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
@@ -349,7 +349,11 @@ prototypes: | |||
349 | locking rules: | 349 | locking rules: |
350 | inode->i_lock may block | 350 | inode->i_lock may block |
351 | fl_copy_lock: yes no | 351 | fl_copy_lock: yes no |
352 | fl_release_private: maybe no | 352 | fl_release_private: maybe maybe[1] |
353 | |||
354 | [1]: ->fl_release_private for flock or POSIX locks is currently allowed | ||
355 | to block. Leases however can still be freed while the i_lock is held and | ||
356 | so fl_release_private called on a lease should not block. | ||
353 | 357 | ||
354 | ----------------------- lock_manager_operations --------------------------- | 358 | ----------------------- lock_manager_operations --------------------------- |
355 | prototypes: | 359 | prototypes: |
diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX index d399ae1fc724..a3b4f209e562 100644 --- a/Documentation/laptops/00-INDEX +++ b/Documentation/laptops/00-INDEX | |||
@@ -18,3 +18,5 @@ sonypi.txt | |||
18 | - info on Linux Sony Programmable I/O Device support. | 18 | - info on Linux Sony Programmable I/O Device support. |
19 | thinkpad-acpi.txt | 19 | thinkpad-acpi.txt |
20 | - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver. | 20 | - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver. |
21 | toshiba_haps.txt | ||
22 | - information on the Toshiba HDD Active Protection Sensor driver. | ||
diff --git a/Documentation/laptops/toshiba_haps.txt b/Documentation/laptops/toshiba_haps.txt new file mode 100644 index 000000000000..11dbcfdc9e7a --- /dev/null +++ b/Documentation/laptops/toshiba_haps.txt | |||
@@ -0,0 +1,76 @@ | |||
1 | Kernel driver toshiba_haps | ||
2 | Toshiba HDD Active Protection Sensor | ||
3 | ==================================== | ||
4 | |||
5 | Author: Azael Avalos <coproscefalo@gmail.com> | ||
6 | |||
7 | |||
8 | 0. Contents | ||
9 | ----------- | ||
10 | |||
11 | 1. Description | ||
12 | 2. Interface | ||
13 | 3. Accelerometer axes | ||
14 | 4. Supported devices | ||
15 | 5. Usage | ||
16 | |||
17 | |||
18 | 1. Description | ||
19 | -------------- | ||
20 | |||
21 | This driver provides support for the accelerometer found in various Toshiba | ||
22 | laptops, being called "Toshiba HDD Protection - Shock Sensor" officialy, | ||
23 | and detects laptops automatically with this device. | ||
24 | On Windows, Toshiba provided software monitors this device and provides | ||
25 | automatic HDD protection (head unload) on sudden moves or harsh vibrations, | ||
26 | however, this driver only provides a notification via a sysfs file to let | ||
27 | userspace tools or daemons act accordingly, as well as providing a sysfs | ||
28 | file to set the desired protection level or sensor sensibility. | ||
29 | |||
30 | |||
31 | 2. Interface | ||
32 | ------------ | ||
33 | |||
34 | This device comes with 3 methods: | ||
35 | _STA - Checks existence of the device, returning Zero if the device does not | ||
36 | exists or is not supported. | ||
37 | PTLV - Sets the desired protection level. | ||
38 | RSSS - Shuts down the HDD protection interface for a few seconds, | ||
39 | then restores normal operation. | ||
40 | |||
41 | Note: | ||
42 | The presence of Solid State Drives (SSD) can make this driver to fail loading, | ||
43 | given the fact that such drives have no movable parts, and thus, not requiring | ||
44 | any "protection" as well as failing during the evaluation of the _STA method | ||
45 | found under this device. | ||
46 | |||
47 | |||
48 | 3. Accelerometer axes | ||
49 | --------------------- | ||
50 | |||
51 | This device does not report any axes, however, to query the sensor position | ||
52 | a couple HCI (Hardware Configuration Interface) calls (0x6D and 0xA6) are | ||
53 | provided to query such information, handled by the kernel module toshiba_acpi | ||
54 | since kernel version 3.15. | ||
55 | |||
56 | |||
57 | 4. Supported devices | ||
58 | -------------------- | ||
59 | |||
60 | This driver binds itself to the ACPI device TOS620A, and any Toshiba laptop | ||
61 | with this device is supported, given the fact that they have the presence of | ||
62 | conventional HDD and not only SSD, or a combination of both HDD and SSD. | ||
63 | |||
64 | |||
65 | 5. Usage | ||
66 | -------- | ||
67 | |||
68 | The sysfs files under /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS620A:00/ are: | ||
69 | protection_level - The protection_level is readable and writeable, and | ||
70 | provides a way to let userspace query the current protection | ||
71 | level, as well as set the desired protection level, the | ||
72 | available protection levels are: | ||
73 | 0 - Disabled | 1 - Low | 2 - Medium | 3 - High | ||
74 | reset_protection - The reset_protection entry is writeable only, being "1" | ||
75 | the only parameter it accepts, it is used to trigger | ||
76 | a reset of the protection interface. | ||