Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / ste-u300.dts

diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index a9da4800daf0edf96d5b5a853afce566dc0e411a..6fe688e9e4da5230566ba89a8f7f52fab472bd4a 100644 (file)
--- a/arch/arm/boot/dts/ste-u300.dts
+++ b/arch/arm/boot/dts/ste-u300.dts
@@ -457,7 +457,7 @@
                        interrupt-parent = <&vica>;
                        interrupts = <23>;
                        clocks = <&spi_clk>, <&spi_clk>;
-                       clock-names = "apb_pclk", "spi_clk";
+                       clock-names = "SSPCLK", "apb_pclk";
                        dmas = <&dmac 27 &dmac 28>;
                        dma-names = "tx", "rx";
                        num-cs = <3>;