diff options
| author | David Huang <d-huang@ti.com> | 2018-03-13 13:15:44 -0600 |
|---|---|---|
| committer | David Huang <d-huang@ti.com> | 2018-03-13 13:15:44 -0600 |
| commit | eb496200efeb6c580f386523062b0ccc80325315 (patch) | |
| tree | e7f0c6d8aae5b4b81501c1c66e84b548bc38036f | |
| parent | 622fdb3949e95be063d925781ec1863b3eab5b38 (diff) | |
| parent | 430874126a636d1cbbbfe959d55bbed1c6a53987 (diff) | |
| download | jacinto6evm-6AO.1.1.tar.gz | |
Merge branch 'p-ti-lsk-linux-4.4.y-next' of git://git.omapzoom.org/kernel/omap into p-ti-android-linux-4.4.y6AO.1.1
Auto Merge of:
TI-Feature: linux-4.4.y-next_android-4.4.y
TI-Tree: git://git.omapzoom.org/kernel/omap.git
TI-Branch: p-ti-lsk-linux-4.4.y-next
* 'p-ti-lsk-linux-4.4.y-next' of git://git.omapzoom.org/kernel/omap:
ARM: dts: dra76-evm: Add wilink8 wlan support
ARM: dts: dra7-evm: move MMC4 description to common file
Signed-off-by: David Huang <d-huang@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 1f9008d8e14e..c1bee515079f 100644 --- a/arch/arm/boot/dts/dra7-evm-common.dtsi +++ b/arch/arm/boot/dts/dra7-evm-common.dtsi @@ -292,3 +292,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 3f27909b7b46..25070a073a94 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts @@ -907,10 +907,6 @@ i2c_p3_exp: &i2c2 { &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>; @@ -921,15 +917,6 @@ i2c_p3_exp: &i2c2 { 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 93ee23b5bc28..9012e7677e52 100644 --- a/arch/arm/boot/dts/dra76-evm.dts +++ b/arch/arm/boot/dts/dra76-evm.dts @@ -119,6 +119,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"; @@ -428,6 +438,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>; }; |