zynq7-base.dtsi: Update bindings

* Update bindings for I2C
* Comment out non-secure DMA (PL330) node
* Add CPU voltage regulator node (fixed voltage, resolved 'failed to get
  cpu0 regulator error')

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

1 files changed, 15 insertions, 6 deletions

diff --git a/conf/machine/boards/common/zynq7-base.dtsi b/conf/machine/boards/common/zynq7-base.dtsi
index bfbdc511..c8ffd753 100644
--- a/conf/machine/boards/common/zynq7-base.dtsi
+++ b/conf/machine/boards/common/zynq7-base.dtsi
@@ -71,6 +71,7 @@
                         i-cache-line-size = <0x20>;
                         i-cache-size = <0x8000>;
                         interrupt-handle = <&ps7_scugic_0>;
+                        cpu0-supply = <&regulator_vccpint>;
                         operating-points = <666667 1000000 333334 1000000 222223 1000000>;
                         reg = <0x0>;
                 } ;
@@ -94,6 +95,14 @@
                 reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
                 reg-names = "cpu0", "cpu1";
         } ;
+        regulator_vccpint: fixedregulator@0 {
+                compatible = "regulator-fixed";
+                regulator-name = "VCCPINT";
+                regulator-min-microvolt = <1000000>;
+                regulator-max-microvolt = <1000000>;
+                regulator-boot-on;
+                regulator-always-on;
+        } ;
         ps7_axi_interconnect_0: amba@0 {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -218,19 +227,19 @@
                         reset = <0>;
                         timeout = <10>;
                 } ;
-                ps7_dma_ns: ps7-dma@f8004000 {
+                /*ps7_dma_ns: ps7-dma@f8004000 {
                         #dma-cells = <1>;
                         #dma-channels = <8>;
                         #dma-requests = <4>;
                         arm,primecell-periphid = <0x41330>;
                         clock-names = "apb_pclk";
                         clocks = <&clkc 27>;
-                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                        compatible = "xlnx,ps7-dma-1.00.a", "arm,pl330", "arm,primecell";
                         interrupt-parent = <&ps7_scugic_0>;
                         interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3", "dma4", "dma5", "dma6", "dma7";
                         interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                         reg = <0xf8004000 0x1000>;
-                } ;
+                } ;*/
                 ps7_dma_s: ps7-dma@f8003000 {
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -238,7 +247,7 @@
                         arm,primecell-periphid = <0x41330>;
                         clock-names = "apb_pclk";
                         clocks = <&clkc 27>;
-                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                        compatible = "xlnx,ps7-dma-1.00.a", "arm,pl330", "arm,primecell";
                         interrupt-parent = <&ps7_scugic_0>;
                         interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3", "dma4", "dma5", "dma6", "dma7";
                         interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
@@ -426,7 +435,7 @@
                 ps7_i2c_0: ps7-i2c@e0004000 {
                         bus-id = <0>;
                         clocks = <&clkc 38>;
-                        compatible = "xlnx,ps7-i2c-1.00.a";
+                        compatible = "cdns,i2c-r1p10", "xlnx,ps7-i2c-1.00.a";
                         interrupt-parent = <&ps7_scugic_0>;
                         interrupts = <0 25 4>;
                         reg = <0xe0004000 0x1000>;
@@ -437,7 +446,7 @@
                 ps7_i2c_1: ps7-i2c@e0005000 {
                         bus-id = <1>;
                         clocks = <&clkc 39>;
-                        compatible = "xlnx,ps7-i2c-1.00.a";
+                        compatible = "cdns,i2c-r1p10", "xlnx,ps7-i2c-1.00.a";
                         interrupt-parent = <&ps7_scugic_0>;
                         interrupts = <0 48 4>;
                         reg = <0xe0005000 0x1000>;