diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/ABI/testing/pstore | 12 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-fs-pstore | 7 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/hwmon/ads1015.txt | 73 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/open-pic.txt | 98 | ||||
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 19 | ||||
-rw-r--r-- | Documentation/filesystems/xfs-delayed-logging-design.txt | 7 | ||||
-rw-r--r-- | Documentation/hwmon/ads1015 | 72 | ||||
-rw-r--r-- | Documentation/hwmon/lm75 | 5 | ||||
-rw-r--r-- | Documentation/hwmon/sch5627 | 22 | ||||
-rw-r--r-- | Documentation/hwmon/w83795 | 127 | ||||
-rw-r--r-- | Documentation/i2c/busses/i2c-i801 | 3 | ||||
-rw-r--r-- | Documentation/i2c/instantiating-devices | 2 | ||||
-rw-r--r-- | Documentation/i2c/upgrading-clients | 18 | ||||
-rw-r--r-- | Documentation/kbuild/kbuild.txt | 5 | ||||
-rw-r--r-- | Documentation/laptops/hpfall.c (renamed from Documentation/hwmon/hpfall.c) | 0 | ||||
-rw-r--r-- | Documentation/misc-devices/lis3lv02d (renamed from Documentation/hwmon/lis3lv02d) | 4 | ||||
-rw-r--r-- | Documentation/video4linux/Zoran | 2 |
17 files changed, 435 insertions, 41 deletions
diff --git a/Documentation/ABI/testing/pstore b/Documentation/ABI/testing/pstore index f1fb2a004264..ddf451ee2a08 100644 --- a/Documentation/ABI/testing/pstore +++ b/Documentation/ABI/testing/pstore | |||
@@ -1,6 +1,6 @@ | |||
1 | Where: /dev/pstore/... | 1 | Where: /dev/pstore/... |
2 | Date: January 2011 | 2 | Date: March 2011 |
3 | Kernel Version: 2.6.38 | 3 | Kernel Version: 2.6.39 |
4 | Contact: tony.luck@intel.com | 4 | Contact: tony.luck@intel.com |
5 | Description: Generic interface to platform dependent persistent storage. | 5 | Description: Generic interface to platform dependent persistent storage. |
6 | 6 | ||
@@ -11,7 +11,7 @@ Description: Generic interface to platform dependent persistent storage. | |||
11 | of the console log is captured, but other interesting | 11 | of the console log is captured, but other interesting |
12 | data can also be saved. | 12 | data can also be saved. |
13 | 13 | ||
14 | # mount -t pstore - /dev/pstore | 14 | # mount -t pstore -o kmsg_bytes=8000 - /dev/pstore |
15 | 15 | ||
16 | $ ls -l /dev/pstore | 16 | $ ls -l /dev/pstore |
17 | total 0 | 17 | total 0 |
@@ -33,3 +33,9 @@ Description: Generic interface to platform dependent persistent storage. | |||
33 | will be saved elsewhere and erased from persistent store | 33 | will be saved elsewhere and erased from persistent store |
34 | soon after boot to free up space ready for the next | 34 | soon after boot to free up space ready for the next |
35 | catastrophe. | 35 | catastrophe. |
36 | |||
37 | The 'kmsg_bytes' mount option changes the target amount of | ||
38 | data saved on each oops/panic. Pstore saves (possibly | ||
39 | multiple) files based on the record size of the underlying | ||
40 | persistent storage until at least this amount is reached. | ||
41 | Default is 10 Kbytes. | ||
diff --git a/Documentation/ABI/testing/sysfs-fs-pstore b/Documentation/ABI/testing/sysfs-fs-pstore deleted file mode 100644 index 8e659d854805..000000000000 --- a/Documentation/ABI/testing/sysfs-fs-pstore +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | What: /sys/fs/pstore/kmsg_bytes | ||
2 | Date: January 2011 | ||
3 | Kernel Version: 2.6.38 | ||
4 | Contact: "Tony Luck" <tony.luck@intel.com> | ||
5 | Description: | ||
6 | Controls amount of console log that will be saved | ||
7 | to persistent store on oops/panic. | ||
diff --git a/Documentation/devicetree/bindings/hwmon/ads1015.txt b/Documentation/devicetree/bindings/hwmon/ads1015.txt new file mode 100644 index 000000000000..918a507d1159 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/ads1015.txt | |||
@@ -0,0 +1,73 @@ | |||
1 | ADS1015 (I2C) | ||
2 | |||
3 | This device is a 12-bit A-D converter with 4 inputs. | ||
4 | |||
5 | The inputs can be used single ended or in certain differential combinations. | ||
6 | |||
7 | For configuration all possible combinations are mapped to 8 channels: | ||
8 | 0: Voltage over AIN0 and AIN1. | ||
9 | 1: Voltage over AIN0 and AIN3. | ||
10 | 2: Voltage over AIN1 and AIN3. | ||
11 | 3: Voltage over AIN2 and AIN3. | ||
12 | 4: Voltage over AIN0 and GND. | ||
13 | 5: Voltage over AIN1 and GND. | ||
14 | 6: Voltage over AIN2 and GND. | ||
15 | 7: Voltage over AIN3 and GND. | ||
16 | |||
17 | Each channel can be configured individually: | ||
18 | - pga is the programmable gain amplifier (values are full scale) | ||
19 | 0: +/- 6.144 V | ||
20 | 1: +/- 4.096 V | ||
21 | 2: +/- 2.048 V (default) | ||
22 | 3: +/- 1.024 V | ||
23 | 4: +/- 0.512 V | ||
24 | 5: +/- 0.256 V | ||
25 | - data_rate in samples per second | ||
26 | 0: 128 | ||
27 | 1: 250 | ||
28 | 2: 490 | ||
29 | 3: 920 | ||
30 | 4: 1600 (default) | ||
31 | 5: 2400 | ||
32 | 6: 3300 | ||
33 | |||
34 | 1) The /ads1015 node | ||
35 | |||
36 | Required properties: | ||
37 | |||
38 | - compatible : must be "ti,ads1015" | ||
39 | - reg : I2C bus address of the device | ||
40 | - #address-cells : must be <1> | ||
41 | - #size-cells : must be <0> | ||
42 | |||
43 | The node contains child nodes for each channel that the platform uses. | ||
44 | |||
45 | Example ADS1015 node: | ||
46 | |||
47 | ads1015@49 { | ||
48 | compatible = "ti,ads1015"; | ||
49 | reg = <0x49>; | ||
50 | #address-cells = <1>; | ||
51 | #size-cells = <0>; | ||
52 | |||
53 | [ child node definitions... ] | ||
54 | } | ||
55 | |||
56 | 2) channel nodes | ||
57 | |||
58 | Required properties: | ||
59 | |||
60 | - reg : the channel number | ||
61 | |||
62 | Optional properties: | ||
63 | |||
64 | - ti,gain : the programmable gain amplifier setting | ||
65 | - ti,datarate : the converter data rate | ||
66 | |||
67 | Example ADS1015 channel node: | ||
68 | |||
69 | channel@4 { | ||
70 | reg = <4>; | ||
71 | ti,gain = <3>; | ||
72 | ti,datarate = <5>; | ||
73 | }; | ||
diff --git a/Documentation/devicetree/bindings/open-pic.txt b/Documentation/devicetree/bindings/open-pic.txt new file mode 100644 index 000000000000..909a902dff85 --- /dev/null +++ b/Documentation/devicetree/bindings/open-pic.txt | |||
@@ -0,0 +1,98 @@ | |||
1 | * Open PIC Binding | ||
2 | |||
3 | This binding specifies what properties must be available in the device tree | ||
4 | representation of an Open PIC compliant interrupt controller. This binding is | ||
5 | based on the binding defined for Open PIC in [1] and is a superset of that | ||
6 | binding. | ||
7 | |||
8 | Required properties: | ||
9 | |||
10 | NOTE: Many of these descriptions were paraphrased here from [1] to aid | ||
11 | readability. | ||
12 | |||
13 | - compatible: Specifies the compatibility list for the PIC. The type | ||
14 | shall be <string> and the value shall include "open-pic". | ||
15 | |||
16 | - reg: Specifies the base physical address(s) and size(s) of this | ||
17 | PIC's addressable register space. The type shall be <prop-encoded-array>. | ||
18 | |||
19 | - interrupt-controller: The presence of this property identifies the node | ||
20 | as an Open PIC. No property value shall be defined. | ||
21 | |||
22 | - #interrupt-cells: Specifies the number of cells needed to encode an | ||
23 | interrupt source. The type shall be a <u32> and the value shall be 2. | ||
24 | |||
25 | - #address-cells: Specifies the number of cells needed to encode an | ||
26 | address. The type shall be <u32> and the value shall be 0. As such, | ||
27 | 'interrupt-map' nodes do not have to specify a parent unit address. | ||
28 | |||
29 | Optional properties: | ||
30 | |||
31 | - pic-no-reset: The presence of this property indicates that the PIC | ||
32 | shall not be reset during runtime initialization. No property value shall | ||
33 | be defined. The presence of this property also mandates that any | ||
34 | initialization related to interrupt sources shall be limited to sources | ||
35 | explicitly referenced in the device tree. | ||
36 | |||
37 | * Interrupt Specifier Definition | ||
38 | |||
39 | Interrupt specifiers consists of 2 cells encoded as | ||
40 | follows: | ||
41 | |||
42 | - <1st-cell>: The interrupt-number that identifies the interrupt source. | ||
43 | |||
44 | - <2nd-cell>: The level-sense information, encoded as follows: | ||
45 | 0 = low-to-high edge triggered | ||
46 | 1 = active low level-sensitive | ||
47 | 2 = active high level-sensitive | ||
48 | 3 = high-to-low edge triggered | ||
49 | |||
50 | * Examples | ||
51 | |||
52 | Example 1: | ||
53 | |||
54 | /* | ||
55 | * An Open PIC interrupt controller | ||
56 | */ | ||
57 | mpic: pic@40000 { | ||
58 | // This is an interrupt controller node. | ||
59 | interrupt-controller; | ||
60 | |||
61 | // No address cells so that 'interrupt-map' nodes which reference | ||
62 | // this Open PIC node do not need a parent address specifier. | ||
63 | #address-cells = <0>; | ||
64 | |||
65 | // Two cells to encode interrupt sources. | ||
66 | #interrupt-cells = <2>; | ||
67 | |||
68 | // Offset address of 0x40000 and size of 0x40000. | ||
69 | reg = <0x40000 0x40000>; | ||
70 | |||
71 | // Compatible with Open PIC. | ||
72 | compatible = "open-pic"; | ||
73 | |||
74 | // The PIC shall not be reset. | ||
75 | pic-no-reset; | ||
76 | }; | ||
77 | |||
78 | Example 2: | ||
79 | |||
80 | /* | ||
81 | * An interrupt generating device that is wired to an Open PIC. | ||
82 | */ | ||
83 | serial0: serial@4500 { | ||
84 | // Interrupt source '42' that is active high level-sensitive. | ||
85 | // Note that there are only two cells as specified in the interrupt | ||
86 | // parent's '#interrupt-cells' property. | ||
87 | interrupts = <42 2>; | ||
88 | |||
89 | // The interrupt controller that this device is wired to. | ||
90 | interrupt-parent = <&mpic>; | ||
91 | }; | ||
92 | |||
93 | * References | ||
94 | |||
95 | [1] Power.org (TM) Standard for Embedded Power Architecture (TM) Platform | ||
96 | Requirements (ePAPR), Version 1.0, July 2008. | ||
97 | (http://www.power.org/resources/downloads/Power_ePAPR_APPROVED_v1.0.pdf) | ||
98 | |||
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index f487c6918d78..895330940f5d 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -585,16 +585,6 @@ Who: NeilBrown <neilb@suse.de> | |||
585 | 585 | ||
586 | ---------------------------- | 586 | ---------------------------- |
587 | 587 | ||
588 | What: i2c_adapter.id | ||
589 | When: June 2011 | ||
590 | Why: This field is deprecated. I2C device drivers shouldn't change their | ||
591 | behavior based on the underlying I2C adapter. Instead, the I2C | ||
592 | adapter driver should instantiate the I2C devices and provide the | ||
593 | needed platform-specific information. | ||
594 | Who: Jean Delvare <khali@linux-fr.org> | ||
595 | |||
596 | ---------------------------- | ||
597 | |||
598 | What: cancel_rearming_delayed_work[queue]() | 588 | What: cancel_rearming_delayed_work[queue]() |
599 | When: 2.6.39 | 589 | When: 2.6.39 |
600 | 590 | ||
@@ -645,3 +635,12 @@ Who: Florian Westphal <fw@strlen.de> | |||
645 | Files: include/linux/netfilter_ipv4/ipt_addrtype.h | 635 | Files: include/linux/netfilter_ipv4/ipt_addrtype.h |
646 | 636 | ||
647 | ---------------------------- | 637 | ---------------------------- |
638 | |||
639 | What: i2c_driver.attach_adapter | ||
640 | i2c_driver.detach_adapter | ||
641 | When: September 2011 | ||
642 | Why: These legacy callbacks should no longer be used as i2c-core offers | ||
643 | a variety of preferable alternative ways to instantiate I2C devices. | ||
644 | Who: Jean Delvare <khali@linux-fr.org> | ||
645 | |||
646 | ---------------------------- | ||
diff --git a/Documentation/filesystems/xfs-delayed-logging-design.txt b/Documentation/filesystems/xfs-delayed-logging-design.txt index 7445bf335dae..5282e3e51413 100644 --- a/Documentation/filesystems/xfs-delayed-logging-design.txt +++ b/Documentation/filesystems/xfs-delayed-logging-design.txt | |||
@@ -791,10 +791,3 @@ mount option. Fundamentally, there is no reason why the log manager would not | |||
791 | be able to swap methods automatically and transparently depending on load | 791 | be able to swap methods automatically and transparently depending on load |
792 | characteristics, but this should not be necessary if delayed logging works as | 792 | characteristics, but this should not be necessary if delayed logging works as |
793 | designed. | 793 | designed. |
794 | |||
795 | Roadmap: | ||
796 | |||
797 | 2.6.39 Switch default mount option to use delayed logging | ||
798 | => should be roughly 12 months after initial merge | ||
799 | => enough time to shake out remaining problems before next round of | ||
800 | enterprise distro kernel rebases | ||
diff --git a/Documentation/hwmon/ads1015 b/Documentation/hwmon/ads1015 new file mode 100644 index 000000000000..f6fe9c203733 --- /dev/null +++ b/Documentation/hwmon/ads1015 | |||
@@ -0,0 +1,72 @@ | |||
1 | Kernel driver ads1015 | ||
2 | ===================== | ||
3 | |||
4 | Supported chips: | ||
5 | * Texas Instruments ADS1015 | ||
6 | Prefix: 'ads1015' | ||
7 | Datasheet: Publicly available at the Texas Instruments website : | ||
8 | http://focus.ti.com/lit/ds/symlink/ads1015.pdf | ||
9 | |||
10 | Authors: | ||
11 | Dirk Eibach, Guntermann & Drunck GmbH <eibach@gdsys.de> | ||
12 | |||
13 | Description | ||
14 | ----------- | ||
15 | |||
16 | This driver implements support for the Texas Instruments ADS1015. | ||
17 | |||
18 | This device is a 12-bit A-D converter with 4 inputs. | ||
19 | |||
20 | The inputs can be used single ended or in certain differential combinations. | ||
21 | |||
22 | The inputs can be made available by 8 sysfs input files in0_input - in7_input: | ||
23 | in0: Voltage over AIN0 and AIN1. | ||
24 | in1: Voltage over AIN0 and AIN3. | ||
25 | in2: Voltage over AIN1 and AIN3. | ||
26 | in3: Voltage over AIN2 and AIN3. | ||
27 | in4: Voltage over AIN0 and GND. | ||
28 | in5: Voltage over AIN1 and GND. | ||
29 | in6: Voltage over AIN2 and GND. | ||
30 | in7: Voltage over AIN3 and GND. | ||
31 | |||
32 | Which inputs are available can be configured using platform data or devicetree. | ||
33 | |||
34 | By default all inputs are exported. | ||
35 | |||
36 | Platform Data | ||
37 | ------------- | ||
38 | |||
39 | In linux/i2c/ads1015.h platform data is defined, channel_data contains | ||
40 | configuration data for the used input combinations: | ||
41 | - pga is the programmable gain amplifier (values are full scale) | ||
42 | 0: +/- 6.144 V | ||
43 | 1: +/- 4.096 V | ||
44 | 2: +/- 2.048 V | ||
45 | 3: +/- 1.024 V | ||
46 | 4: +/- 0.512 V | ||
47 | 5: +/- 0.256 V | ||
48 | - data_rate in samples per second | ||
49 | 0: 128 | ||
50 | 1: 250 | ||
51 | 2: 490 | ||
52 | 3: 920 | ||
53 | 4: 1600 | ||
54 | 5: 2400 | ||
55 | 6: 3300 | ||
56 | |||
57 | Example: | ||
58 | struct ads1015_platform_data data = { | ||
59 | .channel_data = { | ||
60 | [2] = { .enabled = true, .pga = 1, .data_rate = 0 }, | ||
61 | [4] = { .enabled = true, .pga = 4, .data_rate = 5 }, | ||
62 | } | ||
63 | }; | ||
64 | |||
65 | In this case only in2_input (FS +/- 4.096 V, 128 SPS) and in4_input | ||
66 | (FS +/- 0.512 V, 2400 SPS) would be created. | ||
67 | |||
68 | Devicetree | ||
69 | ---------- | ||
70 | |||
71 | Configuration is also possible via devicetree: | ||
72 | Documentation/devicetree/bindings/hwmon/ads1015.txt | ||
diff --git a/Documentation/hwmon/lm75 b/Documentation/hwmon/lm75 index 8e6356fe05d7..a1790401fdde 100644 --- a/Documentation/hwmon/lm75 +++ b/Documentation/hwmon/lm75 | |||
@@ -7,6 +7,11 @@ Supported chips: | |||
7 | Addresses scanned: I2C 0x48 - 0x4f | 7 | Addresses scanned: I2C 0x48 - 0x4f |
8 | Datasheet: Publicly available at the National Semiconductor website | 8 | Datasheet: Publicly available at the National Semiconductor website |
9 | http://www.national.com/ | 9 | http://www.national.com/ |
10 | * National Semiconductor LM75A | ||
11 | Prefix: 'lm75a' | ||
12 | Addresses scanned: I2C 0x48 - 0x4f | ||
13 | Datasheet: Publicly available at the National Semiconductor website | ||
14 | http://www.national.com/ | ||
10 | * Dallas Semiconductor DS75 | 15 | * Dallas Semiconductor DS75 |
11 | Prefix: 'lm75' | 16 | Prefix: 'lm75' |
12 | Addresses scanned: I2C 0x48 - 0x4f | 17 | Addresses scanned: I2C 0x48 - 0x4f |
diff --git a/Documentation/hwmon/sch5627 b/Documentation/hwmon/sch5627 new file mode 100644 index 000000000000..446a054e4912 --- /dev/null +++ b/Documentation/hwmon/sch5627 | |||
@@ -0,0 +1,22 @@ | |||
1 | Kernel driver sch5627 | ||
2 | ===================== | ||
3 | |||
4 | Supported chips: | ||
5 | * SMSC SCH5627 | ||
6 | Prefix: 'sch5627' | ||
7 | Addresses scanned: none, address read from Super I/O config space | ||
8 | Datasheet: Application Note available upon request | ||
9 | |||
10 | Author: Hans de Goede <hdegoede@redhat.com> | ||
11 | |||
12 | |||
13 | Description | ||
14 | ----------- | ||
15 | |||
16 | SMSC SCH5627 Super I/O chips include complete hardware monitoring | ||
17 | capabilities. They can monitor up to 5 voltages, 4 fans and 8 temperatures. | ||
18 | |||
19 | The hardware monitoring part of the SMSC SCH5627 is accessed by talking | ||
20 | through an embedded microcontroller. An application note describing the | ||
21 | protocol for communicating with the microcontroller is available upon | ||
22 | request. Please mail me if you want a copy. | ||
diff --git a/Documentation/hwmon/w83795 b/Documentation/hwmon/w83795 new file mode 100644 index 000000000000..9f160371f463 --- /dev/null +++ b/Documentation/hwmon/w83795 | |||
@@ -0,0 +1,127 @@ | |||
1 | Kernel driver w83795 | ||
2 | ==================== | ||
3 | |||
4 | Supported chips: | ||
5 | * Winbond/Nuvoton W83795G | ||
6 | Prefix: 'w83795g' | ||
7 | Addresses scanned: I2C 0x2c - 0x2f | ||
8 | Datasheet: Available for download on nuvoton.com | ||
9 | * Winbond/Nuvoton W83795ADG | ||
10 | Prefix: 'w83795adg' | ||
11 | Addresses scanned: I2C 0x2c - 0x2f | ||
12 | Datasheet: Available for download on nuvoton.com | ||
13 | |||
14 | Authors: | ||
15 | Wei Song (Nuvoton) | ||
16 | Jean Delvare <khali@linux-fr.org> | ||
17 | |||
18 | |||
19 | Pin mapping | ||
20 | ----------- | ||
21 | |||
22 | Here is a summary of the pin mapping for the W83795G and W83795ADG. | ||
23 | This can be useful to convert data provided by board manufacturers | ||
24 | into working libsensors configuration statements. | ||
25 | |||
26 | W83795G | | ||
27 | Pin | Name | Register | Sysfs attribute | ||
28 | ------------------------------------------------------------------ | ||
29 | 13 | VSEN1 (VCORE1) | 10h | in0 | ||
30 | 14 | VSEN2 (VCORE2) | 11h | in1 | ||
31 | 15 | VSEN3 (VCORE3) | 12h | in2 | ||
32 | 16 | VSEN4 | 13h | in3 | ||
33 | 17 | VSEN5 | 14h | in4 | ||
34 | 18 | VSEN6 | 15h | in5 | ||
35 | 19 | VSEN7 | 16h | in6 | ||
36 | 20 | VSEN8 | 17h | in7 | ||
37 | 21 | VSEN9 | 18h | in8 | ||
38 | 22 | VSEN10 | 19h | in9 | ||
39 | 23 | VSEN11 | 1Ah | in10 | ||
40 | 28 | VTT | 1Bh | in11 | ||
41 | 24 | 3VDD | 1Ch | in12 | ||
42 | 25 | 3VSB | 1Dh | in13 | ||
43 | 26 | VBAT | 1Eh | in14 | ||
44 | 3 | VSEN12/TR5 | 1Fh | in15/temp5 | ||
45 | 4 | VSEN13/TR5 | 20h | in16/temp6 | ||
46 | 5/ 6 | VDSEN14/TR1/TD1 | 21h | in17/temp1 | ||
47 | 7/ 8 | VDSEN15/TR2/TD2 | 22h | in18/temp2 | ||
48 | 9/ 10 | VDSEN16/TR3/TD3 | 23h | in19/temp3 | ||
49 | 11/ 12 | VDSEN17/TR4/TD4 | 24h | in20/temp4 | ||
50 | 40 | FANIN1 | 2Eh | fan1 | ||
51 | 42 | FANIN2 | 2Fh | fan2 | ||
52 | 44 | FANIN3 | 30h | fan3 | ||
53 | 46 | FANIN4 | 31h | fan4 | ||
54 | 48 | FANIN5 | 32h | fan5 | ||
55 | 50 | FANIN6 | 33h | fan6 | ||
56 | 52 | FANIN7 | 34h | fan7 | ||
57 | 54 | FANIN8 | 35h | fan8 | ||
58 | 57 | FANIN9 | 36h | fan9 | ||
59 | 58 | FANIN10 | 37h | fan10 | ||
60 | 59 | FANIN11 | 38h | fan11 | ||
61 | 60 | FANIN12 | 39h | fan12 | ||
62 | 31 | FANIN13 | 3Ah | fan13 | ||
63 | 35 | FANIN14 | 3Bh | fan14 | ||
64 | 41 | FANCTL1 | 10h (bank 2) | pwm1 | ||
65 | 43 | FANCTL2 | 11h (bank 2) | pwm2 | ||
66 | 45 | FANCTL3 | 12h (bank 2) | pwm3 | ||
67 | 47 | FANCTL4 | 13h (bank 2) | pwm4 | ||
68 | 49 | FANCTL5 | 14h (bank 2) | pwm5 | ||
69 | 51 | FANCTL6 | 15h (bank 2) | pwm6 | ||
70 | 53 | FANCTL7 | 16h (bank 2) | pwm7 | ||
71 | 55 | FANCTL8 | 17h (bank 2) | pwm8 | ||
72 | 29/ 30 | PECI/TSI (DTS1) | 26h | temp7 | ||
73 | 29/ 30 | PECI/TSI (DTS2) | 27h | temp8 | ||
74 | 29/ 30 | PECI/TSI (DTS3) | 28h | temp9 | ||
75 | 29/ 30 | PECI/TSI (DTS4) | 29h | temp10 | ||
76 | 29/ 30 | PECI/TSI (DTS5) | 2Ah | temp11 | ||
77 | 29/ 30 | PECI/TSI (DTS6) | 2Bh | temp12 | ||
78 | 29/ 30 | PECI/TSI (DTS7) | 2Ch | temp13 | ||
79 | 29/ 30 | PECI/TSI (DTS8) | 2Dh | temp14 | ||
80 | 27 | CASEOPEN# | 46h | intrusion0 | ||
81 | |||
82 | W83795ADG | | ||
83 | Pin | Name | Register | Sysfs attribute | ||
84 | ------------------------------------------------------------------ | ||
85 | 10 | VSEN1 (VCORE1) | 10h | in0 | ||
86 | 11 | VSEN2 (VCORE2) | 11h | in1 | ||
87 | 12 | VSEN3 (VCORE3) | 12h | in2 | ||
88 | 13 | VSEN4 | 13h | in3 | ||
89 | 14 | VSEN5 | 14h | in4 | ||
90 | 15 | VSEN6 | 15h | in5 | ||
91 | 16 | VSEN7 | 16h | in6 | ||
92 | 17 | VSEN8 | 17h | in7 | ||
93 | 22 | VTT | 1Bh | in11 | ||
94 | 18 | 3VDD | 1Ch | in12 | ||
95 | 19 | 3VSB | 1Dh | in13 | ||
96 | 20 | VBAT | 1Eh | in14 | ||
97 | 48 | VSEN12/TR5 | 1Fh | in15/temp5 | ||
98 | 1 | VSEN13/TR5 | 20h | in16/temp6 | ||
99 | 2/ 3 | VDSEN14/TR1/TD1 | 21h | in17/temp1 | ||
100 | 4/ 5 | VDSEN15/TR2/TD2 | 22h | in18/temp2 | ||
101 | 6/ 7 | VDSEN16/TR3/TD3 | 23h | in19/temp3 | ||
102 | 8/ 9 | VDSEN17/TR4/TD4 | 24h | in20/temp4 | ||
103 | 32 | FANIN1 | 2Eh | fan1 | ||
104 | 34 | FANIN2 | 2Fh | fan2 | ||
105 | 36 | FANIN3 | 30h | fan3 | ||
106 | 37 | FANIN4 | 31h | fan4 | ||
107 | 38 | FANIN5 | 32h | fan5 | ||
108 | 39 | FANIN6 | 33h | fan6 | ||
109 | 40 | FANIN7 | 34h | fan7 | ||
110 | 41 | FANIN8 | 35h | fan8 | ||
111 | 43 | FANIN9 | 36h | fan9 | ||
112 | 44 | FANIN10 | 37h | fan10 | ||
113 | 45 | FANIN11 | 38h | fan11 | ||
114 | 46 | FANIN12 | 39h | fan12 | ||
115 | 24 | FANIN13 | 3Ah | fan13 | ||
116 | 28 | FANIN14 | 3Bh | fan14 | ||
117 | 33 | FANCTL1 | 10h (bank 2) | pwm1 | ||
118 | 35 | FANCTL2 | 11h (bank 2) | pwm2 | ||
119 | 23 | PECI (DTS1) | 26h | temp7 | ||
120 | 23 | PECI (DTS2) | 27h | temp8 | ||
121 | 23 | PECI (DTS3) | 28h | temp9 | ||
122 | 23 | PECI (DTS4) | 29h | temp10 | ||
123 | 23 | PECI (DTS5) | 2Ah | temp11 | ||
124 | 23 | PECI (DTS6) | 2Bh | temp12 | ||
125 | 23 | PECI (DTS7) | 2Ch | temp13 | ||
126 | 23 | PECI (DTS8) | 2Dh | temp14 | ||
127 | 21 | CASEOPEN# | 46h | intrusion0 | ||
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801 index 93fe76e56522..6df69765ccb7 100644 --- a/Documentation/i2c/busses/i2c-i801 +++ b/Documentation/i2c/busses/i2c-i801 | |||
@@ -16,8 +16,9 @@ Supported adapters: | |||
16 | * Intel EP80579 (Tolapai) | 16 | * Intel EP80579 (Tolapai) |
17 | * Intel 82801JI (ICH10) | 17 | * Intel 82801JI (ICH10) |
18 | * Intel 5/3400 Series (PCH) | 18 | * Intel 5/3400 Series (PCH) |
19 | * Intel Cougar Point (PCH) | 19 | * Intel 6 Series (PCH) |
20 | * Intel Patsburg (PCH) | 20 | * Intel Patsburg (PCH) |
21 | * Intel DH89xxCC (PCH) | ||
21 | Datasheets: Publicly available at the Intel website | 22 | Datasheets: Publicly available at the Intel website |
22 | 23 | ||
23 | On Intel Patsburg and later chipsets, both the normal host SMBus controller | 24 | On Intel Patsburg and later chipsets, both the normal host SMBus controller |
diff --git a/Documentation/i2c/instantiating-devices b/Documentation/i2c/instantiating-devices index 87da405a8597..9edb75d8c9b9 100644 --- a/Documentation/i2c/instantiating-devices +++ b/Documentation/i2c/instantiating-devices | |||
@@ -100,7 +100,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) | |||
100 | (...) | 100 | (...) |
101 | i2c_adap = i2c_get_adapter(2); | 101 | i2c_adap = i2c_get_adapter(2); |
102 | memset(&i2c_info, 0, sizeof(struct i2c_board_info)); | 102 | memset(&i2c_info, 0, sizeof(struct i2c_board_info)); |
103 | strlcpy(i2c_info.name, "isp1301_pnx", I2C_NAME_SIZE); | 103 | strlcpy(i2c_info.type, "isp1301_pnx", I2C_NAME_SIZE); |
104 | isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info, | 104 | isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info, |
105 | normal_i2c, NULL); | 105 | normal_i2c, NULL); |
106 | i2c_put_adapter(i2c_adap); | 106 | i2c_put_adapter(i2c_adap); |
diff --git a/Documentation/i2c/upgrading-clients b/Documentation/i2c/upgrading-clients index 9a45f9bb6a25..d6991625c407 100644 --- a/Documentation/i2c/upgrading-clients +++ b/Documentation/i2c/upgrading-clients | |||
@@ -61,7 +61,7 @@ static int example_attach(struct i2c_adapter *adap, int addr, int kind) | |||
61 | return 0; | 61 | return 0; |
62 | } | 62 | } |
63 | 63 | ||
64 | static int __devexit example_detach(struct i2c_client *client) | 64 | static int example_detach(struct i2c_client *client) |
65 | { | 65 | { |
66 | struct example_state *state = i2c_get_clientdata(client); | 66 | struct example_state *state = i2c_get_clientdata(client); |
67 | 67 | ||
@@ -81,7 +81,7 @@ static struct i2c_driver example_driver = { | |||
81 | .name = "example", | 81 | .name = "example", |
82 | }, | 82 | }, |
83 | .attach_adapter = example_attach_adapter, | 83 | .attach_adapter = example_attach_adapter, |
84 | .detach_client = __devexit_p(example_detach), | 84 | .detach_client = example_detach, |
85 | .suspend = example_suspend, | 85 | .suspend = example_suspend, |
86 | .resume = example_resume, | 86 | .resume = example_resume, |
87 | }; | 87 | }; |
@@ -93,7 +93,7 @@ Updating the client | |||
93 | The new style binding model will check against a list of supported | 93 | The new style binding model will check against a list of supported |
94 | devices and their associated address supplied by the code registering | 94 | devices and their associated address supplied by the code registering |
95 | the busses. This means that the driver .attach_adapter and | 95 | the busses. This means that the driver .attach_adapter and |
96 | .detach_adapter methods can be removed, along with the addr_data, | 96 | .detach_client methods can be removed, along with the addr_data, |
97 | as follows: | 97 | as follows: |
98 | 98 | ||
99 | - static struct i2c_driver example_driver; | 99 | - static struct i2c_driver example_driver; |
@@ -110,14 +110,14 @@ as follows: | |||
110 | 110 | ||
111 | static struct i2c_driver example_driver = { | 111 | static struct i2c_driver example_driver = { |
112 | - .attach_adapter = example_attach_adapter, | 112 | - .attach_adapter = example_attach_adapter, |
113 | - .detach_client = __devexit_p(example_detach), | 113 | - .detach_client = example_detach, |
114 | } | 114 | } |
115 | 115 | ||
116 | Add the probe and remove methods to the i2c_driver, as so: | 116 | Add the probe and remove methods to the i2c_driver, as so: |
117 | 117 | ||
118 | static struct i2c_driver example_driver = { | 118 | static struct i2c_driver example_driver = { |
119 | + .probe = example_probe, | 119 | + .probe = example_probe, |
120 | + .remove = __devexit_p(example_remove), | 120 | + .remove = example_remove, |
121 | } | 121 | } |
122 | 122 | ||
123 | Change the example_attach method to accept the new parameters | 123 | Change the example_attach method to accept the new parameters |
@@ -199,8 +199,8 @@ to delete the i2c_detach_client call. It is possible that you | |||
199 | can also remove the ret variable as it is not not needed for | 199 | can also remove the ret variable as it is not not needed for |
200 | any of the core functions. | 200 | any of the core functions. |
201 | 201 | ||
202 | - static int __devexit example_detach(struct i2c_client *client) | 202 | - static int example_detach(struct i2c_client *client) |
203 | + static int __devexit example_remove(struct i2c_client *client) | 203 | + static int example_remove(struct i2c_client *client) |
204 | { | 204 | { |
205 | struct example_state *state = i2c_get_clientdata(client); | 205 | struct example_state *state = i2c_get_clientdata(client); |
206 | 206 | ||
@@ -253,7 +253,7 @@ static int example_probe(struct i2c_client *client, | |||
253 | return 0; | 253 | return 0; |
254 | } | 254 | } |
255 | 255 | ||
256 | static int __devexit example_remove(struct i2c_client *client) | 256 | static int example_remove(struct i2c_client *client) |
257 | { | 257 | { |
258 | struct example_state *state = i2c_get_clientdata(client); | 258 | struct example_state *state = i2c_get_clientdata(client); |
259 | 259 | ||
@@ -275,7 +275,7 @@ static struct i2c_driver example_driver = { | |||
275 | }, | 275 | }, |
276 | .id_table = example_idtable, | 276 | .id_table = example_idtable, |
277 | .probe = example_probe, | 277 | .probe = example_probe, |
278 | .remove = __devexit_p(example_remove), | 278 | .remove = example_remove, |
279 | .suspend = example_suspend, | 279 | .suspend = example_suspend, |
280 | .resume = example_resume, | 280 | .resume = example_resume, |
281 | }; | 281 | }; |
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt index 8f63b224ab09..f1431d099fce 100644 --- a/Documentation/kbuild/kbuild.txt +++ b/Documentation/kbuild/kbuild.txt | |||
@@ -196,3 +196,8 @@ to be included in the databases, separated by blank space. E.g.: | |||
196 | To get all available archs you can also specify all. E.g.: | 196 | To get all available archs you can also specify all. E.g.: |
197 | 197 | ||
198 | $ make ALLSOURCE_ARCHS=all tags | 198 | $ make ALLSOURCE_ARCHS=all tags |
199 | |||
200 | KBUILD_ENABLE_EXTRA_GCC_CHECKS | ||
201 | -------------------------------------------------- | ||
202 | If enabled over the make command line with "W=1", it turns on additional | ||
203 | gcc -W... options for more extensive build-time checking. | ||
diff --git a/Documentation/hwmon/hpfall.c b/Documentation/laptops/hpfall.c index a4a8fc5d05d4..a4a8fc5d05d4 100644 --- a/Documentation/hwmon/hpfall.c +++ b/Documentation/laptops/hpfall.c | |||
diff --git a/Documentation/hwmon/lis3lv02d b/Documentation/misc-devices/lis3lv02d index 06534f25e643..f1a4ec840f86 100644 --- a/Documentation/hwmon/lis3lv02d +++ b/Documentation/misc-devices/lis3lv02d | |||
@@ -17,8 +17,8 @@ Description | |||
17 | This driver provides support for the accelerometer found in various HP laptops | 17 | This driver provides support for the accelerometer found in various HP laptops |
18 | sporting the feature officially called "HP Mobile Data Protection System 3D" or | 18 | sporting the feature officially called "HP Mobile Data Protection System 3D" or |
19 | "HP 3D DriveGuard". It detects automatically laptops with this sensor. Known | 19 | "HP 3D DriveGuard". It detects automatically laptops with this sensor. Known |
20 | models (full list can be found in drivers/hwmon/hp_accel.c) will have their | 20 | models (full list can be found in drivers/platform/x86/hp_accel.c) will have |
21 | axis automatically oriented on standard way (eg: you can directly play | 21 | their axis automatically oriented on standard way (eg: you can directly play |
22 | neverball). The accelerometer data is readable via | 22 | neverball). The accelerometer data is readable via |
23 | /sys/devices/platform/lis3lv02d. Reported values are scaled | 23 | /sys/devices/platform/lis3lv02d. Reported values are scaled |
24 | to mg values (1/1000th of earth gravity). | 24 | to mg values (1/1000th of earth gravity). |
diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran index 699b60e070d2..c40e3bab08fa 100644 --- a/Documentation/video4linux/Zoran +++ b/Documentation/video4linux/Zoran | |||
@@ -130,7 +130,7 @@ Card number: 4 | |||
130 | 130 | ||
131 | Note: No module for the mse3000 is available yet | 131 | Note: No module for the mse3000 is available yet |
132 | Note: No module for the vpx3224 is available yet | 132 | Note: No module for the vpx3224 is available yet |
133 | Note: use encoder=X or decoder=X for non-default i2c chips (see i2c-id.h) | 133 | Note: use encoder=X or decoder=X for non-default i2c chips |
134 | 134 | ||
135 | =========================== | 135 | =========================== |
136 | 136 | ||