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

[~andy/linux] / arch / xtensa / boot / dts / xtfpga.dtsi

diff --git a/arch/xtensa/boot/dts/xtfpga.dtsi b/arch/xtensa/boot/dts/xtfpga.dtsi
index 7eda6ecf7eef3652cbc096b7f4859b03a66996bd..46b4f5eab421badbec1ae38cab4afac88fb7c731 100644 (file)
--- a/arch/xtensa/boot/dts/xtfpga.dtsi
+++ b/arch/xtensa/boot/dts/xtfpga.dtsi
@@ -1,5 +1,5 @@
 / {
-       compatible = "xtensa,xtfpga";
+       compatible = "cdns,xtensa-xtfpga";
        #address-cells = <1>;
        #size-cells = <1>;
        interrupt-parent = <&pic>;
@@ -17,7 +17,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
                cpu@0 {
-                       compatible = "xtensa,cpu";
+                       compatible = "cdns,xtensa-cpu";
                        reg = <0>;
                        /* Filled in by platform_setup from FPGA register
                         * clock-frequency = <100000000>;
@@ -26,7 +26,7 @@
        };
 
        pic: pic {
-               compatible = "xtensa,pic";
+               compatible = "cdns,xtensa-pic";
                /* one cell: internal irq number,
                 * two cells: second cell == 0: internal irq number
                 *            second cell == 1: external irq number