evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xtensa: standardize devicetree cpu compatible strings

Browse source 
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>
This commit is contained in:
Baruch Siach 2013-12-01 10:13:33 +02:00 • committed by Max Filippov
parent 4809bb468f
commit 42beb7628e
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/xtensa/boot/dts/lx60.dts
View file

@ -3,7 +3,7 @@
/include/ "xtfpga-flash-4m.dtsi" /include/ "xtfpga-flash-4m.dtsi"
/ { / {
compatible = "xtensa,lx60"; compatible = "cdns,xtensa-lx60";
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x04000000>; reg = <0x00000000 0x04000000>;

2
arch/xtensa/boot/dts/ml605.dts
View file

@ -3,7 +3,7 @@
/include/ "xtfpga-flash-16m.dtsi" /include/ "xtfpga-flash-16m.dtsi"
/ { / {
compatible = "xtensa,ml605"; compatible = "cdns,xtensa-ml605";
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;

4
arch/xtensa/boot/dts/xtfpga.dtsi
View file

@ -1,5 +1,5 @@
/ { / {
compatible = "xtensa,xtfpga"; compatible = "cdns,xtensa-xtfpga";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
interrupt-parent = <&pic>; interrupt-parent = <&pic>;
@ -17,7 +17,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cpu@0 { cpu@0 {
compatible = "xtensa,cpu"; compatible = "cdns,xtensa-cpu";
reg = <0>; reg = <0>;
/* Filled in by platform_setup from FPGA register /* Filled in by platform_setup from FPGA register
* clock-frequency = <100000000>; * clock-frequency = <100000000>;

2
arch/xtensa/platforms/xtfpga/setup.c
View file

@ -168,7 +168,7 @@ void __init platform_calibrate_ccount(void)
long clk_freq = 0; long clk_freq = 0;
#ifdef CONFIG_OF #ifdef CONFIG_OF
struct device_node *cpu = struct device_node *cpu =
of_find_compatible_node(NULL, NULL, "xtensa,cpu"); of_find_compatible_node(NULL, NULL, "cdns,xtensa-cpu");
if (cpu) { if (cpu) {
u32 freq; u32 freq;
update_clock_frequency(cpu); update_clock_frequency(cpu);