Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6f1f12f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'omap-devel-d-for-3.6' of... 

Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes-non-critical

Some OMAP AM35xx fixes.

The powerdomain and clockdomain data for the AM35xx are finally fixed.
The AM35xx EMAC/MDIO Ethernet controller integration code has been
converted to use the OMAP device and hwmod framework.  Also the UART4
and HSOTGUSB warnings have been fixed.
parents e0246e8e a77e1c4d

.mailmap

+1 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/ABI/testing/sysfs-bus-iio

+31 −0
Original line number Original line Diff line number Diff line
@@ -219,6 +219,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_scale 
What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_scale

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_scale

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_scale

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_scale

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 
What:		/sys/.../iio:deviceX/in_voltageX_scale_available

What:		/sys/.../iio:deviceX/in_voltageX_scale_available

What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available

What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available

What:		/sys/.../iio:deviceX/out_voltageX_scale_available

What:		/sys/.../iio:deviceX/out_voltageX_scale_available

What:		/sys/.../iio:deviceX/out_altvoltageX_scale_available

What:		/sys/.../iio:deviceX/in_capacitance_scale_available

What:		/sys/.../iio:deviceX/in_capacitance_scale_available

KernelVersion:	2.635

KernelVersion:	2.635

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org
@@ -298,14 +300,19 @@ Description: 
		gives the 3dB frequency of the filter in Hz.

		gives the 3dB frequency of the filter in Hz.





What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_raw

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_raw

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw

KernelVersion:	2.6.37

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Description:

Description:

		Raw (unscaled, no bias etc.) output voltage for

		Raw (unscaled, no bias etc.) output voltage for

		channel Y.  The number must always be specified and

		channel Y.  The number must always be specified and

		unique if the output corresponds to a single channel.

		unique if the output corresponds to a single channel.

		While DAC like devices typically use out_voltage,

		a continuous frequency generating device, such as

		a DDS or PLL should use out_altvoltage.





What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw

KernelVersion:	2.6.37

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Description:

Description:
@@ -316,6 +323,8 @@ Description: 




What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown_mode

KernelVersion:	2.6.38

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Description:

Description:
@@ -330,6 +339,8 @@ Description: 




What:		/sys/.../iio:deviceX/out_votlageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_votlageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_voltage_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_voltage_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available

KernelVersion:	2.6.38

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Description:

Description:
@@ -338,6 +349,8 @@ Description: 




What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown

KernelVersion:	2.6.38

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Description:

Description:
@@ -346,6 +359,24 @@ Description: 
		normal operation. Y may be suppressed if all outputs are

		normal operation. Y may be suppressed if all outputs are

		controlled together.

		controlled together.





What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Output frequency for channel Y in Hz. The number must always be

		specified and unique if the output corresponds to a single

		channel.



What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Phase in radians of one frequency/clock output Y

		(out_altvoltageY) relative to another frequency/clock output

		(out_altvoltageZ) of the device X. The number must always be

		specified and unique if the output corresponds to a single

		channel.



What:		/sys/bus/iio/devices/iio:deviceX/events

What:		/sys/bus/iio/devices/iio:deviceX/events

KernelVersion:	2.6.35

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Documentation/arm/SPEAr/overview.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,4 +60,4 @@ Introduction 
  Document Author

  Document Author

  ---------------

  ---------------





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

Documentation/hwmon/coretemp

+21 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,9 @@ Supported chips: 
    Prefix: 'coretemp'

    Prefix: 'coretemp'

    CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),

    CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),

                              0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),

                              0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),

                              0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield)

                              0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield),

                              0x26 (Tunnel Creek Atom), 0x27 (Medfield Atom),

                              0x36 (Cedar Trail Atom)

    Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual

    Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual

               Volume 3A: System Programming Guide

               Volume 3A: System Programming Guide

               http://softwarecommunity.intel.com/Wiki/Mobility/720.htm

               http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
@@ -52,6 +54,17 @@ Some information comes from ark.intel.com 




Process		Processor					TjMax(C)

Process		Processor					TjMax(C)





22nm		Core i5/i7 Processors

		i7 3920XM, 3820QM, 3720QM, 3667U, 3520M		105

		i5 3427U, 3360M/3320M				105

		i7 3770/3770K					105

		i5 3570/3570K, 3550, 3470/3450			105

		i7 3770S					103

		i5 3570S/3550S, 3475S/3470S/3450S		103

		i7 3770T					94

		i5 3570T					94

		i5 3470T					91



32nm		Core i3/i5/i7 Processors

32nm		Core i3/i5/i7 Processors

		i7 660UM/640/620, 640LM/620, 620M, 610E		105

		i7 660UM/640/620, 640LM/620, 620M, 610E		105

		i5 540UM/520/430, 540M/520/450/430		105

		i5 540UM/520/430, 540M/520/450/430		105
@@ -65,6 +78,11 @@ Process Processor TjMax(C) 
		U3400						105

		U3400						105

		P4505/P4500 					90

		P4505/P4500 					90





32nm		Atom Processors

		Z2460						90

		D2700/2550/2500					100

		N2850/2800/2650/2600				100



45nm		Xeon Processors 5400 Quad-Core

45nm		Xeon Processors 5400 Quad-Core

		X5492, X5482, X5472, X5470, X5460, X5450	85

		X5492, X5482, X5472, X5470, X5460, X5450	85

		E5472, E5462, E5450/40/30/20/10/05		85

		E5472, E5462, E5450/40/30/20/10/05		85
@@ -85,6 +103,8 @@ Process Processor TjMax(C) 
		N475/470/455/450				100

		N475/470/455/450				100

		N280/270					90

		N280/270					90

		330/230						125

		330/230						125

		E680/660/640/620				90

		E680T/660T/640T/620T				110





45nm		Core2 Processors

45nm		Core2 Processors

		Solo ULV SU3500/3300				100

		Solo ULV SU3500/3300				100

MAINTAINERS

+10 −10
Original line number Original line Diff line number Diff line
@@ -579,7 +579,7 @@ F: drivers/net/appletalk/ 
F:	net/appletalk/

F:	net/appletalk/





ARASAN COMPACT FLASH PATA CONTROLLER

ARASAN COMPACT FLASH PATA CONTROLLER

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	linux-ide@vger.kernel.org

L:	linux-ide@vger.kernel.org

S:	Maintained

S:	Maintained

F:	include/linux/pata_arasan_cf_data.h

F:	include/linux/pata_arasan_cf_data.h
@@ -5296,7 +5296,7 @@ S: Maintained 
F:	drivers/pinctrl/

F:	drivers/pinctrl/





PIN CONTROLLER - ST SPEAR

PIN CONTROLLER - ST SPEAR

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	spear-devel@list.st.com

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.st.com/spear

W:	http://www.st.com/spear
@@ -5873,7 +5873,7 @@ S: Maintained 
F:	drivers/tty/serial

F:	drivers/tty/serial





SYNOPSYS DESIGNWARE DMAC DRIVER

SYNOPSYS DESIGNWARE DMAC DRIVER

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

S:	Maintained

S:	Maintained

F:	include/linux/dw_dmac.h

F:	include/linux/dw_dmac.h

F:	drivers/dma/dw_dmac_regs.h

F:	drivers/dma/dw_dmac_regs.h
@@ -6021,7 +6021,7 @@ S: Maintained 
F:	drivers/mmc/host/sdhci-s3c.c

F:	drivers/mmc/host/sdhci-s3c.c





SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER

SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	spear-devel@list.st.com

L:	spear-devel@list.st.com

L:	linux-mmc@vger.kernel.org

L:	linux-mmc@vger.kernel.org

S:	Maintained

S:	Maintained
@@ -6377,7 +6377,7 @@ S: Maintained 
F:	include/linux/compiler.h

F:	include/linux/compiler.h





SPEAR PLATFORM SUPPORT

SPEAR PLATFORM SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

L:	spear-devel@list.st.com

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6386,7 +6386,7 @@ S: Maintained 
F:	arch/arm/plat-spear/

F:	arch/arm/plat-spear/





SPEAR13XX MACHINE SUPPORT

SPEAR13XX MACHINE SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

L:	spear-devel@list.st.com

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6395,7 +6395,7 @@ S: Maintained 
F:	arch/arm/mach-spear13xx/

F:	arch/arm/mach-spear13xx/





SPEAR3XX MACHINE SUPPORT

SPEAR3XX MACHINE SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

L:	spear-devel@list.st.com

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6406,7 +6406,7 @@ F: arch/arm/mach-spear3xx/ 
SPEAR6XX MACHINE SUPPORT

SPEAR6XX MACHINE SUPPORT

M:	Rajeev Kumar <rajeev-dlh.kumar@st.com>

M:	Rajeev Kumar <rajeev-dlh.kumar@st.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	spear-devel@list.st.com

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.st.com/spear

W:	http://www.st.com/spear
@@ -6414,7 +6414,7 @@ S: Maintained 
F:	arch/arm/mach-spear6xx/

F:	arch/arm/mach-spear6xx/





SPEAR CLOCK FRAMEWORK SUPPORT

SPEAR CLOCK FRAMEWORK SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	spear-devel@list.st.com

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.st.com/spear

W:	http://www.st.com/spear
@@ -7421,7 +7421,7 @@ F: include/linux/vlynq.h 




VME SUBSYSTEM

VME SUBSYSTEM

M:	Martyn Welch <martyn.welch@ge.com>

M:	Martyn Welch <martyn.welch@ge.com>

M:	Manohar Vanga <manohar.vanga@cern.ch>

M:	Manohar Vanga <manohar.vanga@gmail.com>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	devel@driverdev.osuosl.org

L:	devel@driverdev.osuosl.org

S:	Maintained

S:	Maintained