OSDN Git Service

ARM: dts: imx6qdl-sr-som: split out Broadcom Wi-Fi support
authorRussell King <rmk+kernel@armlinux.org.uk>
Tue, 28 Nov 2017 15:02:25 +0000 (15:02 +0000)
committerShawn Guo <shawnguo@kernel.org>
Tue, 26 Dec 2017 08:15:44 +0000 (16:15 +0800)
There are two variants of the imx6qdl som: one with Broadcom Wi-Fi and
another with Texas Instruments Wi-Fi.  The two Wi-Fi devices require
different DT bindings, so it's necessary to split out the Broadcom
specifics.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx6dl-cubox-i.dts
arch/arm/boot/dts/imx6dl-hummingboard.dts
arch/arm/boot/dts/imx6q-cubox-i.dts
arch/arm/boot/dts/imx6q-h100.dts
arch/arm/boot/dts/imx6q-hummingboard.dts
arch/arm/boot/dts/imx6qdl-sr-som-brcm.dtsi [new file with mode: 0644]
arch/arm/boot/dts/imx6qdl-sr-som.dtsi

index 045e59d..2b1b3e1 100644 (file)
@@ -42,6 +42,7 @@
 
 #include "imx6dl.dtsi"
 #include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 #include "imx6qdl-cubox-i.dtsi"
 
 / {
index c3b826f..cbd02eb 100644 (file)
@@ -43,6 +43,7 @@
 
 #include "imx6dl.dtsi"
 #include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 #include "imx6qdl-hummingboard.dtsi"
 
 / {
index b9f581d..1c7b262 100644 (file)
@@ -42,6 +42,7 @@
 
 #include "imx6q.dtsi"
 #include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 #include "imx6qdl-cubox-i.dtsi"
 
 / {
index 815e943..743c11f 100644 (file)
@@ -43,6 +43,7 @@
 
 #include "imx6q.dtsi"
 #include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 
 / {
        model = "Auvidea H100";
index 5f21885..8c9e94e 100644 (file)
@@ -43,6 +43,7 @@
 
 #include "imx6q.dtsi"
 #include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 #include "imx6qdl-hummingboard.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/imx6qdl-sr-som-brcm.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som-brcm.dtsi
new file mode 100644 (file)
index 0000000..809d789
--- /dev/null
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2013,2014 Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+#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>;
+       };
+
+       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_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
+                       >;
+               };
+       };
+};
+
+/* UART4 - Connected to optional BRCM Wifi/BT/FM */
+&uart4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_microsom_brcm_bt &pinctrl_microsom_uart4>;
+       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;
+       no-1-8-v;
+       non-removable;
+       vmmc-supply = <&reg_brcm>;
+       status = "okay";
+};
index 2b332db..449e241 100644 (file)
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 #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>;
-       };
-
-       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";
-       };
-};
 
 &fec {
        pinctrl-names = "default";
 
 &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_enet_ar8035: microsom-enet-ar8035 {
                        fsl,pins = <
                                MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b8b0
                                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
-                       >;
-               };
        };
 };
 
        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>;
-       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;
-       no-1-8-v;
-       non-removable;
-       vmmc-supply = <&reg_brcm>;
-       status = "okay";
-};