aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLCPD Auto Merger2018-03-13 09:19:05 -0500
committerLCPD Auto Merger2018-03-13 09:19:05 -0500
commit4f5b6db75de383ca0114b0edbe479885107950af (patch)
tree966fdad03c04d5857ab98206f7f9d4d7ec5d87b8
parent2846934e0b0cbed2b81d754f3284a0c380945969 (diff)
parent4a9c4fec7bb53ab82bc7a0b80a7435d059db438a (diff)
downloadkernel-omap-4f5b6db75de383ca0114b0edbe479885107950af.tar.gz
kernel-omap-4f5b6db75de383ca0114b0edbe479885107950af.tar.xz
kernel-omap-4f5b6db75de383ca0114b0edbe479885107950af.zip
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.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 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 @@
289&pcie1_rc { 289&pcie1_rc {
290 status = "okay"; 290 status = "okay";
291}; 291};
292
293&mmc4 {
294 bus-width = <4>;
295 cap-power-off-card;
296 keep-power-in-suspend;
297 ti,non-removable;
298
299 #address-cells = <1>;
300 #size-cells = <0>;
301 wlcore: wlcore@2 {
302 compatible = "ti,wl1835";
303 reg = <2>;
304 interrupt-parent = <&gpio5>;
305 interrupts = <7 IRQ_TYPE_EDGE_RISING>;
306 };
307};
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 @@
894&mmc4 { 894&mmc4 {
895 status = "okay"; 895 status = "okay";
896 vmmc-supply = <&vmmcwl_fixed>; 896 vmmc-supply = <&vmmcwl_fixed>;
897 bus-width = <4>;
898 cap-power-off-card;
899 keep-power-in-suspend;
900 ti,non-removable;
901 897
902 pinctrl-names = "default-rev11", "default", "hs-rev11", "hs", "sdr12-rev11", "sdr12", "sdr25-rev11", "sdr25"; 898 pinctrl-names = "default-rev11", "default", "hs-rev11", "hs", "sdr12-rev11", "sdr12", "sdr25-rev11", "sdr25";
903 pinctrl-0 = <&mmc4_pins_default &mmc4_iodelay_ds_rev11_conf>; 899 pinctrl-0 = <&mmc4_pins_default &mmc4_iodelay_ds_rev11_conf>;
@@ -908,15 +904,6 @@
908 pinctrl-5 = <&mmc4_pins_sdr12 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>; 904 pinctrl-5 = <&mmc4_pins_sdr12 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>;
909 pinctrl-6 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev11_conf>; 905 pinctrl-6 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev11_conf>;
910 pinctrl-7 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>; 906 pinctrl-7 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>;
911
912 #address-cells = <1>;
913 #size-cells = <0>;
914 wlcore: wlcore@2 {
915 compatible = "ti,wl1835";
916 reg = <2>;
917 interrupt-parent = <&gpio5>;
918 interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
919 };
920}; 907};
921 908
922&oppdm_mpu { 909&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 @@
115 vin-supply = <&smps5_reg>; 115 vin-supply = <&smps5_reg>;
116 }; 116 };
117 117
118 vmmcwl_fixed: fixedregulator-mmcwl {
119 compatible = "regulator-fixed";
120 regulator-name = "vmmcwl_fixed";
121 regulator-min-microvolt = <1800000>;
122 regulator-max-microvolt = <1800000>;
123 gpio = <&gpio5 8 0>; /* gpio5_8 */
124 startup-delay-us = <70000>;
125 enable-active-high;
126 };
127
118 vtt_fixed: fixedregulator-vtt { 128 vtt_fixed: fixedregulator-vtt {
119 compatible = "regulator-fixed"; 129 compatible = "regulator-fixed";
120 regulator-name = "vtt_fixed"; 130 regulator-name = "vtt_fixed";
@@ -424,6 +434,17 @@
424 pinctrl-3 = <&mmc2_pins_hs200 &mmc2_iodelay_hs200_conf>; 434 pinctrl-3 = <&mmc2_pins_hs200 &mmc2_iodelay_hs200_conf>;
425}; 435};
426 436
437&mmc4 {
438 status = "okay";
439 vmmc-supply = <&vmmcwl_fixed>;
440
441 pinctrl-names = "default", "hs", "sdr12", "sdr25";
442 pinctrl-0 = <&mmc4_pins_hs &mmc4_iodelay_default_conf>;
443 pinctrl-1 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>;
444 pinctrl-2 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>;
445 pinctrl-3 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>;
446};
447
427&oppdm_mpu { 448&oppdm_mpu {
428 vdd-supply = <&buck10_reg>; 449 vdd-supply = <&buck10_reg>;
429}; 450};