aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Jacques Hiblot2018-03-02 03:07:30 -0600
committerJean-Jacques Hiblot2018-03-08 09:45:42 -0600
commitf9c6fcb1045bff3a2110a6334957f23b7df730b1 (patch)
treef187851e4e78ab2f4fefe3720eeb06b7202bdc2e
parentf0968ac62d71fda8d7cb3c5f68a339990cdd6346 (diff)
downloadkernel-omap-f9c6fcb1045bff3a2110a6334957f23b7df730b1.tar.gz
kernel-omap-f9c6fcb1045bff3a2110a6334957f23b7df730b1.tar.xz
kernel-omap-f9c6fcb1045bff3a2110a6334957f23b7df730b1.zip
ARM: dts: dra7-evm: move MMC4 description to common file
Put the generic part of the description of MMC4 in the common file dra7-evm-common.dtsi so that it can bere-used. Also fixes the role of the regulator "vmmcwl_fixed" which is used for the IO signals, not for the main power. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
-rw-r--r--arch/arm/boot/dts/dra7-evm-common.dtsi16
-rw-r--r--arch/arm/boot/dts/dra7-evm.dts13
2 files changed, 16 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 {