From: Kishon Vijay Abraham I <kishon@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: "Jonathan Corbet" <corbet@lwn.net>,
"Benoît Cousson" <bcousson@baylibre.com>,
"Rob Herring" <robh+dt@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
linux-mmc@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
kishon@ti.com, "Hari Nagalla" <hnagalla@ti.com>,
"Eyal Reizer" <eyalr@ti.com>, "Sekhar Nori" <nsekhar@ti.com>
Subject: [PATCH v4 08/14] ARM: dts: dra72-evm-common: Add wilink8 wlan support
Date: Fri, 27 Apr 2018 17:38:59 +0530 [thread overview]
Message-ID: <20180427120905.3665-9-kishon@ti.com> (raw)
In-Reply-To: <20180427120905.3665-1-kishon@ti.com>
From: Hari Nagalla <hnagalla@ti.com>
Wilink8 module is a combo wireless connectivity card based
on Texas Instrument's wl18xx solution.
Add support for the wlan capabilities of this module by muxing
the relevant mmc lines, and setting the required device-tree
data.
Signed-off-by: Eyal Reizer <eyalr@ti.com>
Signed-off-by: Hari Nagalla <hnagalla@ti.com>
[nsekhar@ti.com: drop WLAN_EN pinmux. It should be done by bootloader.
Also, some commit message adjustments]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra72-evm-common.dtsi | 42 +++++++++++++++++++++++
arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 11 ++++++
2 files changed, 53 insertions(+)
diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
index 8e3b185d864b..b81214051a89 100644
--- a/arch/arm/boot/dts/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
@@ -44,6 +44,16 @@
regulator-boot-on;
};
+ evm_3v6: fixedregulator-evm_3v6 {
+ compatible = "regulator-fixed";
+ regulator-name = "evm_3v6";
+ regulator-min-microvolt = <3600000>;
+ regulator-max-microvolt = <3600000>;
+ vin-supply = <&evm_5v0>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
vsys_3v3: fixedregulator-vsys3v3 {
/* Output 2 of TPS43351QDAPRQ1 on dra72-evm */
/* Output 2 of LM5140QRWGTQ1 on dra71-evm */
@@ -171,6 +181,15 @@
clocks = <&atl_clkin2_ck>;
};
};
+
+ vmmcwl_fixed: fixedregulator-mmcwl {
+ compatible = "regulator-fixed";
+ regulator-name = "vmmcwl_fixed";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ gpio = <&gpio5 8 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
};
&dra7_pmx_core {
@@ -398,6 +417,29 @@
max-frequency = <192000000>;
};
+&mmc4 {
+ status = "okay";
+ vmmc-supply = <&evm_3v6>;
+ vqmmc-supply = <&vmmcwl_fixed>;
+ bus-width = <4>;
+ cap-power-off-card;
+ keep-power-in-suspend;
+ non-removable;
+ pinctrl-names = "default", "hs", "sdr12", "sdr25";
+ pinctrl-0 = <&mmc4_pins_default>;
+ pinctrl-1 = <&mmc4_pins_default>;
+ pinctrl-2 = <&mmc4_pins_default>;
+ pinctrl-3 = <&mmc4_pins_default>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ wifi@2 {
+ compatible = "ti,wl1835";
+ reg = <2>;
+ interrupt-parent = <&gpio5>;
+ interrupts = <7 IRQ_TYPE_EDGE_RISING>;
+ };
+};
+
&mac {
status = "okay";
};
diff --git a/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi b/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi
index 088013c6dc6e..edad87c4292c 100644
--- a/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi
+++ b/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi
@@ -202,6 +202,17 @@
DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
>;
};
+
+ mmc4_pins_default: mmc4_pins_default {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x37e8, PIN_INPUT_PULLUP | MUX_MODE3) /* uart1_ctsn.mmc4_clk */
+ DRA7XX_CORE_IOPAD(0x37ec, PIN_INPUT_PULLUP | MUX_MODE3) /* uart1_rtsn.mmc4_cmd */
+ DRA7XX_CORE_IOPAD(0x37f0, PIN_INPUT_PULLUP | MUX_MODE3) /* uart2_rxd.mmc4_dat0 */
+ DRA7XX_CORE_IOPAD(0x37f4, PIN_INPUT_PULLUP | MUX_MODE3) /* uart2_txd.mmc4_dat1 */
+ DRA7XX_CORE_IOPAD(0x37f8, PIN_INPUT_PULLUP | MUX_MODE3) /* uart2_ctsn.mmc4_dat2 */
+ DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_PULLUP | MUX_MODE3) /* uart2_rtsn.mmc4_dat3 */
+ >;
+ };
};
&dra7_iodelay_core {
--
2.17.0
next prev parent reply other threads:[~2018-04-27 12:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-27 12:08 [PATCH v4 00/14] dra7: mmc: Update mmc dt node to use sdhci-omap Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 01/14] ARM: dts: dra72-evm-common: Remove mmc specific pinmux Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 02/14] ARM: dts: dra71-evm: Add "vqmmc-supply" property for mmc2 Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 03/14] ARM: dts: dra7-mmc-iodelay: Add a new pinctrl group for clk line without pullup Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 04/14] ARM: dts: am57xx-idk: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 05/14] ARM: dts: dra71-evm: " Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 06/14] ARM: dts: am574x-idk: Add pinmux configuration for MMC Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 07/14] ARM: dts: am57xx-beagle-x15/am57xx-idk: Fix pinctrl-names Kishon Vijay Abraham I
2018-04-27 12:08 ` Kishon Vijay Abraham I [this message]
2018-04-27 12:09 ` [PATCH v4 09/14] ARM: dts: dra7-evm: Model EVM_3V6 regulator Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 10/14] ARM: dts: dra7-evm: Add wilink8 wlan support Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 11/14] ARM: dts: dra76-evm: " Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 12/14] ARM: dts: dra7: Use sdhci-omap programming model Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 13/14] ARM: dts: dra7: Add high speed modes capability to MMC1/MMC2 dt node Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 14/14] Documentation: ARM: Add new MMC requirements for DRA7/K2G Kishon Vijay Abraham I
2018-05-03 17:40 ` [PATCH v4 00/14] dra7: mmc: Update mmc dt node to use sdhci-omap Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180427120905.3665-9-kishon@ti.com \
--to=kishon@ti.com \
--cc=bcousson@baylibre.com \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=eyalr@ti.com \
--cc=hnagalla@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=nsekhar@ti.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox