aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-10-31 19:23:05 -0400
committerStephen Warren <swarren@nvidia.com>2013-12-16 16:09:18 -0500
commit784c7444f052dda27db8d40ed35b57aefd2e04b8 (patch)
tree4db46e83d29084757d11d25ead7a0b5c5c3e6486
parentcaefe637b494c437e86fa6c90bb4b17e01ea558e (diff)
ARM: tegra: add MMC controllers to Tegra124 DT
Tegra124 has 4 MMC controllers just like previous versions of the SoC. Note that there are some non-backwards-compatible HW differences, and hence a new DT compatible value must be used to describe the HW. Also enable the relevant controllers in the Venice2 board DT. power-gpios property suggested by Thierry Reding. Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Tested-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--arch/arm/boot/dts/tegra124-venice2.dts12
-rw-r--r--arch/arm/boot/dts/tegra124.dtsi40
2 files changed, 52 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 956b6e78255e..f765c822bb14 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -25,6 +25,18 @@
25 nvidia,sys-clock-req-active-high; 25 nvidia,sys-clock-req-active-high;
26 }; 26 };
27 27
28 sdhci@700b0400 {
29 cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
30 power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
31 status = "okay";
32 bus-width = <4>;
33 };
34
35 sdhci@700b0600 {
36 status = "okay";
37 bus-width = <8>;
38 };
39
28 clocks { 40 clocks {
29 compatible = "simple-bus"; 41 compatible = "simple-bus";
30 #address-cells = <1>; 42 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index fe070bc4c862..eb61456d2dc3 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -190,6 +190,46 @@
190 clock-names = "pclk", "clk32k_in"; 190 clock-names = "pclk", "clk32k_in";
191 }; 191 };
192 192
193 sdhci@700b0000 {
194 compatible = "nvidia,tegra124-sdhci";
195 reg = <0x700b0000 0x200>;
196 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
197 clocks = <&tegra_car TEGRA124_CLK_SDMMC1>;
198 resets = <&tegra_car 14>;
199 reset-names = "sdhci";
200 status = "disable";
201 };
202
203 sdhci@700b0200 {
204 compatible = "nvidia,tegra124-sdhci";
205 reg = <0x700b0200 0x200>;
206 interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
207 clocks = <&tegra_car TEGRA124_CLK_SDMMC2>;
208 resets = <&tegra_car 9>;
209 reset-names = "sdhci";
210 status = "disable";
211 };
212
213 sdhci@700b0400 {
214 compatible = "nvidia,tegra124-sdhci";
215 reg = <0x700b0400 0x200>;
216 interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
217 clocks = <&tegra_car TEGRA124_CLK_SDMMC3>;
218 resets = <&tegra_car 69>;
219 reset-names = "sdhci";
220 status = "disable";
221 };
222
223 sdhci@700b0600 {
224 compatible = "nvidia,tegra124-sdhci";
225 reg = <0x700b0600 0x200>;
226 interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
227 clocks = <&tegra_car TEGRA124_CLK_SDMMC4>;
228 resets = <&tegra_car 15>;
229 reset-names = "sdhci";
230 status = "disable";
231 };
232
193 cpus { 233 cpus {
194 #address-cells = <1>; 234 #address-cells = <1>;
195 #size-cells = <0>; 235 #size-cells = <0>;