3003-arm64-dts-Update-address-cells-and-reg-properties-of.patch 3.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141
  1. From 3970a709eb4c25e298e11cfe0ea7412bb2139197 Mon Sep 17 00:00:00 2001
  2. From: Alison Wang <alison.wang@nxp.com>
  3. Date: Fri, 8 Jul 2016 10:50:46 +0800
  4. Subject: [PATCH 03/70] arm64: dts: Update address-cells and reg properties of
  5. cpu nodes
  6. commit 67161e229a59faf81732892b45a9ab3bae62ea18
  7. [context adjustment]
  8. MPIDR_EL1[63:32] value is equal to 0 for the CPUs of the LS1043A and
  9. LS2080A SoCs. The ARM CPU binding allows #address-cells to be set to 1,
  10. since MPIDR_EL1[63:32] bits are not used for CPUs identification. Update
  11. the #address-cells and reg properties accordingly.
  12. Signed-off-by: Alison Wang <alison.wang@nxp.com>
  13. Integrated-by: Zhao Qiang <qiang.zhao@nxp.com>
  14. ---
  15. arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 10 +++++-----
  16. arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 18 +++++++++---------
  17. 2 files changed, 14 insertions(+), 14 deletions(-)
  18. --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
  19. +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
  20. @@ -51,7 +51,7 @@
  21. #size-cells = <2>;
  22. cpus {
  23. - #address-cells = <2>;
  24. + #address-cells = <1>;
  25. #size-cells = <0>;
  26. /*
  27. @@ -63,28 +63,28 @@
  28. cpu0: cpu@0 {
  29. device_type = "cpu";
  30. compatible = "arm,cortex-a53";
  31. - reg = <0x0 0x0>;
  32. + reg = <0x0>;
  33. clocks = <&clockgen 1 0>;
  34. };
  35. cpu1: cpu@1 {
  36. device_type = "cpu";
  37. compatible = "arm,cortex-a53";
  38. - reg = <0x0 0x1>;
  39. + reg = <0x1>;
  40. clocks = <&clockgen 1 0>;
  41. };
  42. cpu2: cpu@2 {
  43. device_type = "cpu";
  44. compatible = "arm,cortex-a53";
  45. - reg = <0x0 0x2>;
  46. + reg = <0x2>;
  47. clocks = <&clockgen 1 0>;
  48. };
  49. cpu3: cpu@3 {
  50. device_type = "cpu";
  51. compatible = "arm,cortex-a53";
  52. - reg = <0x0 0x3>;
  53. + reg = <0x3>;
  54. clocks = <&clockgen 1 0>;
  55. };
  56. };
  57. --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
  58. +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
  59. @@ -51,7 +51,7 @@
  60. #size-cells = <2>;
  61. cpus {
  62. - #address-cells = <2>;
  63. + #address-cells = <1>;
  64. #size-cells = <0>;
  65. /*
  66. @@ -65,56 +65,56 @@
  67. cpu@0 {
  68. device_type = "cpu";
  69. compatible = "arm,cortex-a57";
  70. - reg = <0x0 0x0>;
  71. + reg = <0x0>;
  72. clocks = <&clockgen 1 0>;
  73. };
  74. cpu@1 {
  75. device_type = "cpu";
  76. compatible = "arm,cortex-a57";
  77. - reg = <0x0 0x1>;
  78. + reg = <0x1>;
  79. clocks = <&clockgen 1 0>;
  80. };
  81. cpu@100 {
  82. device_type = "cpu";
  83. compatible = "arm,cortex-a57";
  84. - reg = <0x0 0x100>;
  85. + reg = <0x100>;
  86. clocks = <&clockgen 1 1>;
  87. };
  88. cpu@101 {
  89. device_type = "cpu";
  90. compatible = "arm,cortex-a57";
  91. - reg = <0x0 0x101>;
  92. + reg = <0x101>;
  93. clocks = <&clockgen 1 1>;
  94. };
  95. cpu@200 {
  96. device_type = "cpu";
  97. compatible = "arm,cortex-a57";
  98. - reg = <0x0 0x200>;
  99. + reg = <0x200>;
  100. clocks = <&clockgen 1 2>;
  101. };
  102. cpu@201 {
  103. device_type = "cpu";
  104. compatible = "arm,cortex-a57";
  105. - reg = <0x0 0x201>;
  106. + reg = <0x201>;
  107. clocks = <&clockgen 1 2>;
  108. };
  109. cpu@300 {
  110. device_type = "cpu";
  111. compatible = "arm,cortex-a57";
  112. - reg = <0x0 0x300>;
  113. + reg = <0x300>;
  114. clocks = <&clockgen 1 3>;
  115. };
  116. cpu@301 {
  117. device_type = "cpu";
  118. compatible = "arm,cortex-a57";
  119. - reg = <0x0 0x301>;
  120. + reg = <0x301>;
  121. clocks = <&clockgen 1 3>;
  122. };
  123. };