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

Commit 809435ff authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/urgent' of... 

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
parents 32673822 058e297d

Documentation/sound/alsa/SB-Live-mixer.txt

+3 −3
Original line number Diff line number Diff line
@@ -87,14 +87,14 @@ accumulator. ALSA uses accumulators 0 and 1 for left and right PCM. 
The result is forwarded to the ADC capture FIFO (thus to the standard capture

PCM device).



name='Music Playback Volume',index=0

name='Synth Playback Volume',index=0



This control is used to attenuate samples for left and right MIDI FX-bus

accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples.

The result samples are forwarded to the front DAC PCM slots of the AC97 codec.



name='Music Capture Volume',index=0

name='Music Capture Switch',index=0

name='Synth Capture Volume',index=0

name='Synth Capture Switch',index=0



These controls are used to attenuate samples for left and right MIDI FX-bus

accumulator. ALSA uses accumulators 4 and 5 for left and right PCM.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5396,7 +5396,7 @@ F: drivers/media/video/*7146* 
F:	include/media/*7146*



SAMSUNG AUDIO (ASoC) DRIVERS

M:	Jassi Brar <jassi.brar@samsung.com>

M:	Jassi Brar <jassisinghbrar@gmail.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/samsung

arch/arm/mach-s3c2440/mach-gta02.c

+5 −0
Original line number Diff line number Diff line
@@ -409,6 +409,10 @@ struct platform_device s3c24xx_pwm_device = { 
	.num_resources	= 0,

};



static struct platform_device gta02_dfbmcs320_device = {

	.name = "dfbmcs320",

};



static struct i2c_board_info gta02_i2c_devs[] __initdata = {

	{

		I2C_BOARD_INFO("pcf50633", 0x73),
@@ -523,6 +527,7 @@ static struct platform_device *gta02_devices[] __initdata = { 
	&s3c_device_iis,

	&samsung_asoc_dma,

	&s3c_device_i2c0,

	&gta02_dfbmcs320_device,

	&gta02_buttons_device,

	&s3c_device_adc,

	&s3c_device_ts,

arch/arm/mach-ux500/board-mop500.c

+10 −9
Original line number Diff line number Diff line
@@ -178,16 +178,15 @@ static struct i2c_board_info __initdata mop500_i2c0_devices[] = { 
		.irq		= NOMADIK_GPIO_TO_IRQ(217),

		.platform_data  = &mop500_tc35892_data,

	},

};



	/* I2C0 devices only available prior to HREFv60 */

static struct i2c_board_info __initdata mop500_i2c0_old_devices[] = {

	{

		I2C_BOARD_INFO("tps61052", 0x33),

		.platform_data  = &mop500_tps61052_data,

	},

};



#define NUM_PRE_V60_I2C0_DEVICES 1



static struct i2c_board_info __initdata mop500_i2c2_devices[] = {

	{

		/* lp5521 LED driver, 1st device */
@@ -425,6 +424,8 @@ static void __init mop500_uart_init(void) 


static void __init mop500_init_machine(void)

{

	int i2c0_devs;



	/*

	 * The HREFv60 board removed a GPIO expander and routed

	 * all these GPIO pins to the internal GPIO controller
@@ -448,11 +449,11 @@ static void __init mop500_init_machine(void) 


	platform_device_register(&ab8500_device);



	i2c_register_board_info(0, mop500_i2c0_devices,

				ARRAY_SIZE(mop500_i2c0_devices));

	if (!machine_is_hrefv60())

		i2c_register_board_info(0, mop500_i2c0_old_devices,

					ARRAY_SIZE(mop500_i2c0_old_devices));

	i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);

	if (machine_is_hrefv60())

		i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;



	i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);

	i2c_register_board_info(2, mop500_i2c2_devices,

				ARRAY_SIZE(mop500_i2c2_devices));

}

arch/x86/kernel/apm_32.c

+5 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ 
#include <linux/kthread.h>

#include <linux/jiffies.h>

#include <linux/acpi.h>

#include <linux/syscore_ops.h>



#include <asm/system.h>

#include <asm/uaccess.h>
@@ -1238,6 +1239,7 @@ static int suspend(int vetoable) 


	local_irq_disable();

	sysdev_suspend(PMSG_SUSPEND);

	syscore_suspend();



	local_irq_enable();
@@ -1255,6 +1257,7 @@ static int suspend(int vetoable) 
		apm_error("suspend", err);

	err = (err == APM_SUCCESS) ? 0 : -EIO;



	syscore_resume();

	sysdev_resume();

	local_irq_enable();
@@ -1280,6 +1283,7 @@ static void standby(void) 


	local_irq_disable();

	sysdev_suspend(PMSG_SUSPEND);

	syscore_suspend();

	local_irq_enable();



	err = set_system_power_state(APM_STATE_STANDBY);
@@ -1287,6 +1291,7 @@ static void standby(void) 
		apm_error("standby", err);



	local_irq_disable();

	syscore_resume();

	sysdev_resume();

	local_irq_enable();