Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx53-ppd.dts

diff --git a/arch/arm/boot/dts/imx53-ppd.dts b/arch/arm/boot/dts/imx53-ppd.dts
index 5a5fa61..37d0cff 100644 (file)
--- a/arch/arm/boot/dts/imx53-ppd.dts
+++ b/arch/arm/boot/dts/imx53-ppd.dts
@@ -70,6 +70,12 @@
                clock-frequency = <11289600>;
        };
 
+       achc_24M: achc-clock {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <24000000>;
+       };
+
        sgtlsound: sound {
                compatible = "fsl,imx53-cpuvo-sgtl5000",
                             "fsl,imx-audio-sgtl5000";
@@ -314,16 +320,13 @@
                    &gpio4 12 GPIO_ACTIVE_LOW>;
        status = "okay";
 
-       spidev0: spi@0 {
-               compatible = "ge,achc";
-               reg = <0>;
-               spi-max-frequency = <1000000>;
-       };
-
-       spidev1: spi@1 {
-               compatible = "ge,achc";
-               reg = <1>;
-               spi-max-frequency = <1000000>;
+       spidev0: spi@1 {
+               compatible = "ge,achc", "nxp,kinetis-k20";
+               reg = <1>, <0>;
+               vdd-supply = <&reg_3v3>;
+               vdda-supply = <&reg_3v3>;
+               clocks = <&achc_24M>;
+               reset-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
        };
 
        gpioxra0: gpio@2 {