[PATCH] arm64: dts: apq8096-db820c: Removed bt-en-1-8v regulator

[Thierry Escande]

This patch removes the unused bt-en-1-8v regulator and moves the
bt_en_gios claim to the pm8994_gpios node.

This bt_en_gpio could have been moved to the bluetooth serial node but
instead this node declares an 'enable' gpio addressing the bt_en_gpio.
This is needed by the Qualcomm QCA6174 WLAN/BT combo chip that needs to
have the bt_en_gpio claimed even if only WLAN is used.

Signed-off-by: Thierry Escande 
---
 arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi |  2 +-
 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi   | 14 --
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi 
b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
index 6167af955659..a6ad3d7fe655 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
@@ -4,7 +4,7 @@
 _gpios {
 
pinctrl-names = "default";
-   pinctrl-0 = <_exp_gpio_f>;
+   pinctrl-0 = <_exp_gpio_f _en_gpios>;
 
ls_exp_gpio_f: pm8994_gpio5 {
pinconf {
diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi 
b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
index 8be666ea92bd..affd4486e10e 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
@@ -171,19 +171,6 @@
pinctrl-0 = <_vbus_det_gpio>;
};
 
-   bt_en: bt-en-1-8v {
-   pinctrl-names = "default";
-   pinctrl-0 = <_en_gpios>;
-   compatible = "regulator-fixed";
-   regulator-name = "bt-en-regulator";
-   regulator-min-microvolt = <180>;
-   regulator-max-microvolt = <180>;
-
-   /* WLAN card specific delay */
-   startup-delay-us = <7>;
-   enable-active-high;
-   };
-
wlan_en: wlan-en-1-8v {
pinctrl-names = "default";
pinctrl-0 = <_en_gpios>;
@@ -204,7 +191,6 @@
status = "okay";
perst-gpio = < 35 GPIO_ACTIVE_LOW>;
vddpe-supply = <_en>;
-   vddpe1-supply = <_en>;
};
 
pcie@608000 {
-- 
2.14.1

[PATCH] arm64: dts: apq8096-db820c: Removed bt-en-1-8v regulator

[Thierry Escande]

This patch removes the unused bt-en-1-8v regulator and moves the
bt_en_gios claim to the pm8994_gpios node.

This bt_en_gpio could have been moved to the bluetooth serial node but
instead this node declares an 'enable' gpio addressing the bt_en_gpio.
This is needed by the Qualcomm QCA6174 WLAN/BT combo chip that needs to
have the bt_en_gpio claimed even if only WLAN is used.

Signed-off-by: Thierry Escande 
---
 arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi |  2 +-
 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi   | 14 --
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi 
b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
index 6167af955659..a6ad3d7fe655 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
@@ -4,7 +4,7 @@
 _gpios {
 
pinctrl-names = "default";
-   pinctrl-0 = <_exp_gpio_f>;
+   pinctrl-0 = <_exp_gpio_f _en_gpios>;
 
ls_exp_gpio_f: pm8994_gpio5 {
pinconf {
diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi 
b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
index 8be666ea92bd..affd4486e10e 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
@@ -171,19 +171,6 @@
pinctrl-0 = <_vbus_det_gpio>;
};
 
-   bt_en: bt-en-1-8v {
-   pinctrl-names = "default";
-   pinctrl-0 = <_en_gpios>;
-   compatible = "regulator-fixed";
-   regulator-name = "bt-en-regulator";
-   regulator-min-microvolt = <180>;
-   regulator-max-microvolt = <180>;
-
-   /* WLAN card specific delay */
-   startup-delay-us = <7>;
-   enable-active-high;
-   };
-
wlan_en: wlan-en-1-8v {
pinctrl-names = "default";
pinctrl-0 = <_en_gpios>;
@@ -204,7 +191,6 @@
status = "okay";
perst-gpio = < 35 GPIO_ACTIVE_LOW>;
vddpe-supply = <_en>;
-   vddpe1-supply = <_en>;
};
 
pcie@608000 {
-- 
2.14.1