aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Huang2018-03-13 14:15:44 -0500
committerDavid Huang2018-03-13 14:15:44 -0500
commiteb496200efeb6c580f386523062b0ccc80325315 (patch)
treee7f0c6d8aae5b4b81501c1c66e84b548bc38036f
parent622fdb3949e95be063d925781ec1863b3eab5b38 (diff)
parent430874126a636d1cbbbfe959d55bbed1c6a53987 (diff)
downloadkernel-omap-eb496200efeb6c580f386523062b0ccc80325315.tar.gz
kernel-omap-eb496200efeb6c580f386523062b0ccc80325315.tar.xz
kernel-omap-eb496200efeb6c580f386523062b0ccc80325315.zip
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.dtsi16
-rw-r--r--arch/arm/boot/dts/dra7-evm.dts13
-rw-r--r--arch/arm/boot/dts/dra76-evm.dts21
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 @@
292&pcie1_rc { 292&pcie1_rc {
293 status = "okay"; 293 status = "okay";
294}; 294};
295
296&mmc4 {
297 bus-width = <4>;
298 cap-power-off-card;
299 keep-power-in-suspend;
300 ti,non-removable;
301
302 #address-cells = <1>;
303 #size-cells = <0>;
304 wlcore: wlcore@2 {
305 compatible = "ti,wl1835";
306 reg = <2>;
307 interrupt-parent = <&gpio5>;
308 interrupts = <7 IRQ_TYPE_EDGE_RISING>;
309 };
310};
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 {
907&mmc4 { 907&mmc4 {
908 status = "okay"; 908 status = "okay";
909 vmmc-supply = <&vmmcwl_fixed>; 909 vmmc-supply = <&vmmcwl_fixed>;
910 bus-width = <4>;
911 cap-power-off-card;
912 keep-power-in-suspend;
913 ti,non-removable;
914 910
915 pinctrl-names = "default-rev11", "default", "hs-rev11", "hs", "sdr12-rev11", "sdr12", "sdr25-rev11", "sdr25"; 911 pinctrl-names = "default-rev11", "default", "hs-rev11", "hs", "sdr12-rev11", "sdr12", "sdr25-rev11", "sdr25";
916 pinctrl-0 = <&mmc4_pins_default &mmc4_iodelay_ds_rev11_conf>; 912 pinctrl-0 = <&mmc4_pins_default &mmc4_iodelay_ds_rev11_conf>;
@@ -921,15 +917,6 @@ i2c_p3_exp: &i2c2 {
921 pinctrl-5 = <&mmc4_pins_sdr12 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>; 917 pinctrl-5 = <&mmc4_pins_sdr12 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>;
922 pinctrl-6 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev11_conf>; 918 pinctrl-6 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev11_conf>;
923 pinctrl-7 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>; 919 pinctrl-7 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>;
924
925 #address-cells = <1>;
926 #size-cells = <0>;
927 wlcore: wlcore@2 {
928 compatible = "ti,wl1835";
929 reg = <2>;
930 interrupt-parent = <&gpio5>;
931 interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
932 };
933}; 920};
934 921
935&oppdm_mpu { 922&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 @@
119 vin-supply = <&smps5_reg>; 119 vin-supply = <&smps5_reg>;
120 }; 120 };
121 121
122 vmmcwl_fixed: fixedregulator-mmcwl {
123 compatible = "regulator-fixed";
124 regulator-name = "vmmcwl_fixed";
125 regulator-min-microvolt = <1800000>;
126 regulator-max-microvolt = <1800000>;
127 gpio = <&gpio5 8 0>; /* gpio5_8 */
128 startup-delay-us = <70000>;
129 enable-active-high;
130 };
131
122 vtt_fixed: fixedregulator-vtt { 132 vtt_fixed: fixedregulator-vtt {
123 compatible = "regulator-fixed"; 133 compatible = "regulator-fixed";
124 regulator-name = "vtt_fixed"; 134 regulator-name = "vtt_fixed";
@@ -428,6 +438,17 @@
428 pinctrl-3 = <&mmc2_pins_hs200 &mmc2_iodelay_hs200_conf>; 438 pinctrl-3 = <&mmc2_pins_hs200 &mmc2_iodelay_hs200_conf>;
429}; 439};
430 440
441&mmc4 {
442 status = "okay";
443 vmmc-supply = <&vmmcwl_fixed>;
444
445 pinctrl-names = "default", "hs", "sdr12", "sdr25";
446 pinctrl-0 = <&mmc4_pins_hs &mmc4_iodelay_default_conf>;
447 pinctrl-1 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>;
448 pinctrl-2 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>;
449 pinctrl-3 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>;
450};
451
431&oppdm_mpu { 452&oppdm_mpu {
432 vdd-supply = <&buck10_reg>; 453 vdd-supply = <&buck10_reg>;
433}; 454};