diff mbox

ARM: dts: omap3-overo: Remove "vqmmc-supply" property from MMC dt node

Message ID 20170609084141.15582-1-kishon@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kishon Vijay Abraham I June 9, 2017, 8:41 a.m. UTC
commit 94647a30124e2c7 ("ARM: dts: omap3-overo: Enable WiFi/BT combo")
while enabling WiFi/BT combo added regulator to trigger the nReset
signal of the Bluetooth module in vqmmc-supply. However BT should be
handled by UART. Moreover "vqmmc" is not a defined binding for
omap_hsmmc. While "vqmmc" in mmc2 hasn't caused any issues so far,
mmc2 will start to mis-behave once omap_hsmmc defines "vqmmc"
binding.

Remove "vqmmc-supply" property in mmc2 here.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm/boot/dts/omap3-overo-base.dtsi | 11 -----------
 1 file changed, 11 deletions(-)

Comments

Ulf Hansson June 9, 2017, 10:37 a.m. UTC | #1
On 9 June 2017 at 10:41, Kishon Vijay Abraham I <kishon@ti.com> wrote:
> commit 94647a30124e2c7 ("ARM: dts: omap3-overo: Enable WiFi/BT combo")
> while enabling WiFi/BT combo added regulator to trigger the nReset
> signal of the Bluetooth module in vqmmc-supply. However BT should be
> handled by UART. Moreover "vqmmc" is not a defined binding for
> omap_hsmmc. While "vqmmc" in mmc2 hasn't caused any issues so far,
> mmc2 will start to mis-behave once omap_hsmmc defines "vqmmc"
> binding.
>
> Remove "vqmmc-supply" property in mmc2 here.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

Okay, so I assume I also need to carry this in my immutable branch for
the omap driver changes. More precisely before the driver changes?

Wait for Tony to ack this then.

Kind regards
Uffe

> ---
>  arch/arm/boot/dts/omap3-overo-base.dtsi | 11 -----------
>  1 file changed, 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
> index 401fae838fe9..cd220342a805 100644
> --- a/arch/arm/boot/dts/omap3-overo-base.dtsi
> +++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
> @@ -74,16 +74,6 @@
>                 gpio = <&gpio1 16 GPIO_ACTIVE_HIGH>;            /* gpio_16: WiFi nReset */
>                 startup-delay-us = <10000>;
>         };
> -
> -       /* Regulator to trigger the nReset signal of the Bluetooth module */
> -       w3cbw003c_bt_nreset: regulator-w3cbw003c-bt-nreset {
> -               compatible = "regulator-fixed";
> -               regulator-name = "regulator-w3cbw003c-bt-nreset";
> -               regulator-min-microvolt = <3300000>;
> -               regulator-max-microvolt = <3300000>;
> -               gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;             /* gpio_164: BT nReset */
> -               startup-delay-us = <10000>;
> -       };
>  };
>
>  &omap3_pmx_core {
> @@ -191,7 +181,6 @@
>         pinctrl-names = "default";
>         pinctrl-0 = <&mmc2_pins>;
>         vmmc-supply = <&w3cbw003c_npoweron>;
> -       vqmmc-supply = <&w3cbw003c_bt_nreset>;
>         vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;
>         bus-width = <4>;
>         cap-sdio-irq;
> --
> 2.11.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kishon Vijay Abraham I June 9, 2017, 11:02 a.m. UTC | #2
Hi,

On Friday 09 June 2017 04:07 PM, Ulf Hansson wrote:
> On 9 June 2017 at 10:41, Kishon Vijay Abraham I <kishon@ti.com> wrote:
>> commit 94647a30124e2c7 ("ARM: dts: omap3-overo: Enable WiFi/BT combo")
>> while enabling WiFi/BT combo added regulator to trigger the nReset
>> signal of the Bluetooth module in vqmmc-supply. However BT should be
>> handled by UART. Moreover "vqmmc" is not a defined binding for
>> omap_hsmmc. While "vqmmc" in mmc2 hasn't caused any issues so far,
>> mmc2 will start to mis-behave once omap_hsmmc defines "vqmmc"
>> binding.
>>
>> Remove "vqmmc-supply" property in mmc2 here.
>>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> 
> Okay, so I assume I also need to carry this in my immutable branch for
> the omap driver changes. More precisely before the driver changes?

yeah, that's right!

Thanks
Kishon
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren June 10, 2017, 8:44 a.m. UTC | #3
* Kishon Vijay Abraham I <kishon@ti.com> [170609 04:05]:
> Hi,
> 
> On Friday 09 June 2017 04:07 PM, Ulf Hansson wrote:
> > On 9 June 2017 at 10:41, Kishon Vijay Abraham I <kishon@ti.com> wrote:
> >> commit 94647a30124e2c7 ("ARM: dts: omap3-overo: Enable WiFi/BT combo")
> >> while enabling WiFi/BT combo added regulator to trigger the nReset
> >> signal of the Bluetooth module in vqmmc-supply. However BT should be
> >> handled by UART. Moreover "vqmmc" is not a defined binding for
> >> omap_hsmmc. While "vqmmc" in mmc2 hasn't caused any issues so far,
> >> mmc2 will start to mis-behave once omap_hsmmc defines "vqmmc"
> >> binding.
> >>
> >> Remove "vqmmc-supply" property in mmc2 here.
> >>
> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> > 
> > Okay, so I assume I also need to carry this in my immutable branch for
> > the omap driver changes. More precisely before the driver changes?
> 
> yeah, that's right!

As far as I can tell this regulator won't do anything right now so:

Acked-by: Tony Lindgren <tony@atomide.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson June 12, 2017, 7:58 a.m. UTC | #4
On 9 June 2017 at 10:41, Kishon Vijay Abraham I <kishon@ti.com> wrote:
> commit 94647a30124e2c7 ("ARM: dts: omap3-overo: Enable WiFi/BT combo")
> while enabling WiFi/BT combo added regulator to trigger the nReset
> signal of the Bluetooth module in vqmmc-supply. However BT should be
> handled by UART. Moreover "vqmmc" is not a defined binding for
> omap_hsmmc. While "vqmmc" in mmc2 hasn't caused any issues so far,
> mmc2 will start to mis-behave once omap_hsmmc defines "vqmmc"
> binding.
>
> Remove "vqmmc-supply" property in mmc2 here.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

Thanks, applied for next!

Kind regards
Uffe

> ---
>  arch/arm/boot/dts/omap3-overo-base.dtsi | 11 -----------
>  1 file changed, 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
> index 401fae838fe9..cd220342a805 100644
> --- a/arch/arm/boot/dts/omap3-overo-base.dtsi
> +++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
> @@ -74,16 +74,6 @@
>                 gpio = <&gpio1 16 GPIO_ACTIVE_HIGH>;            /* gpio_16: WiFi nReset */
>                 startup-delay-us = <10000>;
>         };
> -
> -       /* Regulator to trigger the nReset signal of the Bluetooth module */
> -       w3cbw003c_bt_nreset: regulator-w3cbw003c-bt-nreset {
> -               compatible = "regulator-fixed";
> -               regulator-name = "regulator-w3cbw003c-bt-nreset";
> -               regulator-min-microvolt = <3300000>;
> -               regulator-max-microvolt = <3300000>;
> -               gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;             /* gpio_164: BT nReset */
> -               startup-delay-us = <10000>;
> -       };
>  };
>
>  &omap3_pmx_core {
> @@ -191,7 +181,6 @@
>         pinctrl-names = "default";
>         pinctrl-0 = <&mmc2_pins>;
>         vmmc-supply = <&w3cbw003c_npoweron>;
> -       vqmmc-supply = <&w3cbw003c_bt_nreset>;
>         vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;
>         bus-width = <4>;
>         cap-sdio-irq;
> --
> 2.11.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
index 401fae838fe9..cd220342a805 100644
--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -74,16 +74,6 @@ 
 		gpio = <&gpio1 16 GPIO_ACTIVE_HIGH>;		/* gpio_16: WiFi nReset */
 		startup-delay-us = <10000>;
 	};
-
-	/* Regulator to trigger the nReset signal of the Bluetooth module */
-	w3cbw003c_bt_nreset: regulator-w3cbw003c-bt-nreset {
-		compatible = "regulator-fixed";
-		regulator-name = "regulator-w3cbw003c-bt-nreset";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;		/* gpio_164: BT nReset */
-		startup-delay-us = <10000>;
-	};
 };
 
 &omap3_pmx_core {
@@ -191,7 +181,6 @@ 
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc2_pins>;
 	vmmc-supply = <&w3cbw003c_npoweron>;
-	vqmmc-supply = <&w3cbw003c_bt_nreset>;
 	vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;
 	bus-width = <4>;
 	cap-sdio-irq;