diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2013-12-01 03:13:33 -0500 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2014-01-14 15:21:25 -0500 |
| commit | 42beb7628e7a901501e39f520beec67bac3157b1 (patch) | |
| tree | 15c810339ee83d595646b1a5d324e7d0cf37d1d9 /arch/xtensa/boot | |
| parent | 4809bb468f140d561dfbb785e8dcdda5bae8c1f2 (diff) | |
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>
Diffstat (limited to 'arch/xtensa/boot')
| -rw-r--r-- | arch/xtensa/boot/dts/lx60.dts | 2 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/ml605.dts | 2 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/xtfpga.dtsi | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/xtensa/boot/dts/lx60.dts b/arch/xtensa/boot/dts/lx60.dts index 2eab3658e1bd..a0f8b8ad3920 100644 --- a/arch/xtensa/boot/dts/lx60.dts +++ b/arch/xtensa/boot/dts/lx60.dts | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | /include/ "xtfpga-flash-4m.dtsi" | 3 | /include/ "xtfpga-flash-4m.dtsi" |
| 4 | 4 | ||
| 5 | / { | 5 | / { |
| 6 | compatible = "xtensa,lx60"; | 6 | compatible = "cdns,xtensa-lx60"; |
| 7 | memory@0 { | 7 | memory@0 { |
| 8 | device_type = "memory"; | 8 | device_type = "memory"; |
| 9 | reg = <0x00000000 0x04000000>; | 9 | reg = <0x00000000 0x04000000>; |
diff --git a/arch/xtensa/boot/dts/ml605.dts b/arch/xtensa/boot/dts/ml605.dts index 6ed51d6554e6..905c3a5035e9 100644 --- a/arch/xtensa/boot/dts/ml605.dts +++ b/arch/xtensa/boot/dts/ml605.dts | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | /include/ "xtfpga-flash-16m.dtsi" | 3 | /include/ "xtfpga-flash-16m.dtsi" |
| 4 | 4 | ||
| 5 | / { | 5 | / { |
| 6 | compatible = "xtensa,ml605"; | 6 | compatible = "cdns,xtensa-ml605"; |
| 7 | memory@0 { | 7 | memory@0 { |
| 8 | device_type = "memory"; | 8 | device_type = "memory"; |
| 9 | reg = <0x00000000 0x08000000>; | 9 | reg = <0x00000000 0x08000000>; |
diff --git a/arch/xtensa/boot/dts/xtfpga.dtsi b/arch/xtensa/boot/dts/xtfpga.dtsi index b042c3f508e6..46b4f5eab421 100644 --- a/arch/xtensa/boot/dts/xtfpga.dtsi +++ b/arch/xtensa/boot/dts/xtfpga.dtsi | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | / { | 1 | / { |
| 2 | compatible = "xtensa,xtfpga"; | 2 | compatible = "cdns,xtensa-xtfpga"; |
| 3 | #address-cells = <1>; | 3 | #address-cells = <1>; |
| 4 | #size-cells = <1>; | 4 | #size-cells = <1>; |
| 5 | interrupt-parent = <&pic>; | 5 | interrupt-parent = <&pic>; |
| @@ -17,7 +17,7 @@ | |||
| 17 | #address-cells = <1>; | 17 | #address-cells = <1>; |
| 18 | #size-cells = <0>; | 18 | #size-cells = <0>; |
| 19 | cpu@0 { | 19 | cpu@0 { |
| 20 | compatible = "xtensa,cpu"; | 20 | compatible = "cdns,xtensa-cpu"; |
| 21 | reg = <0>; | 21 | reg = <0>; |
| 22 | /* Filled in by platform_setup from FPGA register | 22 | /* Filled in by platform_setup from FPGA register |
| 23 | * clock-frequency = <100000000>; | 23 | * clock-frequency = <100000000>; |