From a7fac1a95e1d92c9acd5161047949ed22515b7e2 Mon Sep 17 00:00:00 2001 From: Andy Duan Date: Tue, 21 Mar 2017 18:08:04 +0800 Subject: MLK-14498-9 dts: imx6/imx7: add modem device reset node Add BT modem device reset node. Signed-off-by: Fugang Duan --- arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi | 22 +++++++++++++++++++++- arch/arm/boot/dts/imx6sl-evk-btwifi.dts | 23 ++++++++++++++++------- arch/arm/boot/dts/imx6sll-evk-btwifi.dts | 8 ++++++++ arch/arm/boot/dts/imx6sx-sdb-btwifi.dts | 8 ++++++++ arch/arm/boot/dts/imx6ul-14x14-evk.dts | 3 +++ arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi | 11 +++++++++++ arch/arm/boot/dts/imx7d-sdb.dts | 10 +++++++++- 7 files changed, 76 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi index 5e697a0f8214..7164a9e44bc1 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi @@ -22,6 +22,13 @@ status = "disabled"; }; + modem_reset: modem-reset { + compatible = "gpio-reset"; + reset-gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + reset-delay-us = <1000>; + #reset-cells = <0>; + }; + regulators { wlreg_on: fixedregulator@100 { compatible = "regulator-fixed"; @@ -47,6 +54,12 @@ &iomuxc { imx6qdl-sabresd-murata-v2 { + pinctrl_btreg: btreggrp { + fsl,pins = < + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b0 + >; + }; + /* add MUXing entry for SD2 4-bit interface and configure control pins */ pinctrl_wifi: wifigrp { fsl,pins = < @@ -63,10 +76,17 @@ }; }; +&pinctrl_gpio_leds { + fsl,pins = < + >; +}; + &uart5 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart5_1>; + pinctrl-0 = <&pinctrl_uart5_1 + &pinctrl_btreg>; fsl,uart-has-rtscts; + resets = <&modem_reset>; status = "okay"; /* for DTE mode, add below change */ /* fsl,dte-mode; */ diff --git a/arch/arm/boot/dts/imx6sl-evk-btwifi.dts b/arch/arm/boot/dts/imx6sl-evk-btwifi.dts index cd059251c5f3..4eac83e12cf2 100644 --- a/arch/arm/boot/dts/imx6sl-evk-btwifi.dts +++ b/arch/arm/boot/dts/imx6sl-evk-btwifi.dts @@ -16,6 +16,13 @@ #include "imx6sl-evk.dts" / { + modem_reset: modem-reset { + compatible = "gpio-reset"; + reset-gpios = <&gpio5 17 GPIO_ACTIVE_LOW>; + reset-delay-us = <1000>; + #reset-cells = <0>; + }; + regulators { wlreg_on: fixedregulator@100 { compatible = "regulator-fixed"; @@ -38,6 +45,12 @@ &iomuxc { imx6sl-evk-murata-v1_sdext { /* Only MUX SD1_DAT0..3 lines so UART4 can be MUXed on higher data lines. */ + pinctrl_btreg: btreggrp { + fsl,pins = < + MX6SL_PAD_SD3_DAT3__GPIO5_IO17 0x13069 /* BT_REG_ON */ + >; + }; + pinctrl_wifi: wifigrp { fsl,pins = < MX6SL_PAD_SD1_CMD__SD1_CMD 0x17059 @@ -63,20 +76,16 @@ /* Murata: declare UART4 interface for Bluetooth. */ &uart4 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart4_1>; + pinctrl-0 = <&pinctrl_uart4_1 + &pinctrl_btreg>; fsl,uart-has-rtscts; + resets = <&modem_reset>; status = "okay"; /* for DTE mode, add below change */ /* fsl,dte-mode; */ /* pinctrl-0 = <&pinctrl_uart4dte_1>; */ }; -&pinctrl_uart4_1 { - fsl,pins = < - MX6SL_PAD_SD3_DAT3__GPIO5_IO17 0x13069 /* BT_REG_ON */ - >; -}; - &usdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wifi>; diff --git a/arch/arm/boot/dts/imx6sll-evk-btwifi.dts b/arch/arm/boot/dts/imx6sll-evk-btwifi.dts index 91da5019c296..3cfa3272db29 100644 --- a/arch/arm/boot/dts/imx6sll-evk-btwifi.dts +++ b/arch/arm/boot/dts/imx6sll-evk-btwifi.dts @@ -15,6 +15,13 @@ #include "imx6sll-evk.dts" / { + modem_reset: modem-reset { + compatible = "gpio-reset"; + reset-gpios = <&gpio3 27 GPIO_ACTIVE_LOW>; + reset-delay-us = <1000>; + #reset-cells = <0>; + }; + regulators { wlreg_on: fixedregulator@100 { compatible = "regulator-fixed"; @@ -54,6 +61,7 @@ }; &uart5 { + resets = <&modem_reset>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6sx-sdb-btwifi.dts b/arch/arm/boot/dts/imx6sx-sdb-btwifi.dts index ba5512e652fe..698e49ef7734 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-btwifi.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-btwifi.dts @@ -16,6 +16,13 @@ #include "imx6sx-sdb.dts" / { + modem_reset: modem-reset { + compatible = "gpio-reset"; + reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>; + reset-delay-us = <1000>; + #reset-cells = <0>; + }; + regulators { wlreg_on: fixedregulator@100 { compatible = "regulator-fixed"; @@ -86,6 +93,7 @@ pinctrl-0 = <&pinctrl_uart3 &pinctrl_bt>; fsl,uart-has-rtscts; + resets = <&modem_reset>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts index 785f5bb4273e..4e77bd8e0177 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts @@ -418,6 +418,9 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; uart-has-rtscts; + /* for DTE mode, add below change */ + /* fsl,dte-mode; */ + /* pinctrl-0 = <&pinctrl_uart2dte>; */ status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi b/arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi index d5b6c19a8a81..d4810bd30d58 100644 --- a/arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi +++ b/arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi @@ -13,6 +13,13 @@ */ / { + modem_reset: modem-reset { + compatible = "gpio-reset"; + reset-gpios = <&gpio_spi 4 GPIO_ACTIVE_LOW>; + reset-delay-us = <1000>; + #reset-cells = <0>; + }; + regulators { wlreg_on: fixedregulator@100 { compatible = "regulator-fixed"; @@ -43,6 +50,10 @@ regulator-always-on; }; +&uart2 { + resets = <&modem_reset>; +}; + &usdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_wifi>; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 0325be9b57da..29387d541623 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -52,6 +52,13 @@ reg = <0x80000000 0x80000000>; }; + modem_reset: modem-reset { + compatible = "gpio-reset"; + reset-gpios = <&gpio4 23 GPIO_ACTIVE_LOW>; + reset-delay-us = <1000>; + #reset-cells = <0>; + }; + regulators { compatible = "simple-bus"; #address-cells = <1>; @@ -719,6 +726,7 @@ assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>; assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; fsl,uart-has-rtscts; + resets = <&modem_reset>; status = "okay"; }; @@ -798,7 +806,6 @@ pinctrl_hog_1: hoggrp-1 { fsl,pins = < - MX7D_PAD_ECSPI2_SS0__GPIO4_IO23 0x19 /* BIT_REG_ON */ MX7D_PAD_EPDC_BDR0__GPIO2_IO28 0x59 /* headphone detect */ >; }; @@ -1083,6 +1090,7 @@ MX7D_PAD_ECSPI1_SCLK__UART6_DCE_RX 0x79 MX7D_PAD_ECSPI1_SS0__UART6_DCE_CTS 0x79 MX7D_PAD_ECSPI1_MISO__UART6_DCE_RTS 0x79 + MX7D_PAD_ECSPI2_SS0__GPIO4_IO23 0x19 /* BT_REG_ON */ >; }; -- cgit v1.2.3