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

Commit 51cfd1ad authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: vote S6A supply for BT"

parents 11d619f5 2b2e1bfa

arch/arm64/boot/dts/qcom/kona-cdp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -58,12 +58,12 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&bt_en_active>;

		qca,bt-reset-gpio = <&tlmm 21 0>; /* BT_EN */

		qca,bt-vdd-ldo-supply = <&pm8150_s6>;

		qca,bt-vdd-aon-supply = <&pm8150_s6>;

		qca,bt-vdd-dig-supply = <&pm8009_s2>;

		qca,bt-vdd-rfa1-supply = <&pm8150_s5>;

		qca,bt-vdd-rfa2-supply = <&pm8150a_s8>;



		qca,bt-vdd-ldo-voltage-level = <950000 950000>;

		qca,bt-vdd-aon-voltage-level = <950000 950000>;

		qca,bt-vdd-dig-voltage-level = <950000 950000>;

		qca,bt-vdd-rfa1-voltage-level = <1900000 1900000>;

		qca,bt-vdd-rfa2-voltage-level = <1350000 1350000>;

arch/arm64/boot/dts/qcom/kona-mtp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -58,12 +58,12 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&bt_en_active>;

		qca,bt-reset-gpio = <&tlmm 21 0>; /* BT_EN */

		qca,bt-vdd-ldo-supply = <&pm8150_s6>;

		qca,bt-vdd-aon-supply = <&pm8150_s6>;

		qca,bt-vdd-dig-supply = <&pm8009_s2>;

		qca,bt-vdd-rfa1-supply = <&pm8150_s5>;

		qca,bt-vdd-rfa2-supply = <&pm8150a_s8>;



		qca,bt-vdd-ldo-voltage-level = <950000 950000>;

		qca,bt-vdd-aon-voltage-level = <950000 950000>;

		qca,bt-vdd-dig-voltage-level = <950000 950000>;

		qca,bt-vdd-rfa1-voltage-level = <1900000 1900000>;

		qca,bt-vdd-rfa2-voltage-level = <1350000 1350000>;

drivers/bluetooth/bluetooth-power.c

+17 −1
Original line number Diff line number Diff line
@@ -289,6 +289,13 @@ static int bluetooth_power(int on) 
				goto vdd_ldo_fail;

			}

		}

		if (bt_power_pdata->bt_vdd_aon) {

			rc = bt_configure_vreg(bt_power_pdata->bt_vdd_aon);

			if (rc < 0) {

				BT_PWR_ERR("bt_power vddaon config failed");

				goto vdd_aon_fail;

			}

		}

		if (bt_power_pdata->bt_vdd_dig) {

			rc = bt_configure_vreg(bt_power_pdata->bt_vdd_dig);

			if (rc < 0) {
@@ -306,7 +313,7 @@ static int bluetooth_power(int on) 
		if (bt_power_pdata->bt_vdd_rfa2) {

			rc = bt_configure_vreg(bt_power_pdata->bt_vdd_rfa2);

			if (rc < 0) {

				BT_PWR_ERR("bt_power vddrfa1 config failed");

				BT_PWR_ERR("bt_power vddrfa2 config failed");

				goto vdd_rfa2_fail;

			}

		}
@@ -355,6 +362,9 @@ static int bluetooth_power(int on) 
		if (bt_power_pdata->bt_vdd_dig)

			bt_vreg_disable(bt_power_pdata->bt_vdd_dig);

vdd_dig_fail:

		if (bt_power_pdata->bt_vdd_aon)

			bt_vreg_disable(bt_power_pdata->bt_vdd_aon);

vdd_aon_fail:

		if (bt_power_pdata->bt_vdd_ldo)

			bt_vreg_disable(bt_power_pdata->bt_vdd_ldo);

vdd_ldo_fail:
@@ -625,6 +635,12 @@ static int bt_power_populate_dt_pinfo(struct platform_device *pdev) 
		if (rc < 0)

			BT_PWR_ERR("bt-chip-pwd not provided in device tree");



		rc = bt_dt_parse_vreg_info(&pdev->dev,

					&bt_power_pdata->bt_vdd_aon,

					"qca,bt-vdd-aon");

		if (rc < 0)

			BT_PWR_ERR("bt-vdd-aon not provided in device tree");



		rc = bt_dt_parse_vreg_info(&pdev->dev,

					&bt_power_pdata->bt_vdd_dig,

					"qca,bt-vdd-dig");

include/linux/bluetooth-power.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ struct bluetooth_power_platform_data { 
	struct bt_power_vreg_data *bt_vdd_xtal;

	/* VDD_CORE voltage regulator */

	struct bt_power_vreg_data *bt_vdd_core;

	/* VDD_AON digital voltage regulator */

	struct bt_power_vreg_data *bt_vdd_aon;

	/* VDD_DIG digital voltage regulator */

	struct bt_power_vreg_data *bt_vdd_dig;

	/* VDD RFA1 digital voltage regulator */