Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / zynq-parallella.dts

diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
index 41afd9da6876329811454ae9bb466ef6aa27af5a..e1f51ca127fe835664f0609b19a1ef428de62ca8 100644 (file)
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -25,7 +25,7 @@
 
        memory {
                device_type = "memory";
-               reg = <0 0x40000000>;
+               reg = <0x0 0x40000000>;
        };
 
        chosen {
@@ -38,8 +38,6 @@
        status = "okay";
        phy-mode = "rgmii-id";
        phy-handle = <&ethernet_phy>;
-       #address-cells = <1>;
-       #size-cells = <0>;
 
        ethernet_phy: ethernet-phy@0 {
                /* Marvell 88E1318 */
@@ -53,6 +51,29 @@
 
 &i2c0 {
        status = "okay";
+
+       isl9305: isl9305@68 {
+               compatible = "isl,isl9305";
+               reg = <0x68>;
+
+               regulators {
+                       dcd1 {
+                               regulator-name = "VDD_DSP";
+                               regulator-always-on;
+                       };
+                       dcd2 {
+                               regulator-name = "1P35V";
+                               regulator-always-on;
+                       };
+                       ldo1 {
+                               regulator-name = "VDD_ADJ";
+                       };
+                       ldo2 {
+                               regulator-name = "VDD_GPIO";
+                               regulator-always-on;
+                       };
+               };
+       };
 };
 
 &sdhci1 {