diff options
author | LCPD Auto Merger <lcpd_integration@list.ti.com> | 2018-03-13 09:19:05 -0500 |
---|---|---|
committer | LCPD Auto Merger <lcpd_integration@list.ti.com> | 2018-03-13 09:19:05 -0500 |
commit | 4f5b6db75de383ca0114b0edbe479885107950af (patch) | |
tree | 966fdad03c04d5857ab98206f7f9d4d7ec5d87b8 | |
parent | 2846934e0b0cbed2b81d754f3284a0c380945969 (diff) | |
parent | 4a9c4fec7bb53ab82bc7a0b80a7435d059db438a (diff) | |
download | jacinto6evm-4f5b6db75de383ca0114b0edbe479885107950af.tar.gz |
Merge branch 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel into ti-lsk-linux-4.4.y
TI-Feature: ti_linux_base_lsk
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.4.y
* 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
ARM: dts: dra76-evm: Add wilink8 wlan support
ARM: dts: dra7-evm: move MMC4 description to common file
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
-rw-r--r-- | arch/arm/boot/dts/dra7-evm-common.dtsi | 16 | ||||
-rw-r--r-- | arch/arm/boot/dts/dra7-evm.dts | 13 | ||||
-rw-r--r-- | arch/arm/boot/dts/dra76-evm.dts | 21 |
3 files changed, 37 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 { 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>; }; |