xtensa: standardize devicetree cpu compatible strings

The recommended compatible string format, according to the ePAPR v1.1 standard,
is "manufacturer,model". Change the xtensa cpu compatible strings to
"cdns,xtensa-cpu". Also, change the boards compatible strings in a similar way.

The pic compatible string will be dealt with in a separate patch.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

diff --git a/arch/xtensa/boot/dts/lx60.dts b/arch/xtensa/boot/dts/lx60.dts
index 2eab3658e1bd3a5f2dda14cd6f6784b64d181a98..a0f8b8ad39204d99f977972f38b5cd9f737fdf0a 100644 (file)
--- a/arch/xtensa/boot/dts/lx60.dts
+++ b/arch/xtensa/boot/dts/lx60.dts
@@ -3,7 +3,7 @@
 /include/ "xtfpga-flash-4m.dtsi"
 
 / {
-       compatible = "xtensa,lx60";
+       compatible = "cdns,xtensa-lx60";
        memory@0 {
                device_type = "memory";
                reg = <0x00000000 0x04000000>;

diff --git a/arch/xtensa/boot/dts/ml605.dts b/arch/xtensa/boot/dts/ml605.dts
index 6ed51d6554e67de9ad1baeebbba64f86cc5b3463..905c3a5035e96983799ca116c9cd05a24f24f54c 100644 (file)
--- a/arch/xtensa/boot/dts/ml605.dts
+++ b/arch/xtensa/boot/dts/ml605.dts
@@ -3,7 +3,7 @@
 /include/ "xtfpga-flash-16m.dtsi"
 
 / {
-       compatible = "xtensa,ml605";
+       compatible = "cdns,xtensa-ml605";
        memory@0 {
                device_type = "memory";
                reg = <0x00000000 0x08000000>;

diff --git a/arch/xtensa/boot/dts/xtfpga.dtsi b/arch/xtensa/boot/dts/xtfpga.dtsi
index b042c3f508e66908df6a6972f0fe8e1e955ba3cd..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>;

diff --git a/arch/xtensa/platforms/xtfpga/setup.c b/arch/xtensa/platforms/xtfpga/setup.c
index 74bb74fa3f878e374dafc18fe5934945b08e4c6f..25d936e8296fb875d7addf0efae8ceded84ac0eb 100644 (file)
--- a/arch/xtensa/platforms/xtfpga/setup.c
+++ b/arch/xtensa/platforms/xtfpga/setup.c
@@ -168,7 +168,7 @@ void __init platform_calibrate_ccount(void)
        long clk_freq = 0;
 #ifdef CONFIG_OF
        struct device_node *cpu =
-               of_find_compatible_node(NULL, NULL, "xtensa,cpu");
+               of_find_compatible_node(NULL, NULL, "cdns,xtensa-cpu");
        if (cpu) {
                u32 freq;
                update_clock_frequency(cpu);