aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Huang2018-03-13 14:13:02 -0500
committerDavid Huang2018-03-13 14:13:02 -0500
commitad440a10f50f187e17dd65a7b9f30ba42eb2d63f (patch)
treeb233ee72f41aeceb023267e18ebf5849eab5f98b
parentbd9266dec01d80d1ca572e443b79483965651b15 (diff)
parent4f5b6db75de383ca0114b0edbe479885107950af (diff)
downloadkernel-omap-ad440a10f50f187e17dd65a7b9f30ba42eb2d63f.tar.gz
kernel-omap-ad440a10f50f187e17dd65a7b9f30ba42eb2d63f.tar.xz
kernel-omap-ad440a10f50f187e17dd65a7b9f30ba42eb2d63f.zip
Merge branch 'ti-lsk-linux-4.4.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel into p-ti-lsk-linux-4.4.y
Auto Merge of: TI-Feature: lcpd-linux-4.4.y_linux-4.4.y TI-Tree: git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git TI-Branch: ti-lsk-linux-4.4.y * 'ti-lsk-linux-4.4.y' of git://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: 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 8ea4d57a6d3b..866ec857f231 100644
--- a/arch/arm/boot/dts/dra7-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra7-evm-common.dtsi
@@ -291,3 +291,19 @@
291&pcie1_rc { 291&pcie1_rc {
292 status = "okay"; 292 status = "okay";
293}; 293};
294
295&mmc4 {
296 bus-width = <4>;
297 cap-power-off-card;
298 keep-power-in-suspend;
299 ti,non-removable;
300
301 #address-cells = <1>;
302 #size-cells = <0>;
303 wlcore: wlcore@2 {
304 compatible = "ti,wl1835";
305 reg = <2>;
306 interrupt-parent = <&gpio5>;
307 interrupts = <7 IRQ_TYPE_EDGE_RISING>;
308 };
309};
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index eab47e32b2fa..79d13a298293 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -930,10 +930,6 @@ i2c_p3_exp: &i2c2 {
930&mmc4 { 930&mmc4 {
931 status = "okay"; 931 status = "okay";
932 vmmc-supply = <&vmmcwl_fixed>; 932 vmmc-supply = <&vmmcwl_fixed>;
933 bus-width = <4>;
934 cap-power-off-card;
935 keep-power-in-suspend;
936 ti,non-removable;
937 933
938 pinctrl-names = "default-rev11", "default", "hs-rev11", "hs", "sdr12-rev11", "sdr12", "sdr25-rev11", "sdr25"; 934 pinctrl-names = "default-rev11", "default", "hs-rev11", "hs", "sdr12-rev11", "sdr12", "sdr25-rev11", "sdr25";
939 pinctrl-0 = <&mmc4_pins_default &mmc4_iodelay_ds_rev11_conf>; 935 pinctrl-0 = <&mmc4_pins_default &mmc4_iodelay_ds_rev11_conf>;
@@ -944,15 +940,6 @@ i2c_p3_exp: &i2c2 {
944 pinctrl-5 = <&mmc4_pins_sdr12 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>; 940 pinctrl-5 = <&mmc4_pins_sdr12 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>;
945 pinctrl-6 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev11_conf>; 941 pinctrl-6 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev11_conf>;
946 pinctrl-7 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>; 942 pinctrl-7 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>;
947
948 #address-cells = <1>;
949 #size-cells = <0>;
950 wlcore: wlcore@2 {
951 compatible = "ti,wl1835";
952 reg = <2>;
953 interrupt-parent = <&gpio5>;
954 interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
955 };
956}; 943};
957 944
958&oppdm_mpu { 945&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};