diff options
author | Jean-Jacques Hiblot | 2017-08-24 09:09:18 -0500 |
---|---|---|
committer | Jean-Jacques Hiblot | 2017-08-25 08:09:25 -0500 |
commit | 195eea92885bdd4fd17d419f2197001a9b79efa3 (patch) | |
tree | 9e795de1c6a7c087801debe9adeadb7d8134056d | |
parent | ecd2699e51a4522738791e1cfdb2622e2a7e7991 (diff) | |
download | u-boot-195eea92885bdd4fd17d419f2197001a9b79efa3.tar.gz u-boot-195eea92885bdd4fd17d419f2197001a9b79efa3.tar.xz u-boot-195eea92885bdd4fd17d419f2197001a9b79efa3.zip |
ARM: dts: dra76-evm: shift to using common IOdelay data
commit e685f74757bb ("ARM: dts: dra76-evm: shift to using common IOdelay data") branch ti-u-boot-2017.01
Now that we have a device-tree include file with common
MMC/SD IOdelay data for DRA76x SoC, shift the EVM device-tree
file to using that.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
-rw-r--r-- | arch/arm/dts/dra76-evm.dts | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/arch/arm/dts/dra76-evm.dts b/arch/arm/dts/dra76-evm.dts index 5b14dbf72a..6413e670a4 100644 --- a/arch/arm/dts/dra76-evm.dts +++ b/arch/arm/dts/dra76-evm.dts | |||
@@ -9,6 +9,7 @@ | |||
9 | 9 | ||
10 | #include "dra76x.dtsi" | 10 | #include "dra76x.dtsi" |
11 | #include "dra7-evm-common.dtsi" | 11 | #include "dra7-evm-common.dtsi" |
12 | #include "dra76x-mmc-iodelay.dtsi" | ||
12 | #include <dt-bindings/net/ti-dp83867.h> | 13 | #include <dt-bindings/net/ti-dp83867.h> |
13 | 14 | ||
14 | / { | 15 | / { |
@@ -100,46 +101,6 @@ | |||
100 | }; | 101 | }; |
101 | }; | 102 | }; |
102 | 103 | ||
103 | &dra7_pmx_core { | ||
104 | mmc1_pins_default: mmc1_pins_default { | ||
105 | pinctrl-single,pins = < | ||
106 | 0x36c (PIN_INPUT | MUX_MODE14) /* mmc1sdcd.gpio219 */ | ||
107 | 0x354 (PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */ | ||
108 | 0x358 (PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */ | ||
109 | 0x35c (PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */ | ||
110 | 0x360 (PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */ | ||
111 | 0x364 (PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */ | ||
112 | 0x368 (PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */ | ||
113 | >; | ||
114 | }; | ||
115 | |||
116 | mmc2_pins_default: mmc2_pins_default { | ||
117 | pinctrl-single,pins = < | ||
118 | 0x9c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */ | ||
119 | 0xb0 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */ | ||
120 | 0xa0 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */ | ||
121 | 0xa4 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */ | ||
122 | 0xa8 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */ | ||
123 | 0xac (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */ | ||
124 | 0x8c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */ | ||
125 | 0x90 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */ | ||
126 | 0x94 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */ | ||
127 | 0x98 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */ | ||
128 | >; | ||
129 | }; | ||
130 | |||
131 | mmc4_pins_default: mmc4_pins_default { | ||
132 | pinctrl-single,pins = < | ||
133 | 0x3e (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_ctsn.mmc4_clk */ | ||
134 | 0x3e (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_rtsn.mmc4_cmd */ | ||
135 | 0x3f (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_rxd.mmc4_dat0 */ | ||
136 | 0x3f (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_txd.mmc4_dat1 */ | ||
137 | 0x3f (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_ctsn.mmc4_dat2 */ | ||
138 | 0x3f (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_rtsn.mmc4_dat3 */ | ||
139 | >; | ||
140 | }; | ||
141 | }; | ||
142 | |||
143 | &i2c1 { | 104 | &i2c1 { |
144 | status = "okay"; | 105 | status = "okay"; |
145 | clock-frequency = <400000>; | 106 | clock-frequency = <400000>; |