msm: 9615: Add I2S CODEC pdata only if TABLA CONFIG is enabled
To prevent a compilation error when CONFIG_WCD9310_CODEC is not
turned on, move msm9615_i2c_devices so it is always present and
non CODEC devices can be added. Add CODEC pdata only when
CONFIG_WCD9310_CODEC is enabled.
Change-Id: I4d9723971c04df7120565db0a4280660db06cc7f
Signed-off-by: Shiv Maliyappanahalli <smaliyap@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-9615.c b/arch/arm/mach-msm/board-9615.c
index df114a3..bada29c 100644
--- a/arch/arm/mach-msm/board-9615.c
+++ b/arch/arm/mach-msm/board-9615.c
@@ -471,14 +471,6 @@
},
};
-static struct i2c_registry msm9615_i2c_devices[] __initdata = {
- {
- I2C_SURF | I2C_FFA | I2C_FLUID,
- MSM_9615_GSBI5_QUP_I2C_BUS_ID,
- wcd9xxx_device_info,
- ARRAY_SIZE(wcd9xxx_device_info),
- },
-};
/*
* MDM9x15 I2S.
*/
@@ -561,6 +553,17 @@
};
#endif
+static struct i2c_registry msm9615_i2c_devices[] __initdata = {
+#ifdef CONFIG_WCD9310_CODEC
+ {
+ I2C_SURF | I2C_FFA | I2C_FLUID,
+ MSM_9615_GSBI5_QUP_I2C_BUS_ID,
+ wcd9xxx_device_info,
+ ARRAY_SIZE(wcd9xxx_device_info),
+ },
+#endif
+};
+
static struct slim_boardinfo msm_slim_devices[] = {
/* add slimbus slaves as needed */
#ifdef CONFIG_WCD9310_CODEC