Skip to content

Commit

Permalink
xtensa: standardize devicetree cpu compatible strings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Baruch Siach authored and Max Filippov committed Jan 14, 2014
1 parent 4809bb4 commit 42beb76
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/xtensa/boot/dts/lx60.dts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/include/ "xtfpga-flash-4m.dtsi"

/ {
compatible = "xtensa,lx60";
compatible = "cdns,xtensa-lx60";
memory@0 {
device_type = "memory";
reg = <0x00000000 0x04000000>;
Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/boot/dts/ml605.dts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/include/ "xtfpga-flash-16m.dtsi"

/ {
compatible = "xtensa,ml605";
compatible = "cdns,xtensa-ml605";
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
Expand Down
4 changes: 2 additions & 2 deletions arch/xtensa/boot/dts/xtfpga.dtsi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/ {
compatible = "xtensa,xtfpga";
compatible = "cdns,xtensa-xtfpga";
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&pic>;
Expand All @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/platforms/xtfpga/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 42beb76

Please sign in to comment.