From f9c6fcb1045bff3a2110a6334957f23b7df730b1 Mon Sep 17 00:00:00 2001 From: Jean-Jacques Hiblot Date: Fri, 2 Mar 2018 10:07:30 +0100 Subject: ARM: dts: dra7-evm: move MMC4 description to common file Put the generic part of the description of MMC4 in the common file dra7-evm-common.dtsi so that it can bere-used. Also fixes the role of the regulator "vmmcwl_fixed" which is used for the IO signals, not for the main power. Signed-off-by: Jean-Jacques Hiblot --- arch/arm/boot/dts/dra7-evm-common.dtsi | 16 ++++++++++++++++ arch/arm/boot/dts/dra7-evm.dts | 13 ------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi index 15612602d502..26887776749b 100644 --- a/arch/arm/boot/dts/dra7-evm-common.dtsi +++ b/arch/arm/boot/dts/dra7-evm-common.dtsi @@ -289,3 +289,19 @@ &pcie1_rc { status = "okay"; }; + +&mmc4 { + bus-width = <4>; + cap-power-off-card; + keep-power-in-suspend; + ti,non-removable; + + #address-cells = <1>; + #size-cells = <0>; + wlcore: wlcore@2 { + compatible = "ti,wl1835"; + reg = <2>; + interrupt-parent = <&gpio5>; + interrupts = <7 IRQ_TYPE_EDGE_RISING>; + }; +}; diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts index e98cd713306b..8b5c5a1041d5 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts @@ -894,10 +894,6 @@ &mmc4 { status = "okay"; vmmc-supply = <&vmmcwl_fixed>; - bus-width = <4>; - cap-power-off-card; - keep-power-in-suspend; - ti,non-removable; pinctrl-names = "default-rev11", "default", "hs-rev11", "hs", "sdr12-rev11", "sdr12", "sdr25-rev11", "sdr25"; pinctrl-0 = <&mmc4_pins_default &mmc4_iodelay_ds_rev11_conf>; @@ -908,15 +904,6 @@ pinctrl-5 = <&mmc4_pins_sdr12 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>; pinctrl-6 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev11_conf>; pinctrl-7 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>; - - #address-cells = <1>; - #size-cells = <0>; - wlcore: wlcore@2 { - compatible = "ti,wl1835"; - reg = <2>; - interrupt-parent = <&gpio5>; - interrupts = <7 IRQ_TYPE_LEVEL_HIGH>; - }; }; &oppdm_mpu { -- cgit v1.2.3-54-g00ecf From 70dffb73f55af40dc777a7824726ed56a6196d7b Mon Sep 17 00:00:00 2001 From: Jean-Jacques Hiblot Date: Thu, 8 Mar 2018 16:47:44 +0100 Subject: ARM: dts: dra76-evm: Add wilink8 wlan support commit d98e268dac1cf1cbe0387278e84f36b738906485 branch ti-linux-4.14.y Add support for WLAN using wilink8 module. On dra76-evm, MMC4 is used for connecting to wilink8 module. Signed-off-by: Vishal Mahaveer Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Jean-Jacques Hiblot --- arch/arm/boot/dts/dra76-evm.dts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts index 24582a7b0acb..7056bd369461 100644 --- a/arch/arm/boot/dts/dra76-evm.dts +++ b/arch/arm/boot/dts/dra76-evm.dts @@ -115,6 +115,16 @@ vin-supply = <&smps5_reg>; }; + vmmcwl_fixed: fixedregulator-mmcwl { + compatible = "regulator-fixed"; + regulator-name = "vmmcwl_fixed"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + gpio = <&gpio5 8 0>; /* gpio5_8 */ + startup-delay-us = <70000>; + enable-active-high; + }; + vtt_fixed: fixedregulator-vtt { compatible = "regulator-fixed"; regulator-name = "vtt_fixed"; @@ -424,6 +434,17 @@ pinctrl-3 = <&mmc2_pins_hs200 &mmc2_iodelay_hs200_conf>; }; +&mmc4 { + status = "okay"; + vmmc-supply = <&vmmcwl_fixed>; + + pinctrl-names = "default", "hs", "sdr12", "sdr25"; + pinctrl-0 = <&mmc4_pins_hs &mmc4_iodelay_default_conf>; + pinctrl-1 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>; + pinctrl-2 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>; + pinctrl-3 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>; +}; + &oppdm_mpu { vdd-supply = <&buck10_reg>; }; -- cgit v1.2.3-54-g00ecf