* [PATCH 1/3] ARM: dts: imx7d-sdb: Adjust the regulator nodes @ 2017-05-29 19:00 Fabio Estevam 2017-05-29 19:00 ` [PATCH 2/3] ARM: dts: imx7d-sdb: Add Wifi support Fabio Estevam 2017-05-29 19:01 ` [PATCH 3/3] ARM: dts: imx7d-sdb: Add Bluetooth support Fabio Estevam 0 siblings, 2 replies; 5+ messages in thread From: Fabio Estevam @ 2017-05-29 19:00 UTC (permalink / raw) To: linux-arm-kernel From: Fabio Estevam <fabio.estevam@nxp.com> It is not recommended to place the regulator nodes inside 'simple-bus', so adjust them accordingly. The motivation for rearranging this is to make it easier to add new regulator nodes in the future. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> --- arch/arm/boot/dts/imx7d-sdb.dts | 66 +++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 77c400f..38944ca 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -73,47 +73,37 @@ }; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - reg_usb_otg1_vbus: regulator at 0 { - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "usb_otg1_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; + reg_usb_otg1_vbus: regulator-usb-otg1-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_otg1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; - reg_usb_otg2_vbus: regulator at 1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "usb_otg2_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio4 7 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; + reg_usb_otg2_vbus: regulator-usb-otg1-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_otg2_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio4 7 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; - reg_can2_3v3: regulator at 2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "can2-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio1 7 GPIO_ACTIVE_LOW>; - }; + reg_can2_3v3: regulator-can2-3v3 { + compatible = "regulator-fixed"; + regulator-name = "can2-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 7 GPIO_ACTIVE_LOW>; + }; - reg_vref_1v8: regulator at 3 { - compatible = "regulator-fixed"; - reg = <3>; - regulator-name = "vref-1v8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; + reg_vref_1v8: regulator-vref-1v8 { + compatible = "regulator-fixed"; + regulator-name = "vref-1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; }; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] ARM: dts: imx7d-sdb: Add Wifi support 2017-05-29 19:00 [PATCH 1/3] ARM: dts: imx7d-sdb: Adjust the regulator nodes Fabio Estevam @ 2017-05-29 19:00 ` Fabio Estevam 2017-06-05 1:54 ` Shawn Guo 2017-05-29 19:01 ` [PATCH 3/3] ARM: dts: imx7d-sdb: Add Bluetooth support Fabio Estevam 1 sibling, 1 reply; 5+ messages in thread From: Fabio Estevam @ 2017-05-29 19:00 UTC (permalink / raw) To: linux-arm-kernel From: Fabio Estevam <fabio.estevam@nxp.com> imx7d-sdb has a BCM4339 Wifi chip connected to USDHC2. Add support for it. While at it, move the WL_REG_ON pin to the correct pinctrl node. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> --- arch/arm/boot/dts/imx7d-sdb.dts | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 38944ca..fc7e0b0 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -105,6 +105,18 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; + + reg_brcm: regulator-brcm { + compatible = "regulator-fixed"; + gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-name = "brcm_reg"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_brcm_reg>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <200000>; + }; }; &adc1 { @@ -379,6 +391,19 @@ status = "okay"; }; +&usdhc2 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc2>; + pinctrl-1 = <&pinctrl_usdhc2_100mhz>; + pinctrl-2 = <&pinctrl_usdhc2_200mhz>; + enable-sdio-wakeup; + keep-power-in-suspend; + non-removable; + vmmc-supply = <®_brcm>; + fsl,tuning-step = <2>; + status = "okay"; +}; + &usdhc3 { pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc3>; @@ -403,6 +428,12 @@ pinctrl-0 = <&pinctrl_hog>; imx7d-sdb { + pinctrl_brcm_reg: brcmreggrp { + fsl,pins = < + MX7D_PAD_ECSPI2_MOSI__GPIO4_IO21 0x14 + >; + }; + pinctrl_ecspi3: ecspi3grp { fsl,pins = < MX7D_PAD_SAI2_TX_SYNC__ECSPI3_MISO 0x2 @@ -570,7 +601,6 @@ MX7D_PAD_SD2_DATA1__SD2_DATA1 0x59 MX7D_PAD_SD2_DATA2__SD2_DATA2 0x59 MX7D_PAD_SD2_DATA3__SD2_DATA3 0x59 - MX7D_PAD_ECSPI2_MOSI__GPIO4_IO21 0x59 /* WL_REG_ON */ >; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] ARM: dts: imx7d-sdb: Add Wifi support 2017-05-29 19:00 ` [PATCH 2/3] ARM: dts: imx7d-sdb: Add Wifi support Fabio Estevam @ 2017-06-05 1:54 ` Shawn Guo 0 siblings, 0 replies; 5+ messages in thread From: Shawn Guo @ 2017-06-05 1:54 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 29, 2017 at 04:00:59PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > imx7d-sdb has a BCM4339 Wifi chip connected to USDHC2. > > Add support for it. > > While at it, move the WL_REG_ON pin to the correct pinctrl node. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > arch/arm/boot/dts/imx7d-sdb.dts | 32 +++++++++++++++++++++++++++++++- > 1 file changed, 31 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts > index 38944ca..fc7e0b0 100644 > --- a/arch/arm/boot/dts/imx7d-sdb.dts > +++ b/arch/arm/boot/dts/imx7d-sdb.dts > @@ -105,6 +105,18 @@ > regulator-min-microvolt = <1800000>; > regulator-max-microvolt = <1800000>; > }; > + > + reg_brcm: regulator-brcm { > + compatible = "regulator-fixed"; > + gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + regulator-name = "brcm_reg"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_brcm_reg>; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + startup-delay-us = <200000>; > + }; > }; > > &adc1 { > @@ -379,6 +391,19 @@ > status = "okay"; > }; > > +&usdhc2 { > + pinctrl-names = "default", "state_100mhz", "state_200mhz"; > + pinctrl-0 = <&pinctrl_usdhc2>; > + pinctrl-1 = <&pinctrl_usdhc2_100mhz>; > + pinctrl-2 = <&pinctrl_usdhc2_200mhz>; > + enable-sdio-wakeup; Use 'wakeup-source' instead. Shawn > + keep-power-in-suspend; > + non-removable; > + vmmc-supply = <®_brcm>; > + fsl,tuning-step = <2>; > + status = "okay"; > +}; > + > &usdhc3 { > pinctrl-names = "default", "state_100mhz", "state_200mhz"; > pinctrl-0 = <&pinctrl_usdhc3>; > @@ -403,6 +428,12 @@ > pinctrl-0 = <&pinctrl_hog>; > > imx7d-sdb { > + pinctrl_brcm_reg: brcmreggrp { > + fsl,pins = < > + MX7D_PAD_ECSPI2_MOSI__GPIO4_IO21 0x14 > + >; > + }; > + > pinctrl_ecspi3: ecspi3grp { > fsl,pins = < > MX7D_PAD_SAI2_TX_SYNC__ECSPI3_MISO 0x2 > @@ -570,7 +601,6 @@ > MX7D_PAD_SD2_DATA1__SD2_DATA1 0x59 > MX7D_PAD_SD2_DATA2__SD2_DATA2 0x59 > MX7D_PAD_SD2_DATA3__SD2_DATA3 0x59 > - MX7D_PAD_ECSPI2_MOSI__GPIO4_IO21 0x59 /* WL_REG_ON */ > >; > }; > > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/3] ARM: dts: imx7d-sdb: Add Bluetooth support 2017-05-29 19:00 [PATCH 1/3] ARM: dts: imx7d-sdb: Adjust the regulator nodes Fabio Estevam 2017-05-29 19:00 ` [PATCH 2/3] ARM: dts: imx7d-sdb: Add Wifi support Fabio Estevam @ 2017-05-29 19:01 ` Fabio Estevam 2017-06-05 2:02 ` Shawn Guo 1 sibling, 1 reply; 5+ messages in thread From: Fabio Estevam @ 2017-05-29 19:01 UTC (permalink / raw) To: linux-arm-kernel From: Fabio Estevam <fabio.estevam@nxp.com> imx7d-sdb has a BCM4339 BT chip connected to UART6. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> --- arch/arm/boot/dts/imx7d-sdb.dts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index fc7e0b0..af90305 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -370,6 +370,15 @@ status = "okay"; }; +&uart6 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart6>; + assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>; + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; + fsl,uart-has-rtscts; + status = "okay"; +}; + &usbotg1 { vbus-supply = <®_usb_otg1_vbus>; status = "okay"; -- 2.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] ARM: dts: imx7d-sdb: Add Bluetooth support 2017-05-29 19:01 ` [PATCH 3/3] ARM: dts: imx7d-sdb: Add Bluetooth support Fabio Estevam @ 2017-06-05 2:02 ` Shawn Guo 0 siblings, 0 replies; 5+ messages in thread From: Shawn Guo @ 2017-06-05 2:02 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 29, 2017 at 04:01:00PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > imx7d-sdb has a BCM4339 BT chip connected to UART6. > > Add support for it. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > arch/arm/boot/dts/imx7d-sdb.dts | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts > index fc7e0b0..af90305 100644 > --- a/arch/arm/boot/dts/imx7d-sdb.dts > +++ b/arch/arm/boot/dts/imx7d-sdb.dts > @@ -370,6 +370,15 @@ > status = "okay"; > }; > > +&uart6 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart6>; > + assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>; > + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; > + fsl,uart-has-rtscts; 'uart-has-rtscts' please. Shawn > + status = "okay"; > +}; > + > &usbotg1 { > vbus-supply = <®_usb_otg1_vbus>; > status = "okay"; > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-06-05 2:02 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-05-29 19:00 [PATCH 1/3] ARM: dts: imx7d-sdb: Adjust the regulator nodes Fabio Estevam 2017-05-29 19:00 ` [PATCH 2/3] ARM: dts: imx7d-sdb: Add Wifi support Fabio Estevam 2017-06-05 1:54 ` Shawn Guo 2017-05-29 19:01 ` [PATCH 3/3] ARM: dts: imx7d-sdb: Add Bluetooth support Fabio Estevam 2017-06-05 2:02 ` Shawn Guo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).