1. 05 Dec, 2011 6 commits
  2. 04 Dec, 2011 5 commits
    • Mark Brown's avatar
      Merge branch 'for-3.2' into for-3.3 · b71951d6
      Mark Brown authored
      b71951d6
    • Axel Lin's avatar
      ASoC: Make SND_SOC_MX27VIS_AIC32X4 depend on I2C · 570a2429
      Axel Lin authored
      SND_SOC_MX27VIS_AIC32X4 selects SND_SOC_TLV320AIC32X4,
      but SND_SOC_TLV320AIC32X4 needs CONFIG_I2C.
      So we need to make SND_SOC_MX27VIS_AIC32X4 depend on I2C.
      otherwise I got below build error if CONFIG_I2C is not selected.
      
        CC      sound/soc/codecs/tlv320aic32x4.o
      sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_read':
      sound/soc/codecs/tlv320aic32x4.c:323: error: implicit declaration of function 'i2c_smbus_read_byte_data'
      sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_probe':
      sound/soc/codecs/tlv320aic32x4.c:641: error: 'i2c_master_send' undeclared (first use in this function)
      sound/soc/codecs/tlv320aic32x4.c:641: error: (Each undeclared identifier is reported only once
      sound/soc/codecs/tlv320aic32x4.c:641: error: for each function it appears in.)
      sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_modinit':
      sound/soc/codecs/tlv320aic32x4.c:763: error: implicit declaration of function 'i2c_add_driver'
      sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_exit':
      sound/soc/codecs/tlv320aic32x4.c:774: error: implicit declaration of function 'i2c_del_driver'
      make[3]: *** [sound/soc/codecs/tlv320aic32x4.o] Error 1
      make[2]: *** [sound/soc/codecs] Error 2
      make[1]: *** [sound/soc] Error 2
      make: *** [sound] Error 2
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      570a2429
    • Axel Lin's avatar
      ASoC: Fix dependency for SND_SOC_RAUMFELD and SND_PXA2XX_SOC_HX4700 · b971c370
      Axel Lin authored
      SND_SOC_RAUMFELD selects SND_SOC_CS4270 which needs CONFIG_I2C,
      and also selects SND_SOC_AK4104 which needs SPI_MASTER.
      Thus make SND_SOC_RAUMFELD depend on I2C && SPI_MASTER.
      
      Add depend on SPI_MASTER to fix below build error if CONFIG_SPI_MASTER
      is not selected.
      
        LD      .tmp_vmlinux1
      sound/built-in.o: In function `ak4104_spi_write':
      last.c:(.text+0x290cc): undefined reference to `spi_sync'
      sound/built-in.o: In function `ak4104_probe':
      last.c:(.text+0x292a0): undefined reference to `spi_write_then_read'
      sound/built-in.o: In function `ak4104_spi_probe':
      last.c:(.text+0x29398): undefined reference to `spi_setup'
      sound/built-in.o: In function `ak4104_init':
      last.c:(.init.text+0x4ec): undefined reference to `spi_register_driver'
      make: *** [.tmp_vmlinux1] Error 1
      
      Add depend on I2C to fix below build error if CONFIG_I2C is not selected:
        CC      sound/soc/codecs/cs4270.o
      sound/soc/codecs/cs4270.c: In function 'cs4270_i2c_probe':
      sound/soc/codecs/cs4270.c:657: error: implicit declaration of function 'i2c_smbus_read_byte_data'
      sound/soc/codecs/cs4270.c: In function 'cs4270_init':
      sound/soc/codecs/cs4270.c:730: error: implicit declaration of function 'i2c_add_driver'
      sound/soc/codecs/cs4270.c: In function 'cs4270_exit':
      sound/soc/codecs/cs4270.c:736: error: implicit declaration of function 'i2c_del_driver'
      make[3]: *** [sound/soc/codecs/cs4270.o] Error 1
      make[2]: *** [sound/soc/codecs] Error 2
      make[1]: *** [sound/soc] Error 2
      make: *** [sound] Error 2
      
      SND_PXA2XX_SOC_HX4700 selects SND_SOC_AK4641 which needs CONFIG_I2C.
      Thus make SND_PXA2XX_SOC_HX4700 depend on I2C.
      
      Add depend on I2C to fix below build error if CONFIG_I2C is not selected:
        CC      sound/soc/codecs/ak4641.o
      sound/soc/codecs/ak4641.c: In function 'ak4641_modinit':
      sound/soc/codecs/ak4641.c:646: error: implicit declaration of function 'i2c_add_driver'
      sound/soc/codecs/ak4641.c: In function 'ak4641_exit':
      sound/soc/codecs/ak4641.c:656: error: implicit declaration of function 'i2c_del_driver'
      make[3]: *** [sound/soc/codecs/ak4641.o] Error 1
      make[2]: *** [sound/soc/codecs] Error 2
      make[1]: *** [sound/soc] Error 2
      make: *** [sound] Error 2
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      b971c370
    • Axel Lin's avatar
      ASoC: uda1380: Return proper error in uda1380_modinit failure path · ef149770
      Axel Lin authored
      Return proper error for uda1380_modinit if i2c_add_driver() fails.
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      ef149770
    • Axel Lin's avatar
      ASoC: Make SND_SOC_LITTLEMILL select MFD_WM8994 · dd85ecc2
      Axel Lin authored
      SND_SOC_LITTLEMILL selects SND_SOC_WM8994, but SND_SOC_WM8994 needs MFD_WM8994.
      Thus we need to select MFD_WM8994 to fix below build error:
      
        LD      .tmp_vmlinux1
      sound/built-in.o: In function `wm8994_write':
      sound/soc/codecs/wm8994.c:201: undefined reference to `wm8994_reg_write'
      sound/built-in.o: In function `wm8994_read':
      sound/soc/codecs/wm8994.c:222: undefined reference to `wm8994_reg_read'
      sound/built-in.o: In function `wm8994_resume':
      sound/soc/codecs/wm8994.c:2847: undefined reference to `wm8994_reg_read'
      sound/built-in.o: In function `wm8994_codec_probe':
      sound/soc/codecs/wm8994.c:3501: undefined reference to `wm8994_reg_read'
      sound/soc/codecs/wm8994.c:3660: undefined reference to `wm8994_reg_read'
      sound/soc/codecs/wm8994.c:3672: undefined reference to `wm8994_reg_read'
      sound/built-in.o: In function `wm8958_dsp2_fw':
      sound/soc/codecs/wm8958-dsp2.c:154: undefined reference to `wm8994_bulk_write'
      make: *** [.tmp_vmlinux1] Error 1
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      dd85ecc2
  3. 03 Dec, 2011 29 commits