Merge tag 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

From Linus Walleij:

Nomadik DT and clock work:
- Lee Jones' pinctrl compat ontology patches
- A real clock driver for the Nomadik, 100% DT-based
- Device tree changes for the Nomadik clocks

* tag 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  pinctrl/nomadik: Standardise Pinctrl compat string for Nomadik based platforms
  ARM: nomadik: Standardise Nomadik STN8815 based Pinctrl compat string in the DTS

Conflicts:
	arch/arm/boot/dts/ste-nomadik-s8815.dts

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

diff --cc arch/arm/boot/dts/ste-nomadik-s8815.dts
index f4dfda7,fd573d2..16c3888
--- 1/arch/arm/boot/dts/ste-nomadik-s8815.dts
--- 2/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@@ -14,14 -14,12 +14,20 @@@
                bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
        };
  
 +      /* This is where the interrupt is routed on the S8815 board */
 +      external-bus@34000000 {
 +              ethernet@300 {
 +                      interrupt-parent = <&gpio3>;
 +                      interrupts = <8 0x1>;
 +              };
 +      };
 +
+       src@101e0000 {
+               /* These chrystal drivers are not used on this board */
+               disable-sxtalo;
+               disable-mxtalo;
+       };
+ 
        pinctrl {
                /* Hog CD pins */
                pinctrl-names = "default";

diff --cc drivers/pinctrl/pinctrl-nomadik.c
Simple merge