diff options
author | Andy Duan <fugang.duan@nxp.com> | 2017-03-21 18:08:04 +0800 |
---|---|---|
committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:26:03 +0800 |
commit | a38ead864a5261249dc7bf20a1fd06eb30154604 (patch) | |
tree | d9cf9b3b4fba941c41245581a7109c6dfe3ccb15 | |
parent | 064a64e44bd6b7b83a83b52f0517fe0339a82df0 (diff) |
MLK-14498-9 dts: imx6/imx7: add modem device reset node
Add BT modem device reset node.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi | 22 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6sl-evk-btwifi.dts | 23 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6sll-evk-btwifi.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb-btwifi.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-evk.dts | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi | 11 | ||||
-rw-r--r-- | 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 5c69ece29ed2..2fb374e6614c 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"; @@ -46,6 +53,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 = < @@ -61,10 +74,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 1c11ae3755a5..987e50fbe9a6 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"; @@ -37,6 +44,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 @@ -61,20 +74,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 09db55464c3f..9a31aef7b60c 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"; @@ -83,6 +90,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 2c4086e17405..7d5415ea6850 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts @@ -378,6 +378,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 a4dec238c1af..2b0ab7a2de83 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>; + }; + spi4 { compatible = "spi-gpio"; pinctrl-names = "default"; @@ -717,6 +724,7 @@ assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>; assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; uart-has-rtscts; + resets = <&modem_reset>; status = "okay"; }; @@ -810,7 +818,6 @@ pinctrl_hog_1: hoggrp-1 { fsl,pins = < - MX7D_PAD_ECSPI2_SS0__GPIO4_IO23 0x80000000 /* bt reg on */ MX7D_PAD_EPDC_BDR0__GPIO2_IO28 0x59 /* headphone detect */ >; }; @@ -1094,6 +1101,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 */ >; }; |