Merge branch 'kirkwood/dt' into next/dt2

This was part of the for-next branch earlier but for some reasons
a rebuild of the tree missed it, so I'm putting it back in now.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/tegra-paz00.dts
index 3c1ff5a43fb74f9cfc28d4898173846e6f3c4795,61f385809970a27d455dfe49b33ffceb938980c0..6c02abb469d4ba971bde9c4fb5aede05a99d4783
--- 1/arch/arm/boot/dts/tegra-paz00.dts
--- 2/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@@ -42,32 -35,13 +42,37 @@@
  
        i2c@7000d000 {
                clock-frequency = <400000>;
+ 
+               adt7461@4c {
+                       compatible = "adi,adt7461";
+                       reg = <0x4c>;
+               };
        };
  
 +      i2s@70002a00 {
 +              status = "disable";
 +      };
 +
 +      sound {
 +              compatible = "nvidia,tegra-audio-alc5632-paz00",
 +                      "nvidia,tegra-audio-alc5632";
 +
 +              nvidia,model = "Compal PAZ00";
 +
 +              nvidia,audio-routing =
 +                      "Int Spk", "SPKOUT",
 +                      "Int Spk", "SPKOUTN",
 +                      "Headset Mic", "MICBIAS1",
 +                      "MIC1", "Headset Mic",
 +                      "Headset Stereophone", "HPR",
 +                      "Headset Stereophone", "HPL",
 +                      "DMICDAT", "Digital Mic";
 +
 +              nvidia,audio-codec = <&alc5632>;
 +              nvidia,i2s-controller = <&tegra_i2s1>;
 +              nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
 +      };
 +
        serial@70006000 {
                clock-frequency = <216000000>;
        };

diff --cc arch/arm/mach-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-mmp/pxa168.c
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge