* [PATCH v2] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
@ 2015-05-06 17:20 Fabio Estevam
2015-05-11 13:00 ` Shawn Guo
0 siblings, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2015-05-06 17:20 UTC (permalink / raw)
To: linux-arm-kernel
From: Fabio Estevam <fabio.estevam@freescale.com>
Add DT support for the Broadcom Wifi/Bluetooth devices found on the
microsom board.
[Modified original Russell King's patch to use mmc-pwrseq]
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Do not permanently keep the oscillator on. Use the proper clk bindings
from powerseq.
arch/arm/boot/dts/imx6qdl-microsom.dtsi | 105 ++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
index 349f82b..846eb89 100644
--- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
@@ -39,15 +39,100 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <dt-bindings/gpio/gpio.h>
+/ {
+ clocks {
+ clk_sdio: sdio-clock {
+ compatible = "gpio-gate-clock";
+ #clock-cells = <0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_microsom_brcm_osc>;
+ enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
+
+ reg_brcm: brcm-reg {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio3 19 0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_microsom_brcm_reg>;
+ regulator-name = "brcm_reg";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ startup-delay-us = <200000>;
+ };
+ };
+
+ usdhc1_pwrseq: usdhc1_pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ reset-gpios = <&gpio5 26 GPIO_ACTIVE_LOW>,
+ <&gpio6 0 GPIO_ACTIVE_LOW>;
+ clocks = <&clk_sdio>;
+ clock-names = "ext_clock";
+ };
+};
&iomuxc {
microsom {
+ pinctrl_microsom_brcm_bt: microsom-brcm-bt {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00 0x40013070
+ MX6QDL_PAD_CSI0_DAT15__GPIO6_IO01 0x40013070
+ MX6QDL_PAD_CSI0_DAT18__GPIO6_IO04 0x40013070
+ >;
+ };
+
+ pinctrl_microsom_brcm_osc: microsom-brcm-osc {
+ fsl,pins = <
+ MX6QDL_PAD_DISP0_DAT11__GPIO5_IO05 0x40013070
+ >;
+ };
+
+ pinctrl_microsom_brcm_reg: microsom-brcm-reg {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x40013070
+ >;
+ };
+
+ pinctrl_microsom_brcm_wifi: microsom-brcm-wifi {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_8__XTALOSC_REF_CLK_32K 0x1b0b0
+ MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x40013070
+ MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26 0x40013070
+ MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27 0x40013070
+ >;
+ };
+
pinctrl_microsom_uart1: microsom-uart1 {
fsl,pins = <
MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
>;
};
+
+ pinctrl_microsom_uart4: microsom-uart4 {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B 0x1b0b1
+ >;
+ };
+
+ pinctrl_microsom_usdhc1: microsom-usdhc1 {
+ fsl,pins = <
+ MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17059
+ MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10059
+ MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
+ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
+ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
+ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
+ >;
+ };
};
};
@@ -56,3 +141,23 @@
pinctrl-0 = <&pinctrl_microsom_uart1>;
status = "okay";
};
+
+/* UART4 - Connected to optional BRCM Wifi/BT/FM */
+&uart4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_microsom_brcm_bt &pinctrl_microsom_uart4>;
+ fsl,uart-has-rtscts;
+ status = "okay";
+};
+
+/* USDHC1 - Connected to optional BRCM Wifi/BT/FM */
+&usdhc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_microsom_brcm_wifi &pinctrl_microsom_usdhc1>;
+ bus-width = <4>;
+ mmc-pwrseq = <&usdhc1_pwrseq>;
+ keep-power-in-suspend;
+ non-removable;
+ vmmc-supply = <®_brcm>;
+ status = "okay";
+};
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
2015-05-06 17:20 [PATCH v2] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices Fabio Estevam
@ 2015-05-11 13:00 ` Shawn Guo
2015-05-11 13:46 ` Fabio Estevam
0 siblings, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2015-05-11 13:00 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, May 06, 2015 at 02:20:10PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Add DT support for the Broadcom Wifi/Bluetooth devices found on the
> microsom board.
>
> [Modified original Russell King's patch to use mmc-pwrseq]
>
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - Do not permanently keep the oscillator on. Use the proper clk bindings
> from powerseq.
>
> arch/arm/boot/dts/imx6qdl-microsom.dtsi | 105 ++++++++++++++++++++++++++++++++
> 1 file changed, 105 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> index 349f82b..846eb89 100644
> --- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> @@ -39,15 +39,100 @@
> * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> * OTHER DEALINGS IN THE SOFTWARE.
> */
> +#include <dt-bindings/gpio/gpio.h>
> +/ {
> + clocks {
One of the device tree maintainers doesn't like "clocks" container.
Since you're not using generic node name for child clock, the container
can just be saved.
Shawn
> + clk_sdio: sdio-clock {
> + compatible = "gpio-gate-clock";
> + #clock-cells = <0>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_microsom_brcm_osc>;
> + enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
> + };
> + };
> +
> + regulators {
> + compatible = "simple-bus";
> +
> + reg_brcm: brcm-reg {
> + compatible = "regulator-fixed";
> + enable-active-high;
> + gpio = <&gpio3 19 0>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_microsom_brcm_reg>;
> + regulator-name = "brcm_reg";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + startup-delay-us = <200000>;
> + };
> + };
> +
> + usdhc1_pwrseq: usdhc1_pwrseq {
> + compatible = "mmc-pwrseq-simple";
> + reset-gpios = <&gpio5 26 GPIO_ACTIVE_LOW>,
> + <&gpio6 0 GPIO_ACTIVE_LOW>;
> + clocks = <&clk_sdio>;
> + clock-names = "ext_clock";
> + };
> +};
>
> &iomuxc {
> microsom {
> + pinctrl_microsom_brcm_bt: microsom-brcm-bt {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00 0x40013070
> + MX6QDL_PAD_CSI0_DAT15__GPIO6_IO01 0x40013070
> + MX6QDL_PAD_CSI0_DAT18__GPIO6_IO04 0x40013070
> + >;
> + };
> +
> + pinctrl_microsom_brcm_osc: microsom-brcm-osc {
> + fsl,pins = <
> + MX6QDL_PAD_DISP0_DAT11__GPIO5_IO05 0x40013070
> + >;
> + };
> +
> + pinctrl_microsom_brcm_reg: microsom-brcm-reg {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x40013070
> + >;
> + };
> +
> + pinctrl_microsom_brcm_wifi: microsom-brcm-wifi {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_8__XTALOSC_REF_CLK_32K 0x1b0b0
> + MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x40013070
> + MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26 0x40013070
> + MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27 0x40013070
> + >;
> + };
> +
> pinctrl_microsom_uart1: microsom-uart1 {
> fsl,pins = <
> MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
> MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
> >;
> };
> +
> + pinctrl_microsom_uart4: microsom-uart4 {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
> + MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
> + MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B 0x1b0b1
> + MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B 0x1b0b1
> + >;
> + };
> +
> + pinctrl_microsom_usdhc1: microsom-usdhc1 {
> + fsl,pins = <
> + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17059
> + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10059
> + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
> + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
> + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
> + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
> + >;
> + };
> };
> };
>
> @@ -56,3 +141,23 @@
> pinctrl-0 = <&pinctrl_microsom_uart1>;
> status = "okay";
> };
> +
> +/* UART4 - Connected to optional BRCM Wifi/BT/FM */
> +&uart4 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_microsom_brcm_bt &pinctrl_microsom_uart4>;
> + fsl,uart-has-rtscts;
> + status = "okay";
> +};
> +
> +/* USDHC1 - Connected to optional BRCM Wifi/BT/FM */
> +&usdhc1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_microsom_brcm_wifi &pinctrl_microsom_usdhc1>;
> + bus-width = <4>;
> + mmc-pwrseq = <&usdhc1_pwrseq>;
> + keep-power-in-suspend;
> + non-removable;
> + vmmc-supply = <®_brcm>;
> + status = "okay";
> +};
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
2015-05-11 13:00 ` Shawn Guo
@ 2015-05-11 13:46 ` Fabio Estevam
2015-05-11 14:15 ` Fabio Estevam
0 siblings, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2015-05-11 13:46 UTC (permalink / raw)
To: linux-arm-kernel
Hi Shawn,
On Mon, May 11, 2015 at 10:00 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> One of the device tree maintainers doesn't like "clocks" container.
> Since you're not using generic node name for child clock, the container
> can just be saved.
Just to make sure I understand your suggestion: would you like the
clock nodes to look like this?
oscillator {
clk_sdio: sdio-clock {
compatible = "gpio-gate-clock";
#clock-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_microsom_brcm_osc>;
enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
};
};
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
2015-05-11 13:46 ` Fabio Estevam
@ 2015-05-11 14:15 ` Fabio Estevam
2015-05-11 14:36 ` Shawn Guo
0 siblings, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2015-05-11 14:15 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 11, 2015 at 10:46 AM, Fabio Estevam <festevam@gmail.com> wrote:
> Hi Shawn,
>
> On Mon, May 11, 2015 at 10:00 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
>
>> One of the device tree maintainers doesn't like "clocks" container.
>> Since you're not using generic node name for child clock, the container
>> can just be saved.
>
> Just to make sure I understand your suggestion: would you like the
> clock nodes to look like this?
I think I got it. Do you mean like this?
#include <dt-bindings/gpio/gpio.h>
/ {
clk_sdio: sdio-clock {
compatible = "gpio-gate-clock";
#clock-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_microsom_brcm_osc>;
enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
};
regulators {
compatible = "simple-bus";
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
2015-05-11 14:15 ` Fabio Estevam
@ 2015-05-11 14:36 ` Shawn Guo
0 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2015-05-11 14:36 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 11, 2015 at 11:15:33AM -0300, Fabio Estevam wrote:
> On Mon, May 11, 2015 at 10:46 AM, Fabio Estevam <festevam@gmail.com> wrote:
> > Hi Shawn,
> >
> > On Mon, May 11, 2015 at 10:00 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> >
> >> One of the device tree maintainers doesn't like "clocks" container.
> >> Since you're not using generic node name for child clock, the container
> >> can just be saved.
> >
> > Just to make sure I understand your suggestion: would you like the
> > clock nodes to look like this?
>
> I think I got it. Do you mean like this?
Yes.
shawn
>
> #include <dt-bindings/gpio/gpio.h>
> / {
> clk_sdio: sdio-clock {
> compatible = "gpio-gate-clock";
> #clock-cells = <0>;
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_microsom_brcm_osc>;
> enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
> };
>
> regulators {
> compatible = "simple-bus";
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-11 14:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-06 17:20 [PATCH v2] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices Fabio Estevam
2015-05-11 13:00 ` Shawn Guo
2015-05-11 13:46 ` Fabio Estevam
2015-05-11 14:15 ` Fabio Estevam
2015-05-11 14:36 ` Shawn Guo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.