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

Commit f22d806b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus 

* fix/asoc:
  ASoC: Fix warning in wm9705
  ASoC: OMAP: Update contact addresses
  ASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR
parents 9bc5df22 516ef69f

sound/soc/codecs/wm9705.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int wm9705_reset(struct snd_soc_codec *codec) 
}



#ifdef CONFIG_PM

static int wm9705_soc_suspend(struct platform_device *pdev)

static int wm9705_soc_suspend(struct platform_device *pdev, pm_message_t msg)

{

	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_codec *codec = socdev->card->codec;

sound/soc/omap/n810.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -417,6 +417,6 @@ static void __exit n810_soc_exit(void) 
module_init(n810_soc_init);

module_exit(n810_soc_exit);



MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");

MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");

MODULE_DESCRIPTION("ALSA SoC Nokia N810");

MODULE_LICENSE("GPL");

sound/soc/omap/omap-mcbsp.c

+3 −2
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 *          Peter Ujfalusi <peter.ujfalusi@nokia.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -532,6 +533,6 @@ static void __exit snd_omap_mcbsp_exit(void) 
}

module_exit(snd_omap_mcbsp_exit);



MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");

MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");

MODULE_DESCRIPTION("OMAP I2S SoC Interface");

MODULE_LICENSE("GPL");

sound/soc/omap/omap-mcbsp.h

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 *          Peter Ujfalusi <peter.ujfalusi@nokia.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

sound/soc/omap/omap-pcm.c

+3 −2
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 *          Peter Ujfalusi <peter.ujfalusi@nokia.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -367,6 +368,6 @@ static void __exit omap_soc_platform_exit(void) 
}

module_exit(omap_soc_platform_exit);



MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");

MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");

MODULE_DESCRIPTION("OMAP PCM DMA module");

MODULE_LICENSE("GPL");