Skip to content

Commit 4391b2c

Browse files
airliedairlied
committed
Merge tag 'drm-intel-next-2012-06-21-merged' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
Daniel writes: New -next pull request. Highlights: - Remaining vlv patches from Jesse et al. - Some hw workarounds from Jesse - hw context support from Ben - full uncore sharing on ivb - prep work to move the gtt code from intel-gtt.c to drm/i915 for gen6+ - some backlight code improvements - leftovers for the timeout ioctl (we've forgotten the getparam) - ibx transcoder workarounds - some smaller fixlets and improvements - the new version of the "dont rely on HPD exclusively for VGA" patch Wrt regressions QA reported quite a few this time around. - The piglit/kernel-test fallout all has patches that are just awaiting review and merging into the next -next cycle. - Which just leaves a bunch of bugs about new modelines that don't work. It looks like these are all due to the new 16:9/16:10 modes in 3.5 (yeah, only in this manual testing cycle did the git branch used by QA contain a backmerge of mainline with these patches). Although I haven't yet confirmed this by letting our QA test the revert of that series. - Wrt bugs in general I'm trying to fight down some of our long-standing backlight issues (not regressions), but this seems to be a game of "you move, you lose" ... :(" Dropped merge bits since this had an -rc4 merge in it to fix some ugly conflicts.
2 parents 0317c6c + 7b0cfee commit 4391b2c

File tree

286 files changed

+3257
-1240
lines changed

Some content is hidden

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

286 files changed

+3257
-1240
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ Uwe Kleine-König <[email protected]>
111111
Uwe Kleine-König <[email protected]>
112112
Uwe Kleine-König <[email protected]>
113113
Valdis Kletnieks <[email protected]>
114+
Viresh Kumar <[email protected]> <[email protected]>
114115
Takashi YOSHII <[email protected]>
115116
Yusuke Goda <[email protected]>
116117
Gustavo Padovan <[email protected]>

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_scale
219219
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale
220220
What: /sys/bus/iio/devices/iio:deviceX/in_voltage_scale
221221
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_scale
222+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale
222223
What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale
223224
What: /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
224225
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
@@ -273,6 +274,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available
273274
What: /sys/.../iio:deviceX/in_voltageX_scale_available
274275
What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available
275276
What: /sys/.../iio:deviceX/out_voltageX_scale_available
277+
What: /sys/.../iio:deviceX/out_altvoltageX_scale_available
276278
What: /sys/.../iio:deviceX/in_capacitance_scale_available
277279
KernelVersion: 2.635
278280
Contact: [email protected]
@@ -298,14 +300,19 @@ Description:
298300
gives the 3dB frequency of the filter in Hz.
299301

300302
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw
303+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw
301304
KernelVersion: 2.6.37
302305
Contact: [email protected]
303306
Description:
304307
Raw (unscaled, no bias etc.) output voltage for
305308
channel Y. The number must always be specified and
306309
unique if the output corresponds to a single channel.
310+
While DAC like devices typically use out_voltage,
311+
a continuous frequency generating device, such as
312+
a DDS or PLL should use out_altvoltage.
307313

308314
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw
315+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw
309316
KernelVersion: 2.6.37
310317
Contact: [email protected]
311318
Description:
@@ -316,6 +323,8 @@ Description:
316323

317324
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode
318325
What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode
326+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown_mode
327+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown_mode
319328
KernelVersion: 2.6.38
320329
Contact: [email protected]
321330
Description:
@@ -330,6 +339,8 @@ Description:
330339

331340
What: /sys/.../iio:deviceX/out_votlageY_powerdown_mode_available
332341
What: /sys/.../iio:deviceX/out_voltage_powerdown_mode_available
342+
What: /sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available
343+
What: /sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available
333344
KernelVersion: 2.6.38
334345
Contact: [email protected]
335346
Description:
@@ -338,6 +349,8 @@ Description:
338349

339350
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown
340351
What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown
352+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown
353+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown
341354
KernelVersion: 2.6.38
342355
Contact: [email protected]
343356
Description:
@@ -346,6 +359,24 @@ Description:
346359
normal operation. Y may be suppressed if all outputs are
347360
controlled together.
348361

362+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency
363+
KernelVersion: 3.4.0
364+
Contact: [email protected]
365+
Description:
366+
Output frequency for channel Y in Hz. The number must always be
367+
specified and unique if the output corresponds to a single
368+
channel.
369+
370+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase
371+
KernelVersion: 3.4.0
372+
Contact: [email protected]
373+
Description:
374+
Phase in radians of one frequency/clock output Y
375+
(out_altvoltageY) relative to another frequency/clock output
376+
(out_altvoltageZ) of the device X. The number must always be
377+
specified and unique if the output corresponds to a single
378+
channel.
379+
349380
What: /sys/bus/iio/devices/iio:deviceX/events
350381
KernelVersion: 2.6.35
351382
Contact: [email protected]

‎Documentation/arm/SPEAr/overview.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ Introduction
6060
Document Author
6161
---------------
6262

63-
Viresh Kumar <viresh.kumar@st.com>, (c) 2010-2012 ST Microelectronics
63+
Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics

‎Documentation/hwmon/coretemp

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ Supported chips:
66
Prefix: 'coretemp'
77
CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),
88
0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),
9-
0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield)
9+
0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield),
10+
0x26 (Tunnel Creek Atom), 0x27 (Medfield Atom),
11+
0x36 (Cedar Trail Atom)
1012
Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
1113
Volume 3A: System Programming Guide
1214
http://softwarecommunity.intel.com/Uncyclo/Mobility/720.htm
@@ -52,6 +54,17 @@ Some information comes from ark.intel.com
5254

5355
Process Processor TjMax(C)
5456

57+
22nm Core i5/i7 Processors
58+
i7 3920XM, 3820QM, 3720QM, 3667U, 3520M 105
59+
i5 3427U, 3360M/3320M 105
60+
i7 3770/3770K 105
61+
i5 3570/3570K, 3550, 3470/3450 105
62+
i7 3770S 103
63+
i5 3570S/3550S, 3475S/3470S/3450S 103
64+
i7 3770T 94
65+
i5 3570T 94
66+
i5 3470T 91
67+
5568
32nm Core i3/i5/i7 Processors
5669
i7 660UM/640/620, 640LM/620, 620M, 610E 105
5770
i5 540UM/520/430, 540M/520/450/430 105
@@ -65,6 +78,11 @@ Process Processor TjMax(C)
6578
U3400 105
6679
P4505/P4500 90
6780

81+
32nm Atom Processors
82+
Z2460 90
83+
D2700/2550/2500 100
84+
N2850/2800/2650/2600 100
85+
6886
45nm Xeon Processors 5400 Quad-Core
6987
X5492, X5482, X5472, X5470, X5460, X5450 85
7088
E5472, E5462, E5450/40/30/20/10/05 85
@@ -85,6 +103,8 @@ Process Processor TjMax(C)
85103
N475/470/455/450 100
86104
N280/270 90
87105
330/230 125
106+
E680/660/640/620 90
107+
E680T/660T/640T/620T 110
88108

89109
45nm Core2 Processors
90110
Solo ULV SU3500/3300 100

‎MAINTAINERS

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ F: drivers/net/appletalk/
579579
F: net/appletalk/
580580

581581
ARASAN COMPACT FLASH PATA CONTROLLER
582-
M: Viresh Kumar <viresh.kumar@st.com>
582+
M: Viresh Kumar <viresh.linux@gmail.com>
583583
L: [email protected]
584584
S: Maintained
585585
F: include/linux/pata_arasan_cf_data.h
@@ -5296,7 +5296,7 @@ S: Maintained
52965296
F: drivers/pinctrl/
52975297

52985298
PIN CONTROLLER - ST SPEAR
5299-
M: Viresh Kumar <viresh.kumar@st.com>
5299+
M: Viresh Kumar <viresh.linux@gmail.com>
53005300
L: [email protected]
53015301
L: [email protected] (moderated for non-subscribers)
53025302
W: http://www.st.com/spear
@@ -5873,7 +5873,7 @@ S: Maintained
58735873
F: drivers/tty/serial
58745874

58755875
SYNOPSYS DESIGNWARE DMAC DRIVER
5876-
M: Viresh Kumar <viresh.kumar@st.com>
5876+
M: Viresh Kumar <viresh.linux@gmail.com>
58775877
S: Maintained
58785878
F: include/linux/dw_dmac.h
58795879
F: drivers/dma/dw_dmac_regs.h
@@ -6021,7 +6021,7 @@ S: Maintained
60216021
F: drivers/mmc/host/sdhci-s3c.c
60226022

60236023
SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
6024-
M: Viresh Kumar <viresh.kumar@st.com>
6024+
M: Viresh Kumar <viresh.linux@gmail.com>
60256025
L: [email protected]
60266026
L: [email protected]
60276027
S: Maintained
@@ -6377,7 +6377,7 @@ S: Maintained
63776377
F: include/linux/compiler.h
63786378

63796379
SPEAR PLATFORM SUPPORT
6380-
M: Viresh Kumar <viresh.kumar@st.com>
6380+
M: Viresh Kumar <viresh.linux@gmail.com>
63816381
M: Shiraz Hashim <[email protected]>
63826382
L: [email protected]
63836383
L: [email protected] (moderated for non-subscribers)
@@ -6386,7 +6386,7 @@ S: Maintained
63866386
F: arch/arm/plat-spear/
63876387

63886388
SPEAR13XX MACHINE SUPPORT
6389-
M: Viresh Kumar <viresh.kumar@st.com>
6389+
M: Viresh Kumar <viresh.linux@gmail.com>
63906390
M: Shiraz Hashim <[email protected]>
63916391
L: [email protected]
63926392
L: [email protected] (moderated for non-subscribers)
@@ -6395,7 +6395,7 @@ S: Maintained
63956395
F: arch/arm/mach-spear13xx/
63966396

63976397
SPEAR3XX MACHINE SUPPORT
6398-
M: Viresh Kumar <viresh.kumar@st.com>
6398+
M: Viresh Kumar <viresh.linux@gmail.com>
63996399
M: Shiraz Hashim <[email protected]>
64006400
L: [email protected]
64016401
L: [email protected] (moderated for non-subscribers)
@@ -6406,15 +6406,15 @@ F: arch/arm/mach-spear3xx/
64066406
SPEAR6XX MACHINE SUPPORT
64076407
M: Rajeev Kumar <[email protected]>
64086408
M: Shiraz Hashim <[email protected]>
6409-
M: Viresh Kumar <viresh.kumar@st.com>
6409+
M: Viresh Kumar <viresh.linux@gmail.com>
64106410
L: [email protected]
64116411
L: [email protected] (moderated for non-subscribers)
64126412
W: http://www.st.com/spear
64136413
S: Maintained
64146414
F: arch/arm/mach-spear6xx/
64156415

64166416
SPEAR CLOCK FRAMEWORK SUPPORT
6417-
M: Viresh Kumar <viresh.kumar@st.com>
6417+
M: Viresh Kumar <viresh.linux@gmail.com>
64186418
L: [email protected]
64196419
L: [email protected] (moderated for non-subscribers)
64206420
W: http://www.st.com/spear
@@ -7421,7 +7421,7 @@ F: include/linux/vlynq.h
74217421

74227422
VME SUBSYSTEM
74237423
M: Martyn Welch <[email protected]>
7424-
M: Manohar Vanga <manohar.vanga@cern.ch>
7424+
M: Manohar Vanga <manohar.vanga@gmail.com>
74257425
M: Greg Kroah-Hartman <[email protected]>
74267426
L: [email protected]
74277427
S: Maintained

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 5
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc3
4+
EXTRAVERSION = -rc4
55
NAME = Saber-toothed Squirrel
66

77
# *DOCUMENTATION*
@@ -561,6 +561,8 @@ else
561561
KBUILD_CFLAGS += -O2
562562
endif
563563

564+
include $(srctree)/arch/$(SRCARCH)/Makefile
565+
564566
ifdef CONFIG_READABLE_ASM
565567
# Disable optimizations that make assembler listings hard to read.
566568
# reorder blocks reorders the control in the function
@@ -571,8 +573,6 @@ KBUILD_CFLAGS += $(call cc-option,-fno-reorder-blocks,) \
571573
$(call cc-option,-fno-partial-inlining)
572574
endif
573575

574-
include $(srctree)/arch/$(SRCARCH)/Makefile
575-
576576
ifneq ($(CONFIG_FRAME_WARN),0)
577577
KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
578578
endif

‎arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ config ARCH_ORION5X
589589
select PCI
590590
select ARCH_REQUIRE_GPIOLIB
591591
select GENERIC_CLOCKEVENTS
592+
select NEED_MACH_IO_H
592593
select PLAT_ORION
593594
help
594595
Support for the following Marvell Orion 5x series SoCs:

‎arch/arm/boot/dts/omap2.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
compatible = "ti,omap2-intc";
4545
interrupt-controller;
4646
#interrupt-cells = <1>;
47+
ti,intc-size = <96>;
48+
reg = <0x480FE000 0x1000>;
4749
};
4850

4951
uart1: serial@4806a000 {

‎arch/arm/boot/dts/spear1310-evb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for SPEAr1310 Evaluation Baord
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear1310.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for all SPEAr1310 SoCs
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear1340-evb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for SPEAr1340 Evaluation Baord
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear1340.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for all SPEAr1340 SoCs
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear13xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for all SPEAr13xx SoCs
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear300-evb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for SPEAr300 Evaluation Baord
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear300.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for SPEAr300 SoC
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear310-evb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for SPEAr310 Evaluation Baord
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear310.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for SPEAr310 SoC
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear320-evb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for SPEAr320 Evaluation Baord
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear320.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for SPEAr320 SoC
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

‎arch/arm/boot/dts/spear3xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DTS file for all SPEAr3xx SoCs
33
*
4-
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
4+
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
55
*
66
* The code contained herein is licensed under the GNU General Public
77
* License. You may obtain a copy of the GNU General Public License

0 commit comments

Comments
 (0)