summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorChris Ball <chris@printf.net>2014-03-17 09:04:57 -0400
committerChris Ball <chris@printf.net>2014-03-17 09:04:57 -0400
commit2b5cc85135279c3504c72ab51bd089d102a2f8e9 (patch)
treef46fcf30d9f67f5f5d88f6359e7ac4a8941d6d2e /arch/arm
parentb42b9b12e9b768884f258e31caf4f3a2a2cea2fd (diff)
downloadop-kernel-dev-2b5cc85135279c3504c72ab51bd089d102a2f8e9.zip
op-kernel-dev-2b5cc85135279c3504c72ab51bd089d102a2f8e9.tar.gz
Revert "dts: socfpga: Add support for SD/MMC on the SOCFPGA platform"
This reverts commit d9c3f5df539a8a74cc830b35838670fe0541fed1, which should not have been merged via mmc-next. It's in arm-soc instead now.
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/socfpga.dtsi17
-rw-r--r--arch/arm/boot/dts/socfpga_arria5.dtsi11
-rw-r--r--arch/arm/boot/dts/socfpga_cyclone5.dtsi11
-rw-r--r--arch/arm/boot/dts/socfpga_vt.dts11
4 files changed, 3 insertions, 47 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 5f58246..537f1a5 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -473,17 +473,6 @@
arm,data-latency = <2 1 1>;
};
- mmc: dwmmc0@ff704000 {
- compatible = "altr,socfpga-dw-mshc";
- reg = <0xff704000 0x1000>;
- interrupts = <0 139 4>;
- fifo-depth = <0x400>;
- #address-cells = <1>;
- #size-cells = <0>;
- clocks = <&l4_mp_clk>, <&sdmmc_clk>;
- clock-names = "biu", "ciu";
- };
-
/* Local timer */
timer@fffec600 {
compatible = "arm,cortex-a9-twd-timer";
@@ -538,8 +527,8 @@
};
sysmgr@ffd08000 {
- compatible = "altr,sys-mgr", "syscon";
- reg = <0xffd08000 0x4000>;
- };
+ compatible = "altr,sys-mgr";
+ reg = <0xffd08000 0x4000>;
+ };
};
};
diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
index 6c87b70..a85b404 100644
--- a/arch/arm/boot/dts/socfpga_arria5.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
@@ -27,17 +27,6 @@
};
};
- dwmmc0@ff704000 {
- num-slots = <1>;
- supports-highspeed;
- broken-cd;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
- };
-
serial0@ffc02000 {
clock-frequency = <100000000>;
};
diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
index ca41b0e..a8716f6 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
+++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
@@ -28,17 +28,6 @@
};
};
- dwmmc0@ff704000 {
- num-slots = <1>;
- supports-highspeed;
- broken-cd;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
- };
-
ethernet@ff702000 {
phy-mode = "rgmii";
phy-addr = <0xffffffff>; /* probe for phy addr */
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
index 222313f..d1ec0ca 100644
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -41,17 +41,6 @@
};
};
- dwmmc0@ff704000 {
- num-slots = <1>;
- supports-highspeed;
- broken-cd;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
- };
-
ethernet@ff700000 {
phy-mode = "gmii";
status = "okay";
OpenPOWER on IntegriCloud