msm: board-msm7627a-bt: Create separate board file for BT-FM

Change-Id: I1e858a8074692ddc97a413595602a7d1d202e472
Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-qrd7627a.c b/arch/arm/mach-msm/board-qrd7627a.c
index e8f6443..109d98d 100644
--- a/arch/arm/mach-msm/board-qrd7627a.c
+++ b/arch/arm/mach-msm/board-qrd7627a.c
@@ -56,8 +56,6 @@
 
 #define PMEM_KERNEL_EBI1_SIZE	0x3A000
 #define MSM_PMEM_AUDIO_SIZE	0x5B000
-#define BAHAMA_SLAVE_ID_FM_ADDR         0x2A
-#define BAHAMA_SLAVE_ID_QMEMBIST_ADDR   0x7B
 #define BAHAMA_SLAVE_ID_FM_REG 0x02
 #define FM_GPIO	83
 #define BT_PCM_BCLK_MODE  0x88
@@ -84,949 +82,11 @@
 	GPIO_CAM_GP_CAMIF_RESET,
 };
 
-	/* FM Platform power and shutdown routines */
-#define FPGA_MSM_CNTRL_REG2 0x90008010
-
-#if defined(CONFIG_BT) && defined(CONFIG_MARIMBA_CORE)
-static int switch_pcm_i2s_reg_mode(int mode)
-{
-	unsigned char reg = 0;
-	int rc = -1;
-	unsigned char set = I2C_PIN_CTL; /*SET PIN CTL mode*/
-	unsigned char unset = I2C_NORMAL; /* UNSET PIN CTL MODE*/
-	struct marimba config = { .mod_id =  SLAVE_ID_BAHAMA};
-
-	if (mode == 0) {
-		/* as we need to switch path to FM we need to move
-		 BT AUX PCM lines to PIN CONTROL mode then move
-		 FM to normal mode.*/
-		for (reg = BT_PCM_BCLK_MODE; reg <= BT_PCM_SYNC_MODE; reg++) {
-			rc = marimba_write(&config, reg, &set, 1);
-			if (rc < 0) {
-				pr_err("pcm pinctl failed = %d", rc);
-				goto err_all;
-			}
-		}
-		for (reg = FM_I2S_SD_MODE; reg <= FM_I2S_SCK_MODE; reg++) {
-			rc = marimba_write(&config, reg, &unset, 1);
-			if (rc < 0) {
-				pr_err("i2s normal failed = %d", rc);
-				goto err_all;
-			}
-		}
-	} else {
-		/* as we need to switch path to AUXPCM we need to move
-		 FM I2S lines to PIN CONTROL mode then move
-		 BT AUX_PCM to normal mode.*/
-		for (reg = FM_I2S_SD_MODE; reg <= FM_I2S_SCK_MODE; reg++) {
-			rc = marimba_write(&config, reg, &set, 1);
-			if (rc < 0) {
-				pr_err("i2s pinctl failed = %d", rc);
-				goto err_all;
-			}
-		}
-		for (reg = BT_PCM_BCLK_MODE; reg <= BT_PCM_SYNC_MODE; reg++) {
-			rc = marimba_write(&config, reg, &unset, 1);
-			if (rc < 0) {
-				pr_err("pcm normal failed = %d", rc);
-				goto err_all;
-			}
-		}
-	}
-
-	return 0;
-
-err_all:
-	return rc;
-}
-static void config_pcm_i2s_mode(int mode)
-{
-	void __iomem *cfg_ptr;
-	u8 reg2;
-
-	cfg_ptr = ioremap_nocache(FPGA_MSM_CNTRL_REG2, sizeof(char));
-
-	if (!cfg_ptr)
-		return;
-	if (mode) {
-		/*enable the pcm mode in FPGA*/
-		reg2 = readb_relaxed(cfg_ptr);
-		if (reg2 == 0) {
-			reg2 = 1;
-			writeb_relaxed(reg2, cfg_ptr);
-		}
-	} else {
-		/*enable i2s mode in FPGA*/
-		reg2 = readb_relaxed(cfg_ptr);
-		if (reg2 == 1) {
-			reg2 = 0;
-			writeb_relaxed(reg2, cfg_ptr);
-		}
-	}
-	iounmap(cfg_ptr);
-}
-
-static unsigned fm_i2s_config_power_on[] = {
-	/*FM_I2S_SD*/
-	GPIO_CFG(68, 1, GPIO_CFG_INPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-	/*FM_I2S_WS*/
-	GPIO_CFG(70, 1, GPIO_CFG_INPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-	/*FM_I2S_SCK*/
-	GPIO_CFG(71, 1, GPIO_CFG_INPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-};
-
-static unsigned fm_i2s_config_power_off[] = {
-	/*FM_I2S_SD*/
-	GPIO_CFG(68, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-	/*FM_I2S_WS*/
-	GPIO_CFG(70, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-	/*FM_I2S_SCK*/
-	GPIO_CFG(71, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-};
-
-static unsigned bt_config_power_on[] = {
-	/*RFR*/
-	GPIO_CFG(43, 2, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-	/*CTS*/
-	GPIO_CFG(44, 2, GPIO_CFG_INPUT,  GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-	/*RX*/
-	GPIO_CFG(45, 2, GPIO_CFG_INPUT,  GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-	/*TX*/
-	GPIO_CFG(46, 2, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-};
-static unsigned bt_config_pcm_on[] = {
-	/*PCM_DOUT*/
-	GPIO_CFG(68, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-	/*PCM_DIN*/
-	GPIO_CFG(69, 1, GPIO_CFG_INPUT,  GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-	/*PCM_SYNC*/
-	GPIO_CFG(70, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-	/*PCM_CLK*/
-	GPIO_CFG(71, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA),
-};
-static unsigned bt_config_power_off[] = {
-	/*RFR*/
-	GPIO_CFG(43, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-	/*CTS*/
-	GPIO_CFG(44, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-	/*RX*/
-	GPIO_CFG(45, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-	/*TX*/
-	GPIO_CFG(46, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-};
-static unsigned bt_config_pcm_off[] = {
-	/*PCM_DOUT*/
-	GPIO_CFG(68, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-	/*PCM_DIN*/
-	GPIO_CFG(69, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-	/*PCM_SYNC*/
-	GPIO_CFG(70, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-	/*PCM_CLK*/
-	GPIO_CFG(71, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_DOWN, GPIO_CFG_2MA),
-};
-
-
-static int config_i2s(int mode)
-{
-	int pin, rc = 0;
-
-	if (mode == FM_I2S_ON) {
-		if (machine_is_msm7627a_qrd1())
-			config_pcm_i2s_mode(0);
-		pr_err("%s mode = FM_I2S_ON", __func__);
-
-		rc = switch_pcm_i2s_reg_mode(0);
-		if (rc) {
-			pr_err("switch mode failed");
-			return rc;
-		}
-		for (pin = 0; pin < ARRAY_SIZE(fm_i2s_config_power_on);
-			pin++) {
-				rc = gpio_tlmm_config(
-					fm_i2s_config_power_on[pin],
-					GPIO_CFG_ENABLE
-					);
-				if (rc < 0)
-					return rc;
-			}
-	} else if (mode == FM_I2S_OFF) {
-		pr_err("%s mode = FM_I2S_OFF", __func__);
-		rc = switch_pcm_i2s_reg_mode(1);
-		if (rc) {
-			pr_err("switch mode failed");
-			return rc;
-		}
-		for (pin = 0; pin < ARRAY_SIZE(fm_i2s_config_power_off);
-			pin++) {
-				rc = gpio_tlmm_config(
-					fm_i2s_config_power_off[pin],
-					GPIO_CFG_ENABLE
-					);
-				if (rc < 0)
-					return rc;
-			}
-	}
-	return rc;
-}
-static int config_pcm(int mode)
-{
-	int pin, rc = 0;
-
-	if (mode == BT_PCM_ON) {
-		if (machine_is_msm7627a_qrd1())
-			config_pcm_i2s_mode(1);
-		pr_err("%s mode =BT_PCM_ON", __func__);
-		rc = switch_pcm_i2s_reg_mode(1);
-		if (rc) {
-			pr_err("switch mode failed");
-			return rc;
-		}
-		for (pin = 0; pin < ARRAY_SIZE(bt_config_pcm_on);
-			pin++) {
-				rc = gpio_tlmm_config(bt_config_pcm_on[pin],
-					GPIO_CFG_ENABLE);
-				if (rc < 0)
-					return rc;
-			}
-	} else if (mode == BT_PCM_OFF) {
-		pr_err("%s mode =BT_PCM_OFF", __func__);
-		rc = switch_pcm_i2s_reg_mode(0);
-		if (rc) {
-			pr_err("switch mode failed");
-			return rc;
-		}
-		for (pin = 0; pin < ARRAY_SIZE(bt_config_pcm_off);
-			pin++) {
-				rc = gpio_tlmm_config(bt_config_pcm_off[pin],
-					GPIO_CFG_ENABLE);
-				if (rc < 0)
-					return rc;
-			}
-
-	}
-
-	return rc;
-}
-
-static int msm_bahama_setup_pcm_i2s(int mode)
-{
-	int fm_state = 0, bt_state = 0;
-	int rc = 0;
-	struct marimba config = { .mod_id =  SLAVE_ID_BAHAMA};
-
-	fm_state = marimba_get_fm_status(&config);
-	bt_state = marimba_get_bt_status(&config);
-
-	switch (mode) {
-	case BT_PCM_ON:
-	case BT_PCM_OFF:
-		if (!fm_state)
-			rc = config_pcm(mode);
-		break;
-	case FM_I2S_ON:
-		rc = config_i2s(mode);
-		break;
-	case FM_I2S_OFF:
-		if (bt_state)
-			rc = config_pcm(BT_PCM_ON);
-		else
-			rc = config_i2s(mode);
-		break;
-	default:
-		rc = -EIO;
-		pr_err("%s:Unsupported mode", __func__);
-	}
-	return rc;
-}
-
-static int bt_set_gpio(int on)
-{
-	int rc = 0;
-	struct marimba config = { .mod_id =  SLAVE_ID_BAHAMA};
-
-	if (on) {
-		rc = gpio_direction_output(GPIO_BT_SYS_REST_EN, 1);
-		msleep(100);
-	} else {
-		if (!marimba_get_fm_status(&config) &&
-				!marimba_get_bt_status(&config)) {
-			gpio_set_value_cansleep(GPIO_BT_SYS_REST_EN, 0);
-			rc = gpio_direction_input(GPIO_BT_SYS_REST_EN);
-			msleep(100);
-		}
-	}
-	if (rc)
-		pr_err("%s: BT sys_reset_en GPIO : Error", __func__);
-
-	return rc;
-}
-static struct regulator *fm_regulator;
-static int fm_radio_setup(struct marimba_fm_platform_data *pdata)
-{
-	int rc = 0;
-	const char *id = "FMPW";
-	uint32_t irqcfg;
-	struct marimba config = { .mod_id =  SLAVE_ID_BAHAMA};
-	u8 value;
-
-	/* Voting for 1.8V Regulator */
-	fm_regulator = regulator_get(NULL , "msme1");
-	if (IS_ERR(fm_regulator)) {
-		rc = PTR_ERR(fm_regulator);
-		pr_err("%s: could not get regulator: %d\n", __func__, rc);
-		goto out;
-	}
-
-	/* Set the voltage level to 1.8V */
-	rc = regulator_set_voltage(fm_regulator, 1800000, 1800000);
-	if (rc < 0) {
-		pr_err("%s: could not set voltage: %d\n", __func__, rc);
-		goto reg_free;
-	}
-
-	/* Enabling the 1.8V regulator */
-	rc = regulator_enable(fm_regulator);
-	if (rc) {
-		pr_err("%s: could not enable regulator: %d\n", __func__, rc);
-		goto reg_free;
-	}
-
-	/* Voting for 19.2MHz clock */
-	rc = pmapp_clock_vote(id, PMAPP_CLOCK_ID_D1,
-			PMAPP_CLOCK_VOTE_ON);
-	if (rc < 0) {
-		pr_err("%s: clock vote failed with :(%d)\n",
-			 __func__, rc);
-		goto reg_disable;
-	}
-
-	rc = bt_set_gpio(1);
-	if (rc) {
-		pr_err("%s: bt_set_gpio = %d", __func__, rc);
-		goto gpio_deconfig;
-	}
-	/*re-write FM Slave Id, after reset*/
-	value = BAHAMA_SLAVE_ID_FM_ADDR;
-	rc = marimba_write_bit_mask(&config,
-			BAHAMA_SLAVE_ID_FM_REG, &value, 1, 0xFF);
-	if (rc < 0) {
-		pr_err("%s: FM Slave ID rewrite Failed = %d", __func__, rc);
-		goto gpio_deconfig;
-	}
-	/* Configuring the FM GPIO */
-	irqcfg = GPIO_CFG(FM_GPIO, 0, GPIO_CFG_INPUT, GPIO_CFG_NO_PULL,
-			GPIO_CFG_2MA);
-
-	rc = gpio_tlmm_config(irqcfg, GPIO_CFG_ENABLE);
-	if (rc) {
-		pr_err("%s: gpio_tlmm_config(%#x)=%d\n",
-			 __func__, irqcfg, rc);
-		goto gpio_deconfig;
-	}
-
-	return 0;
-
-gpio_deconfig:
-	pmapp_clock_vote(id, PMAPP_CLOCK_ID_D1,
-		PMAPP_CLOCK_VOTE_OFF);
-	bt_set_gpio(0);
-reg_disable:
-	regulator_disable(fm_regulator);
-reg_free:
-	regulator_put(fm_regulator);
-	fm_regulator = NULL;
-out:
-	return rc;
-};
-
-static void fm_radio_shutdown(struct marimba_fm_platform_data *pdata)
-{
-	int rc;
-	const char *id = "FMPW";
-
-	/* Releasing the GPIO line used by FM */
-	uint32_t irqcfg = GPIO_CFG(FM_GPIO, 0, GPIO_CFG_INPUT, GPIO_CFG_PULL_UP,
-		GPIO_CFG_2MA);
-
-	rc = gpio_tlmm_config(irqcfg, GPIO_CFG_ENABLE);
-	if (rc)
-		pr_err("%s: gpio_tlmm_config(%#x)=%d\n",
-			 __func__, irqcfg, rc);
-
-	/* Releasing the 1.8V Regulator */
-	if (!IS_ERR_OR_NULL(fm_regulator)) {
-		rc = regulator_disable(fm_regulator);
-		if (rc)
-			pr_err("%s: could not disable regulator: %d\n",
-					__func__, rc);
-		regulator_put(fm_regulator);
-		fm_regulator = NULL;
-	}
-
-	/* Voting off the clock */
-	rc = pmapp_clock_vote(id, PMAPP_CLOCK_ID_D1,
-		PMAPP_CLOCK_VOTE_OFF);
-	if (rc < 0)
-		pr_err("%s: voting off failed with :(%d)\n",
-			__func__, rc);
-	rc = bt_set_gpio(0);
-	if (rc)
-		pr_err("%s: bt_set_gpio = %d", __func__, rc);
-}
-
-static struct marimba_fm_platform_data marimba_fm_pdata = {
-	.fm_setup = fm_radio_setup,
-	.fm_shutdown = fm_radio_shutdown,
-	.irq = MSM_GPIO_TO_INT(FM_GPIO),
-	.vreg_s2 = NULL,
-	.vreg_xo_out = NULL,
-	/* Configuring the FM SoC as I2S Master */
-	.is_fm_soc_i2s_master = true,
-	.config_i2s_gpio = msm_bahama_setup_pcm_i2s,
-};
-#endif
-
 static struct platform_device msm_wlan_ar6000_pm_device = {
 	.name           = "wlan_ar6000_pm_dev",
 	.id             = -1,
 };
 
-#if defined(CONFIG_BT) && defined(CONFIG_MARIMBA_CORE)
-
-static struct platform_device msm_bt_power_device = {
-	.name = "bt_power",
-};
-struct bahama_config_register {
-		u8 reg;
-		u8 value;
-		u8 mask;
-};
-struct bt_vreg_info {
-	const char *name;
-	unsigned int pmapp_id;
-	unsigned int min_level;
-	unsigned int max_level;
-	unsigned int is_pin_controlled;
-	struct regulator *reg;
-};
-static struct bt_vreg_info bt_vregs[] = {
-	{"msme1", 2, 1800000, 1800000, 0, NULL},
-	{"bt", 21, 2900000, 3050000, 1, NULL}
-};
-
-static int bahama_bt(int on)
-{
-	int rc = 0;
-	int i;
-
-	struct marimba config = { .mod_id =  SLAVE_ID_BAHAMA};
-
-	struct bahama_variant_register {
-		const size_t size;
-		const struct bahama_config_register *set;
-	};
-
-	const struct bahama_config_register *p;
-
-	u8 version;
-
-	const struct bahama_config_register v10_bt_on[] = {
-		{ 0xE9, 0x00, 0xFF },
-		{ 0xF4, 0x80, 0xFF },
-		{ 0xE4, 0x00, 0xFF },
-		{ 0xE5, 0x00, 0x0F },
-#ifdef CONFIG_WLAN
-		{ 0xE6, 0x38, 0x7F },
-		{ 0xE7, 0x06, 0xFF },
-#endif
-		{ 0xE9, 0x21, 0xFF },
-		{ 0x01, 0x0C, 0x1F },
-		{ 0x01, 0x08, 0x1F },
-	};
-
-	const struct bahama_config_register v20_bt_on_fm_off[] = {
-		{ 0x11, 0x0C, 0xFF },
-		{ 0x13, 0x01, 0xFF },
-		{ 0xF4, 0x80, 0xFF },
-		{ 0xF0, 0x00, 0xFF },
-		{ 0xE9, 0x00, 0xFF },
-#ifdef CONFIG_WLAN
-		{ 0x81, 0x00, 0x7F },
-		{ 0x82, 0x00, 0xFF },
-		{ 0xE6, 0x38, 0x7F },
-		{ 0xE7, 0x06, 0xFF },
-#endif
-		{ 0x8E, 0x15, 0xFF },
-		{ 0x8F, 0x15, 0xFF },
-		{ 0x90, 0x15, 0xFF },
-
-		{ 0xE9, 0x21, 0xFF },
-	};
-
-	const struct bahama_config_register v20_bt_on_fm_on[] = {
-		{ 0x11, 0x0C, 0xFF },
-		{ 0x13, 0x01, 0xFF },
-		{ 0xF4, 0x86, 0xFF },
-		{ 0xF0, 0x06, 0xFF },
-		{ 0xE9, 0x00, 0xFF },
-#ifdef CONFIG_WLAN
-		{ 0x81, 0x00, 0x7F },
-		{ 0x82, 0x00, 0xFF },
-		{ 0xE6, 0x38, 0x7F },
-		{ 0xE7, 0x06, 0xFF },
-#endif
-		{ 0xE9, 0x21, 0xFF },
-	};
-
-	const struct bahama_config_register v10_bt_off[] = {
-		{ 0xE9, 0x00, 0xFF },
-	};
-
-	const struct bahama_config_register v20_bt_off_fm_off[] = {
-		{ 0xF4, 0x84, 0xFF },
-		{ 0xF0, 0x04, 0xFF },
-		{ 0xE9, 0x00, 0xFF }
-	};
-
-	const struct bahama_config_register v20_bt_off_fm_on[] = {
-		{ 0xF4, 0x86, 0xFF },
-		{ 0xF0, 0x06, 0xFF },
-		{ 0xE9, 0x00, 0xFF }
-	};
-	const struct bahama_variant_register bt_bahama[2][3] = {
-	{
-		{ ARRAY_SIZE(v10_bt_off), v10_bt_off },
-		{ ARRAY_SIZE(v20_bt_off_fm_off), v20_bt_off_fm_off },
-		{ ARRAY_SIZE(v20_bt_off_fm_on), v20_bt_off_fm_on }
-	},
-	{
-		{ ARRAY_SIZE(v10_bt_on), v10_bt_on },
-		{ ARRAY_SIZE(v20_bt_on_fm_off), v20_bt_on_fm_off },
-		{ ARRAY_SIZE(v20_bt_on_fm_on), v20_bt_on_fm_on }
-	}
-	};
-
-	u8 offset = 0; /* index into bahama configs */
-	on = on ? 1 : 0;
-	version = marimba_read_bahama_ver(&config);
-	if ((int)version < 0 || version == BAHAMA_VER_UNSUPPORTED) {
-		dev_err(&msm_bt_power_device.dev, "%s: Bahama \
-				version read Error, version = %d \n",
-				__func__, version);
-		return -EIO;
-	}
-
-	if (version == BAHAMA_VER_2_0) {
-		if (marimba_get_fm_status(&config))
-			offset = 0x01;
-	}
-
-	p = bt_bahama[on][version + offset].set;
-
-	dev_info(&msm_bt_power_device.dev,
-		"%s: found version %d\n", __func__, version);
-
-	for (i = 0; i < bt_bahama[on][version + offset].size; i++) {
-		u8 value = (p+i)->value;
-		rc = marimba_write_bit_mask(&config,
-			(p+i)->reg,
-			&value,
-			sizeof((p+i)->value),
-			(p+i)->mask);
-		if (rc < 0) {
-			dev_err(&msm_bt_power_device.dev,
-				"%s: reg %x write failed: %d\n",
-				__func__, (p+i)->reg, rc);
-			return rc;
-		}
-		dev_dbg(&msm_bt_power_device.dev,
-			"%s: reg 0x%02x write value 0x%02x mask 0x%02x\n",
-				__func__, (p+i)->reg,
-				value, (p+i)->mask);
-		value = 0;
-		rc = marimba_read_bit_mask(&config,
-				(p+i)->reg, &value,
-				sizeof((p+i)->value), (p+i)->mask);
-		if (rc < 0)
-			dev_err(&msm_bt_power_device.dev, "%s marimba_read_bit_mask- error",
-					__func__);
-		dev_dbg(&msm_bt_power_device.dev,
-			"%s: reg 0x%02x read value 0x%02x mask 0x%02x\n",
-				__func__, (p+i)->reg,
-				value, (p+i)->mask);
-	}
-	/* Update BT Status */
-	if (on)
-		marimba_set_bt_status(&config, true);
-	else
-		marimba_set_bt_status(&config, false);
-	return rc;
-}
-static int bluetooth_switch_regulators(int on)
-{
-	int i, rc = 0;
-	const char *id = "BTPW";
-
-	for (i = 0; i < ARRAY_SIZE(bt_vregs); i++) {
-		if (IS_ERR_OR_NULL(bt_vregs[i].reg)) {
-			rc = bt_vregs[i].reg ?
-				PTR_ERR(bt_vregs[i].reg) :
-				-ENODEV;
-			dev_err(&msm_bt_power_device.dev,
-				"%s: invalid regulator handle for %s: %d\n",
-					__func__, bt_vregs[i].name, rc);
-			goto reg_disable;
-		}
-
-		rc = on ? regulator_set_voltage(bt_vregs[i].reg,
-					bt_vregs[i].min_level,
-						bt_vregs[i].max_level) : 0;
-		if (rc) {
-			dev_err(&msm_bt_power_device.dev,
-				"%s: could not set voltage for %s: %d\n",
-					__func__, bt_vregs[i].name, rc);
-			goto reg_disable;
-		}
-
-		rc = on ? regulator_enable(bt_vregs[i].reg) : 0;
-		if (rc) {
-			dev_err(&msm_bt_power_device.dev,
-				"%s: could not %sable regulator %s: %d\n",
-					__func__, "en", bt_vregs[i].name, rc);
-			goto reg_disable;
-		}
-
-		if (bt_vregs[i].is_pin_controlled) {
-			rc = pmapp_vreg_lpm_pincntrl_vote(id,
-				bt_vregs[i].pmapp_id,
-					PMAPP_CLOCK_ID_D1,
-					on ? PMAPP_CLOCK_VOTE_ON :
-						PMAPP_CLOCK_VOTE_OFF);
-			if (rc) {
-				dev_err(&msm_bt_power_device.dev,
-					"%s: pin control failed for %s: %d\n",
-						__func__, bt_vregs[i].name, rc);
-				goto pin_cnt_fail;
-			}
-		}
-		rc = on ? 0 : regulator_disable(bt_vregs[i].reg);
-
-		if (rc) {
-			dev_err(&msm_bt_power_device.dev,
-				"%s: could not %sable regulator %s: %d\n",
-					__func__, "dis", bt_vregs[i].name, rc);
-			goto reg_disable;
-		}
-	}
-
-	return rc;
-pin_cnt_fail:
-	if (on)
-		regulator_disable(bt_vregs[i].reg);
-reg_disable:
-	while (i) {
-		if (on) {
-			i--;
-			regulator_disable(bt_vregs[i].reg);
-			regulator_put(bt_vregs[i].reg);
-		}
-	}
-	return rc;
-}
-
-static struct regulator *reg_s3;
-static unsigned int msm_bahama_setup_power(void)
-{
-	int rc = 0;
-
-	reg_s3 = regulator_get(NULL, "msme1");
-	if (IS_ERR(reg_s3)) {
-		rc = PTR_ERR(reg_s3);
-		pr_err("%s: could not get regulator: %d\n", __func__, rc);
-		goto out;
-	}
-
-	rc = regulator_set_voltage(reg_s3, 1800000, 1800000);
-	if (rc < 0) {
-		pr_err("%s: could not set voltage: %d\n", __func__, rc);
-		goto reg_fail;
-	}
-
-	rc = regulator_enable(reg_s3);
-	if (rc < 0) {
-		pr_err("%s: could not enable regulator: %d\n", __func__, rc);
-		goto reg_fail;
-	}
-
-	gpio_tlmm_config(GPIO_CFG(GPIO_BT_SYS_REST_EN, 0,
-				GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL,
-				GPIO_CFG_2MA), GPIO_CFG_ENABLE);
-
-	/*setup Bahama_sys_reset_n*/
-	rc = gpio_request(GPIO_BT_SYS_REST_EN, "bahama sys_rst_n");
-	if (rc < 0) {
-		pr_err("%s: gpio_request %d = %d\n", __func__,
-			GPIO_BT_SYS_REST_EN, rc);
-		goto reg_disable;
-	}
-
-	rc = bt_set_gpio(1);
-	if (rc < 0) {
-		pr_err("%s: bt_set_gpio %d = %d\n", __func__,
-			GPIO_BT_SYS_REST_EN, rc);
-		goto gpio_fail;
-	}
-
-	return rc;
-
-gpio_fail:
-	gpio_free(GPIO_BT_SYS_REST_EN);
-reg_disable:
-	regulator_disable(reg_s3);
-reg_fail:
-	regulator_put(reg_s3);
-out:
-	reg_s3 = NULL;
-	return rc;
-}
-
-static unsigned int msm_bahama_shutdown_power(int value)
-{
-	int rc = 0;
-
-	if (IS_ERR_OR_NULL(reg_s3)) {
-		rc = reg_s3 ? PTR_ERR(reg_s3) : -ENODEV;
-		goto out;
-	}
-
-	rc = regulator_disable(reg_s3);
-	if (rc) {
-		pr_err("%s: could not disable regulator: %d\n", __func__, rc);
-		goto out;
-	}
-
-	if (value == BAHAMA_ID) {
-		rc = bt_set_gpio(0);
-		if (rc) {
-			pr_err("%s: bt_set_gpio = %d\n",
-					__func__, rc);
-			goto reg_enable;
-		}
-		gpio_free(GPIO_BT_SYS_REST_EN);
-	}
-
-	regulator_put(reg_s3);
-	reg_s3 = NULL;
-
-	return 0;
-
-reg_enable:
-	regulator_enable(reg_s3);
-out:
-	return rc;
-}
-
-static unsigned int msm_bahama_core_config(int type)
-{
-	int rc = 0;
-
-	if (type == BAHAMA_ID) {
-		int i;
-		struct marimba config = { .mod_id =  SLAVE_ID_BAHAMA};
-		const struct bahama_config_register v20_init[] = {
-			/* reg, value, mask */
-			{ 0xF4, 0x84, 0xFF }, /* AREG */
-			{ 0xF0, 0x04, 0xFF } /* DREG */
-		};
-		if (marimba_read_bahama_ver(&config) == BAHAMA_VER_2_0) {
-			for (i = 0; i < ARRAY_SIZE(v20_init); i++) {
-				u8 value = v20_init[i].value;
-				rc = marimba_write_bit_mask(&config,
-					v20_init[i].reg,
-					&value,
-					sizeof(v20_init[i].value),
-					v20_init[i].mask);
-				if (rc < 0) {
-					pr_err("%s: reg %d write failed: %d\n",
-						__func__, v20_init[i].reg, rc);
-					return rc;
-				}
-				pr_debug("%s: reg 0x%02x value 0x%02x"
-					" mask 0x%02x\n",
-					__func__, v20_init[i].reg,
-					v20_init[i].value, v20_init[i].mask);
-			}
-		}
-	}
-	rc = bt_set_gpio(0);
-	if (rc) {
-		pr_err("%s: bt_set_gpio = %d\n",
-		       __func__, rc);
-	}
-	pr_debug("core type: %d\n", type);
-	return rc;
-}
-
-static int bluetooth_power(int on)
-{
-	int pin, rc = 0;
-	const char *id = "BTPW";
-	int cid = 0;
-
-	cid = adie_get_detected_connectivity_type();
-	if (cid != BAHAMA_ID) {
-		pr_err("%s: unexpected adie connectivity type: %d\n",
-					__func__, cid);
-		return -ENODEV;
-	}
-	if (on) {
-		/*setup power for BT SOC*/
-		rc = bt_set_gpio(on);
-		if (rc) {
-			pr_err("%s: bt_set_gpio = %d\n",
-					__func__, rc);
-			goto exit;
-		}
-		rc = bluetooth_switch_regulators(on);
-		if (rc < 0) {
-			pr_err("%s: bluetooth_switch_regulators rc = %d",
-					__func__, rc);
-			goto exit;
-		}
-		/*setup BT GPIO lines*/
-		for (pin = 0; pin < ARRAY_SIZE(bt_config_power_on);
-			pin++) {
-			rc = gpio_tlmm_config(bt_config_power_on[pin],
-					GPIO_CFG_ENABLE);
-			if (rc < 0) {
-				pr_err("%s: gpio_tlmm_config(%#x)=%d\n",
-						__func__,
-						bt_config_power_on[pin],
-						rc);
-				goto fail_power;
-			}
-		}
-		/*Setup BT clocks*/
-		rc = pmapp_clock_vote(id, PMAPP_CLOCK_ID_D1,
-			PMAPP_CLOCK_VOTE_ON);
-		if (rc < 0) {
-			pr_err("Failed to vote for TCXO_D1 ON\n");
-			goto fail_clock;
-		}
-		msleep(20);
-
-		/*I2C config for Bahama*/
-		rc = bahama_bt(1);
-		if (rc < 0) {
-			pr_err("%s: bahama_bt rc = %d", __func__, rc);
-			goto fail_i2c;
-		}
-		msleep(20);
-
-		/*setup BT PCM lines*/
-		rc = msm_bahama_setup_pcm_i2s(BT_PCM_ON);
-		if (rc < 0) {
-			pr_err("%s: msm_bahama_setup_pcm_i2s , rc =%d\n",
-				__func__, rc);
-				goto fail_power;
-			}
-		rc = pmapp_clock_vote(id, PMAPP_CLOCK_ID_D1,
-				  PMAPP_CLOCK_VOTE_PIN_CTRL);
-		if (rc < 0)
-			pr_err("%s:Pin Control Failed, rc = %d",
-					__func__, rc);
-
-	} else {
-		rc = bahama_bt(0);
-		if (rc < 0)
-			pr_err("%s: bahama_bt rc = %d", __func__, rc);
-
-		rc = bt_set_gpio(on);
-		if (rc) {
-			pr_err("%s: bt_set_gpio = %d\n",
-					__func__, rc);
-		}
-fail_i2c:
-		rc = pmapp_clock_vote(id, PMAPP_CLOCK_ID_D1,
-				  PMAPP_CLOCK_VOTE_OFF);
-		if (rc < 0)
-			pr_err("%s: Failed to vote Off D1\n", __func__);
-fail_clock:
-		for (pin = 0; pin < ARRAY_SIZE(bt_config_power_off);
-			pin++) {
-				rc = gpio_tlmm_config(bt_config_power_off[pin],
-					GPIO_CFG_ENABLE);
-				if (rc < 0) {
-					pr_err("%s: gpio_tlmm_config(%#x)=%d\n",
-					__func__, bt_config_power_off[pin], rc);
-				}
-			}
-		rc = msm_bahama_setup_pcm_i2s(BT_PCM_OFF);
-		if (rc < 0) {
-			pr_err("%s: msm_bahama_setup_pcm_i2s, rc =%d\n",
-					__func__, rc);
-				}
-fail_power:
-		rc = bluetooth_switch_regulators(0);
-		if (rc < 0) {
-			pr_err("%s: switch_regulators : rc = %d",\
-					__func__, rc);
-			goto exit;
-		}
-	}
-	return rc;
-exit:
-	pr_err("%s: failed with rc = %d", __func__, rc);
-	return rc;
-}
-
-static int __init bt_power_init(void)
-{
-	int i, rc = 0;
-	struct device *dev = &msm_bt_power_device.dev;
-
-	for (i = 0; i < ARRAY_SIZE(bt_vregs); i++) {
-		bt_vregs[i].reg = regulator_get(dev, bt_vregs[i].name);
-		if (IS_ERR(bt_vregs[i].reg)) {
-			rc = PTR_ERR(bt_vregs[i].reg);
-			dev_err(dev, "%s: could not get regulator %s: %d\n",
-					__func__, bt_vregs[i].name, rc);
-			goto reg_get_fail;
-		}
-	}
-
-	dev->platform_data = &bluetooth_power;
-
-	return rc;
-
-reg_get_fail:
-	while (i--) {
-		regulator_put(bt_vregs[i].reg);
-		bt_vregs[i].reg = NULL;
-	}
-	return rc;
-}
-
-static struct marimba_platform_data marimba_pdata = {
-	.slave_id[SLAVE_ID_BAHAMA_FM]        = BAHAMA_SLAVE_ID_FM_ADDR,
-	.slave_id[SLAVE_ID_BAHAMA_QMEMBIST]  = BAHAMA_SLAVE_ID_QMEMBIST_ADDR,
-	.bahama_setup                        = msm_bahama_setup_power,
-	.bahama_shutdown                     = msm_bahama_shutdown_power,
-	.bahama_core_config                  = msm_bahama_core_config,
-	.fm				     = &marimba_fm_pdata,
-};
-
-#endif
-
-#if defined(CONFIG_BT) && defined(CONFIG_MARIMBA_CORE)
-static struct i2c_board_info bahama_devices[] = {
-{
-	I2C_BOARD_INFO("marimba", 0xc),
-	.platform_data = &marimba_pdata,
-},
-};
-#endif
-
 static struct msm_gpio qup_i2c_gpios_io[] = {
 	{ GPIO_CFG(60, 0, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_8MA),
 		"qup_scl" },
@@ -2299,10 +1359,7 @@
 	msm_fb_add_devices();
 
 #if defined(CONFIG_BT) && defined(CONFIG_MARIMBA_CORE)
-	i2c_register_board_info(MSM_GSBI1_QUP_I2C_BUS_ID,
-			bahama_devices,
-			ARRAY_SIZE(bahama_devices));
-	bt_power_init();
+	msm7627a_bt_power_init();
 #endif
 
 	msm_camera_vreg_init();