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

Commit 6db9a0f3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus

parents c400c9e2 18b022eb

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5176,7 +5176,7 @@ SAMSUNG AUDIO (ASoC) DRIVERS 
M:	Jassi Brar <jassi.brar@samsung.com>

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

S:	Supported

F:	sound/soc/s3c24xx

F:	sound/soc/samsung



TLG2300 VIDEO4LINUX-2 DRIVER

M:	Huang Shijie <shijie8@gmail.com>

arch/arm/mach-kirkwood/openrd-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void __init openrd_init(void) 


	kirkwood_i2c_init();



	if (machine_is_openrd_client()) {

	if (machine_is_openrd_client() || machine_is_openrd_ultimate()) {

		i2c_register_board_info(0, i2c_board_info,

			ARRAY_SIZE(i2c_board_info));

		kirkwood_audio_init();

arch/arm/mach-s3c2410/mach-h1940.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static struct platform_device *h1940_devices[] __initdata = { 
	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_pcm,

	&samsung_asoc_dma,

	&s3c_device_usbgadget,

	&h1940_device_leds,

	&h1940_device_bluetooth,

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

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ static struct platform_device *rx1950_devices[] __initdata = { 
	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_pcm,

	&samsung_asoc_dma,

	&s3c_device_usbgadget,

	&s3c_device_rtc,

	&s3c_device_nand,

arch/arm/mach-s3c64xx/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static struct clksrc_clk clksrcs[] = { 
	}, {

		.clk	= {

			.name		= "audio-bus",

			.id		= -1,  /* There's only one IISv4 port */

			.id		= 2,

			.ctrlbit        = S3C6410_CLKCON_SCLK_AUDIO2,

			.enable		= s3c64xx_sclk_ctrl,

		},