Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Baruch Siach and committed by
Max Filippov
42beb762 4809bb46

+5 -5
+1 -1
arch/xtensa/boot/dts/lx60.dts
··· 3 3 /include/ "xtfpga-flash-4m.dtsi" 4 4 5 5 / { 6 - compatible = "xtensa,lx60"; 6 + compatible = "cdns,xtensa-lx60"; 7 7 memory@0 { 8 8 device_type = "memory"; 9 9 reg = <0x00000000 0x04000000>;
+1 -1
arch/xtensa/boot/dts/ml605.dts
··· 3 3 /include/ "xtfpga-flash-16m.dtsi" 4 4 5 5 / { 6 - compatible = "xtensa,ml605"; 6 + compatible = "cdns,xtensa-ml605"; 7 7 memory@0 { 8 8 device_type = "memory"; 9 9 reg = <0x00000000 0x08000000>;
+2 -2
arch/xtensa/boot/dts/xtfpga.dtsi
··· 1 1 / { 2 - compatible = "xtensa,xtfpga"; 2 + compatible = "cdns,xtensa-xtfpga"; 3 3 #address-cells = <1>; 4 4 #size-cells = <1>; 5 5 interrupt-parent = <&pic>; ··· 17 17 #address-cells = <1>; 18 18 #size-cells = <0>; 19 19 cpu@0 { 20 - compatible = "xtensa,cpu"; 20 + compatible = "cdns,xtensa-cpu"; 21 21 reg = <0>; 22 22 /* Filled in by platform_setup from FPGA register 23 23 * clock-frequency = <100000000>;
+1 -1
arch/xtensa/platforms/xtfpga/setup.c
··· 168 168 long clk_freq = 0; 169 169 #ifdef CONFIG_OF 170 170 struct device_node *cpu = 171 - of_find_compatible_node(NULL, NULL, "xtensa,cpu"); 171 + of_find_compatible_node(NULL, NULL, "cdns,xtensa-cpu"); 172 172 if (cpu) { 173 173 u32 freq; 174 174 update_clock_frequency(cpu);