summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-05-21 14:14:28 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2014-05-21 14:26:23 +1000
commitda638d89a482a7573c6ac8b18309014ab56043e6 (patch)
treef7504ba85ba93d5b4bfee8198217c99e90503477
parentfce13fcf078ac0c02af7f7c912a19e9ddd04e666 (diff)
downloadmeta-xilinx-da638d89a482a7573c6ac8b18309014ab56043e6.tar.gz
zynq7-base.dtsi: Update for 3.14 kernel
* Update SD controller nodes * Add ocmc node * Add additional compatible values Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r--conf/machine/boards/common/zynq7-base.dtsi16
1 files changed, 11 insertions, 5 deletions
diff --git a/conf/machine/boards/common/zynq7-base.dtsi b/conf/machine/boards/common/zynq7-base.dtsi
index 4c528a5a..89368dcc 100644
--- a/conf/machine/boards/common/zynq7-base.dtsi
+++ b/conf/machine/boards/common/zynq7-base.dtsi
@@ -136,10 +136,16 @@
136 arm,tag-latency = <2 2 2>; 136 arm,tag-latency = <2 2 2>;
137 } ; 137 } ;
138 ps7_ddrc_0: ps7-ddrc@f8006000 { 138 ps7_ddrc_0: ps7-ddrc@f8006000 {
139 compatible = "xlnx,ps7-ddrc-1.00.a", "xlnx,ps7-ddrc"; 139 compatible = "xlnx,ps7-ddrc-1.00.a", "xlnx,ps7-ddrc", "xlnx,zynq-ddrc-1.0";
140 reg = <0xf8006000 0x1000>; 140 reg = <0xf8006000 0x1000>;
141 xlnx,has-ecc = <0x0>; 141 xlnx,has-ecc = <0x0>;
142 } ; 142 } ;
143 ps7_ocmc_0: ps7-ocmc@f800c000 {
144 compatible = "xlnx,zynq-ocmc-1.0";
145 interrupt-parent = <&ps7_scugic_0>;
146 interrupts = <0 3 4>;
147 reg = <0xf800c000 0x1000>;
148 } ;
143 ps7_ram_0: ps7-ram@fffc0000 { 149 ps7_ram_0: ps7-ram@fffc0000 {
144 compatible = "xlnx,ps7-ram-1.00.a", "xlnx,ps7-ocm"; 150 compatible = "xlnx,ps7-ram-1.00.a", "xlnx,ps7-ocm";
145 interrupt-parent = <&ps7_scugic_0>; 151 interrupt-parent = <&ps7_scugic_0>;
@@ -356,8 +362,8 @@
356 } ; 362 } ;
357 363
358 ps7_sd_0: ps7-sdio@e0100000 { 364 ps7_sd_0: ps7-sdio@e0100000 {
359 clock-names = "ref_clk", "aper_clk"; 365 clock-names = "ref_clk", "aper_clk", "clk_xin", "clk_ahb";
360 clocks = <&clkc 21>, <&clkc 32>; 366 clocks = <&clkc 21>, <&clkc 32>, <&clkc 21>, <&clkc 32>;
361 clock-frequency = <50000000>; 367 clock-frequency = <50000000>;
362 compatible = "xlnx,ps7-sdio-1.00.a", "arasan,sdhci", "arasan,sdhci-8.9a", "generic-sdhci"; 368 compatible = "xlnx,ps7-sdio-1.00.a", "arasan,sdhci", "arasan,sdhci-8.9a", "generic-sdhci";
363 interrupt-parent = <&ps7_scugic_0>; 369 interrupt-parent = <&ps7_scugic_0>;
@@ -368,8 +374,8 @@
368 xlnx,has-wp = <0x1>; 374 xlnx,has-wp = <0x1>;
369 } ; 375 } ;
370 ps7_sd_1: ps7-sdio@e0101000 { 376 ps7_sd_1: ps7-sdio@e0101000 {
371 clock-names = "ref_clk", "aper_clk"; 377 clock-names = "ref_clk", "aper_clk", "clk_xin", "clk_ahb";
372 clocks = <&clkc 22>, <&clkc 33>; 378 clocks = <&clkc 22>, <&clkc 33>, <&clkc 22>, <&clkc 33>;
373 clock-frequency = <50000000>; 379 clock-frequency = <50000000>;
374 compatible = "xlnx,ps7-sdio-1.00.a", "arasan,sdhci", "arasan,sdhci-8.9a", "generic-sdhci"; 380 compatible = "xlnx,ps7-sdio-1.00.a", "arasan,sdhci", "arasan,sdhci-8.9a", "generic-sdhci";
375 interrupt-parent = <&ps7_scugic_0>; 381 interrupt-parent = <&ps7_scugic_0>;