Skip to content

Commit ae82bfd

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2 parents cd74c86 + ebc79c4 commit ae82bfd

File tree

901 files changed

+66493
-11792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

901 files changed

+66493
-11792
lines changed

‎Documentation/arm/OMAP/omap_pm

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
2+
The OMAP PM interface
3+
=====================
4+
5+
This document describes the temporary OMAP PM interface. Driver
6+
authors use these functions to communicate minimum latency or
7+
throughput constraints to the kernel power management code.
8+
Over time, the intention is to merge features from the OMAP PM
9+
interface into the Linux PM QoS code.
10+
11+
Drivers need to express PM parameters which:
12+
13+
- support the range of power management parameters present in the TI SRF;
14+
15+
- separate the drivers from the underlying PM parameter
16+
implementation, whether it is the TI SRF or Linux PM QoS or Linux
17+
latency framework or something else;
18+
19+
- specify PM parameters in terms of fundamental units, such as
20+
latency and throughput, rather than units which are specific to OMAP
21+
or to particular OMAP variants;
22+
23+
- allow drivers which are shared with other architectures (e.g.,
24+
DaVinci) to add these constraints in a way which won't affect non-OMAP
25+
systems,
26+
27+
- can be implemented immediately with minimal disruption of other
28+
architectures.
29+
30+
31+
This document proposes the OMAP PM interface, including the following
32+
five power management functions for driver code:
33+
34+
1. Set the maximum MPU wakeup latency:
35+
(*pdata->set_max_mpu_wakeup_lat)(struct device *dev, unsigned long t)
36+
37+
2. Set the maximum device wakeup latency:
38+
(*pdata->set_max_dev_wakeup_lat)(struct device *dev, unsigned long t)
39+
40+
3. Set the maximum system DMA transfer start latency (CORE pwrdm):
41+
(*pdata->set_max_sdma_lat)(struct device *dev, long t)
42+
43+
4. Set the minimum bus throughput needed by a device:
44+
(*pdata->set_min_bus_tput)(struct device *dev, u8 agent_id, unsigned long r)
45+
46+
5. Return the number of times the device has lost context
47+
(*pdata->get_dev_context_loss_count)(struct device *dev)
48+
49+
50+
Further documentation for all OMAP PM interface functions can be
51+
found in arch/arm/plat-omap/include/mach/omap-pm.h.
52+
53+
54+
The OMAP PM layer is intended to be temporary
55+
---------------------------------------------
56+
57+
The intention is that eventually the Linux PM QoS layer should support
58+
the range of power management features present in OMAP3. As this
59+
happens, existing drivers using the OMAP PM interface can be modified
60+
to use the Linux PM QoS code; and the OMAP PM interface can disappear.
61+
62+
63+
Driver usage of the OMAP PM functions
64+
-------------------------------------
65+
66+
As the 'pdata' in the above examples indicates, these functions are
67+
exposed to drivers through function pointers in driver .platform_data
68+
structures. The function pointers are initialized by the board-*.c
69+
files to point to the corresponding OMAP PM functions:
70+
.set_max_dev_wakeup_lat will point to
71+
omap_pm_set_max_dev_wakeup_lat(), etc. Other architectures which do
72+
not support these functions should leave these function pointers set
73+
to NULL. Drivers should use the following idiom:
74+
75+
if (pdata->set_max_dev_wakeup_lat)
76+
(*pdata->set_max_dev_wakeup_lat)(dev, t);
77+
78+
The most common usage of these functions will probably be to specify
79+
the maximum time from when an interrupt occurs, to when the device
80+
becomes accessible. To accomplish this, driver writers should use the
81+
set_max_mpu_wakeup_lat() function to to constrain the MPU wakeup
82+
latency, and the set_max_dev_wakeup_lat() function to constrain the
83+
device wakeup latency (from clk_enable() to accessibility). For
84+
example,
85+
86+
/* Limit MPU wakeup latency */
87+
if (pdata->set_max_mpu_wakeup_lat)
88+
(*pdata->set_max_mpu_wakeup_lat)(dev, tc);
89+
90+
/* Limit device powerdomain wakeup latency */
91+
if (pdata->set_max_dev_wakeup_lat)
92+
(*pdata->set_max_dev_wakeup_lat)(dev, td);
93+
94+
/* total wakeup latency in this example: (tc + td) */
95+
96+
The PM parameters can be overwritten by calling the function again
97+
with the new value. The settings can be removed by calling the
98+
function with a t argument of -1 (except in the case of
99+
set_max_bus_tput(), which should be called with an r argument of 0).
100+
101+
The fifth function above, omap_pm_get_dev_context_loss_count(),
102+
is intended as an optimization to allow drivers to determine whether the
103+
device has lost its internal context. If context has been lost, the
104+
driver must restore its internal context before proceeding.
105+
106+
107+
Other specialized interface functions
108+
-------------------------------------
109+
110+
The five functions listed above are intended to be usable by any
111+
device driver. DSPBridge and CPUFreq have a few special requirements.
112+
DSPBridge expresses target DSP performance levels in terms of OPP IDs.
113+
CPUFreq expresses target MPU performance levels in terms of MPU
114+
frequency. The OMAP PM interface contains functions for these
115+
specialized cases to convert that input information (OPPs/MPU
116+
frequency) into the form that the underlying power management
117+
implementation needs:
118+
119+
6. (*pdata->dsp_get_opp_table)(void)
120+
121+
7. (*pdata->dsp_set_min_opp)(u8 opp_id)
122+
123+
8. (*pdata->dsp_get_opp)(void)
124+
125+
9. (*pdata->cpu_get_freq_table)(void)
126+
127+
10. (*pdata->cpu_set_freq)(unsigned long f)
128+
129+
11. (*pdata->cpu_get_freq)(void)

‎Documentation/cpu-freq/user-guide.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ scaling_governor, and by "echoing" the name of another
176176
work on some specific architectures or
177177
processors.
178178

179-
cpuinfo_cur_freq : Current speed of the CPU, in KHz.
179+
cpuinfo_cur_freq : Current frequency of the CPU as obtained from
180+
the hardware, in KHz. This is the frequency
181+
the CPU actually runs at.
180182

181183
scaling_available_frequencies : List of available frequencies, in KHz.
182184

@@ -196,7 +198,10 @@ related_cpus : List of CPUs that need some sort of frequency
196198

197199
scaling_driver : Hardware driver for cpufreq.
198200

199-
scaling_cur_freq : Current frequency of the CPU, in KHz.
201+
scaling_cur_freq : Current frequency of the CPU as determined by
202+
the governor and cpufreq core, in KHz. This is
203+
the frequency the kernel thinks the CPU runs
204+
at.
200205

201206
If you have selected the "userspace" governor which allows you to
202207
set the CPU operating frequency to a specific value, you can read out

‎Documentation/filesystems/ext4.txt

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,9 @@ ro Mount filesystem read only. Note that ext4 will
134134
mount options "ro,noload" can be used to prevent
135135
writes to the filesystem.
136136

137-
journal_checksum Enable checksumming of the journal transactions.
138-
This will allow the recovery code in e2fsck and the
139-
kernel to detect corruption in the kernel. It is a
140-
compatible change and will be ignored by older kernels.
141-
142137
journal_async_commit Commit block can be written to disk without waiting
143138
for descriptor blocks. If enabled older kernels cannot
144-
mount the device. This will enable 'journal_checksum'
145-
internally.
139+
mount the device.
146140

147141
journal=update Update the ext4 file system's journal to the current
148142
format.
@@ -263,10 +257,18 @@ resuid=n The user ID which may use the reserved blocks.
263257

264258
sb=n Use alternate superblock at this location.
265259

266-
quota
267-
noquota
268-
grpquota
269-
usrquota
260+
quota These options are ignored by the filesystem. They
261+
noquota are used only by quota tools to recognize volumes
262+
grpquota where quota should be turned on. See documentation
263+
usrquota in the quota-tools package for more details
264+
(http://sourceforge.net/projects/linuxquota).
265+
266+
jqfmt=<quota type> These options tell filesystem details about quota
267+
usrjquota=<file> so that quota information can be properly updated
268+
grpjquota=<file> during journal replay. They replace the above
269+
quota options. See documentation in the quota-tools
270+
package for more details
271+
(http://sourceforge.net/projects/linuxquota).
270272

271273
bh (*) ext4 associates buffer heads to data pages to
272274
nobh (a) cache disk block mapping information

‎Documentation/hwmon/wm831x

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
Kernel driver wm831x-hwmon
2+
==========================
3+
4+
Supported chips:
5+
* Wolfson Microelectronics WM831x PMICs
6+
Prefix: 'wm831x'
7+
Datasheet:
8+
http://www.wolfsonmicro.com/products/WM8310
9+
http://www.wolfsonmicro.com/products/WM8311
10+
http://www.wolfsonmicro.com/products/WM8312
11+
12+
Authors: Mark Brown <broonie@opensource.wolfsonmicro.com>
13+
14+
Description
15+
-----------
16+
17+
The WM831x series of PMICs include an AUXADC which can be used to
18+
monitor a range of system operating parameters, including the voltages
19+
of the major supplies within the system. Currently the driver provides
20+
reporting of all the input values but does not provide any alarms.
21+
22+
Voltage Monitoring
23+
------------------
24+
25+
Voltages are sampled by a 12 bit ADC. Voltages in milivolts are 1.465
26+
times the ADC value.
27+
28+
Temperature Monitoring
29+
----------------------
30+
31+
Temperatures are sampled by a 12 bit ADC. Chip and battery temperatures
32+
are available. The chip temperature is calculated as:
33+
34+
Degrees celsius = (512.18 - data) / 1.0983
35+
36+
while the battery temperature calculation will depend on the NTC
37+
thermistor component.

‎Documentation/hwmon/wm8350

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Kernel driver wm8350-hwmon
2+
==========================
3+
4+
Supported chips:
5+
* Wolfson Microelectronics WM835x PMICs
6+
Prefix: 'wm8350'
7+
Datasheet:
8+
http://www.wolfsonmicro.com/products/WM8350
9+
http://www.wolfsonmicro.com/products/WM8351
10+
http://www.wolfsonmicro.com/products/WM8352
11+
12+
Authors: Mark Brown <broonie@opensource.wolfsonmicro.com>
13+
14+
Description
15+
-----------
16+
17+
The WM835x series of PMICs include an AUXADC which can be used to
18+
monitor a range of system operating parameters, including the voltages
19+
of the major supplies within the system. Currently the driver provides
20+
simple access to these major supplies.
21+
22+
Voltage Monitoring
23+
------------------
24+
25+
Voltages are sampled by a 12 bit ADC. For the internal supplies the ADC
26+
is referenced to the system VRTC.

‎Documentation/kernel-doc-nano-HOWTO.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ Example kernel-doc function comment:
6666
* The longer description can have multiple paragraphs.
6767
*/
6868

69-
The first line, with the short description, must be on a single line.
69+
The short description following the subject can span multiple lines
70+
and ends with an @argument description, an empty line or the end of
71+
the comment block.
7072

7173
The @argument descriptions must begin on the very next line following
7274
this opening short function description line, with no intervening

‎Documentation/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1565,7 +1565,7 @@ and is between 256 and 4096 characters. It is defined in the file
15651565
of returning the full 64-bit number.
15661566
The default is to return 64-bit inode numbers.
15671567

1568-
nmi_debug= [KNL,AVR32] Specify one or more actions to take
1568+
nmi_debug= [KNL,AVR32,SH] Specify one or more actions to take
15691569
when a NMI is triggered.
15701570
Format: [state][,regs][,debounce][,die]
15711571

‎Documentation/kref.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ int my_data_handler(void)
8484
task = kthread_run(more_data_handling, data, "more_data_handling");
8585
if (task == ERR_PTR(-ENOMEM)) {
8686
rv = -ENOMEM;
87-
kref_put(&data->refcount, data_release);
8887
goto out;
8988
}
9089

‎Documentation/x86/boot.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,7 @@ Protocol: 2.07+
599599
0x00000000 The default x86/PC environment
600600
0x00000001 lguest
601601
0x00000002 Xen
602+
0x00000003 Moorestown MID
602603

603604
Field name: hardware_subarch_data
604605
Type: write (subarch-dependent)

‎MAINTAINERS

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,6 @@ F: fs/ext2/
19731973
F: include/linux/ext2*
19741974

19751975
EXT3 FILE SYSTEM
1976-
M: Stephen Tweedie <sct@redhat.com>
19771976
M: Andrew Morton <akpm@linux-foundation.org>
19781977
M: Andreas Dilger <adilger@sun.com>
19791978
L: linux-ext4@vger.kernel.org
@@ -2901,8 +2900,8 @@ F: fs/jffs2/
29012900
F: include/linux/jffs2.h
29022901

29032902
JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
2904-
M: Stephen Tweedie <sct@redhat.com>
29052903
M: Andrew Morton <akpm@linux-foundation.org>
2904+
M: Jan Kara <jack@suse.cz>
29062905
L: linux-ext4@vger.kernel.org
29072906
S: Maintained
29082907
F: fs/jbd*/
@@ -4455,6 +4454,14 @@ S: Maintained
44554454
F: kernel/sched*
44564455
F: include/linux/sched.h
44574456

4457+
SCORE ARCHITECTURE
4458+
P: Chen Liqin
4459+
M: liqin.chen@sunplusct.com
4460+
P: Lennox Wu
4461+
M: lennox.wu@sunplusct.com
4462+
W: http://www.sunplusct.com
4463+
S: Supported
4464+
44584465
SCSI CDROM DRIVER
44594466
M: Jens Axboe <axboe@kernel.dk>
44604467
L: linux-scsi@vger.kernel.org
@@ -4654,6 +4661,12 @@ F: arch/arm/mach-s3c2410/
46544661
F: drivers/*/*s3c2410*
46554662
F: drivers/*/*/*s3c2410*
46564663

4664+
TI DAVINCI MACHINE SUPPORT
4665+
P: Kevin Hilman
4666+
M: davinci-linux-open-source@linux.davincidsp.com
4667+
S: Supported
4668+
F: arch/arm/mach-davinci
4669+
46574670
SIS 190 ETHERNET DRIVER
46584671
M: Francois Romieu <romieu@fr.zoreil.com>
46594672
L: netdev@vger.kernel.org
@@ -5678,6 +5691,26 @@ S: Supported
56785691
F: drivers/input/touchscreen/*wm97*
56795692
F: include/linux/wm97xx.h
56805693

5694+
WOLFSON MICROELECTRONICS PMIC DRIVERS
5695+
P: Mark Brown
5696+
M: broonie@opensource.wolfsonmicro.com
5697+
L: linux-kernel@vger.kernel.org
5698+
T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
5699+
W: http://opensource.wolfsonmicro.com/node/8
5700+
S: Supported
5701+
F: drivers/leds/leds-wm83*.c
5702+
F: drivers/mfd/wm8*.c
5703+
F: drivers/power/wm83*.c
5704+
F: drivers/rtc/rtc-wm83*.c
5705+
F: drivers/regulator/wm8*.c
5706+
F: drivers/video/backlight/wm83*_bl.c
5707+
F: drivers/watchdog/wm83*_wdt.c
5708+
F: include/linux/mfd/wm831x/
5709+
F: include/linux/mfd/wm8350/
5710+
F: include/linux/mfd/wm8400/
5711+
F: sound/soc/codecs/wm8350.c
5712+
F: sound/soc/codecs/wm8400.c
5713+
56815714
X.25 NETWORK LAYER
56825715
M: Henner Eisen <eis@baty.hanse.de>
56835716
L: linux-x25@vger.kernel.org

0 commit comments

Comments
 (0)