Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 897d960fe16f686ae5d5ef37251334c6bb850481..11ce4b24befdc76aa441ede512542cc57e82f589 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -710,10 +710,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
        .vio                    = &rx51_vio,
 };
 
-static struct aic3x_pdata rx51_aic3x_data __initdata = {
-       .gpio_reset             = 60,
-};
-
 static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = {
        .id                     = TPA6130A2,
        .power_gpio             = 98,

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index c07465720cdb2d8c134f6fc84dad96841c64b081..efae8b53fd64134a8095e0d362bf76815139e64b 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1281,6 +1281,8 @@ static int aic3x_probe(struct snd_soc_codec *codec)
        codec->hw_write = (hw_write_t) i2c_master_send;
        codec->control_data = aic3x->control_data;
 
+       aic3x_init(codec);
+
        if (aic3x->setup) {
                /* setup GPIO functions */
                aic3x_write(codec, AIC3X_GPIO1_REG,
@@ -1289,8 +1291,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
                            (aic3x->setup->gpio_func[1] & 0xf) << 4);
        }
 
-       aic3x_init(codec);
-
        snd_soc_add_controls(codec, aic3x_snd_controls,
                             ARRAY_SIZE(aic3x_snd_controls));
        if (aic3x->model == AIC3X_MODEL_3007)

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index d1d8098923ce103dec46748d27c6d66fb613329c..04b5723bf89b5b4f289a6339e97f661fbd9dbccf 100644 (file)
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -146,9 +146,9 @@ static int rx51_spk_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *k, int event)
 {
        if (SND_SOC_DAPM_EVENT_ON(event))
-               gpio_set_value(RX51_SPEAKER_AMP_TWL_GPIO, 1);
+               gpio_set_value_cansleep(RX51_SPEAKER_AMP_TWL_GPIO, 1);
        else
-               gpio_set_value(RX51_SPEAKER_AMP_TWL_GPIO, 0);
+               gpio_set_value_cansleep(RX51_SPEAKER_AMP_TWL_GPIO, 0);
 
        return 0;
 }