Commit 42beb762 authored by Baruch Siach's avatar Baruch Siach Committed by Max Filippov
Browse files

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: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 4809bb46

arch/xtensa/boot/dts/lx60.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>;

arch/xtensa/boot/dts/ml605.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>;

arch/xtensa/boot/dts/xtfpga.dtsi

+2 −2
Original line number Original line Diff line number Diff line 
/ {

/ {

	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>;

arch/xtensa/platforms/xtfpga/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE