linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] MIPS: Loongson: Rename CPU device-tree binding
@ 2020-06-15  6:04 Huacai Chen
  2020-06-15  6:04 ` [PATCH 2/2] dt-bindings: mips: Document two Loongson boards Huacai Chen
  2020-07-08  9:33 ` [PATCH 1/2] MIPS: Loongson: Rename CPU device-tree binding Thomas Bogendoerfer
  0 siblings, 2 replies; 4+ messages in thread
From: Huacai Chen @ 2020-06-15  6:04 UTC (permalink / raw)
  To: Rob Herring, Thomas Bogendoerfer
  Cc: devicetree, linux-mips, Huacai Chen, Jiaxun Yang, Huacai Chen

Loongson-3A R1/R2/R3 and Loongson-3B R1/R2 use the same package naming
in dts, and Loongson-3A R4 will be different. In cpu.h the classic 64bit
Loongson processors are called Loongson64C (C for classic, pre Loongson-
3A R4), and the new 64bit Loongson processors are called Loongson64G (G
for generic, Loongson-3A R4+). To keep consistency and make extensible,
we rename the classic "loongson3" prefix to "loongson64c", and the new
prefix for Loongson-3A R4+ will be "loongson64g".

Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
 Documentation/devicetree/bindings/mips/loongson/devices.yaml      | 8 ++++----
 arch/mips/boot/dts/loongson/Makefile                              | 2 +-
 .../loongson/{loongson3-package.dtsi => loongson64c-package.dtsi} | 0
 .../{loongson3_4core_rs780e.dts => loongson64c_4core_rs780e.dts}  | 2 +-
 .../{loongson3_8core_rs780e.dts => loongson64c_8core_rs780e.dts}  | 2 +-
 arch/mips/include/asm/mach-loongson64/builtin_dtbs.h              | 4 ++--
 arch/mips/loongson64/env.c                                        | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename arch/mips/boot/dts/loongson/{loongson3-package.dtsi => loongson64c-package.dtsi} (100%)
 rename arch/mips/boot/dts/loongson/{loongson3_4core_rs780e.dts => loongson64c_4core_rs780e.dts} (93%)
 rename arch/mips/boot/dts/loongson/{loongson3_8core_rs780e.dts => loongson64c_8core_rs780e.dts} (93%)

diff --git a/Documentation/devicetree/bindings/mips/loongson/devices.yaml b/Documentation/devicetree/bindings/mips/loongson/devices.yaml
index 74ed4e3..0516fe2 100644
--- a/Documentation/devicetree/bindings/mips/loongson/devices.yaml
+++ b/Documentation/devicetree/bindings/mips/loongson/devices.yaml
@@ -17,11 +17,11 @@ properties:
   compatible:
     oneOf:
 
-      - description: Generic Loongson3 Quad Core + RS780E
+      - description: Classic Loongson64 Quad Core + RS780E
         items:
-          - const: loongson,loongson3-4core-rs780e
+          - const: loongson,loongson64c-4core-rs780e
 
-      - description: Generic Loongson3 Octa Core + RS780E
+      - description: Classic Loongson64 Octa Core + RS780E
         items:
-          - const: loongson,loongson3-8core-rs780e
+          - const: loongson,loongson64c-8core-rs780e
 ...
diff --git a/arch/mips/boot/dts/loongson/Makefile b/arch/mips/boot/dts/loongson/Makefile
index 56d3794..aa5069a 100644
--- a/arch/mips/boot/dts/loongson/Makefile
+++ b/arch/mips/boot/dts/loongson/Makefile
@@ -1,4 +1,4 @@
 # SPDX_License_Identifier: GPL_2.0
-dtb-$(CONFIG_MACH_LOONGSON64)	+= loongson3_4core_rs780e.dtb loongson3_8core_rs780e.dtb
+dtb-$(CONFIG_MACH_LOONGSON64)	+= loongson64c_4core_rs780e.dtb loongson64c_8core_rs780e.dtb
 
 obj-$(CONFIG_BUILTIN_DTB)	+= $(addsuffix .o, $(dtb-y))
diff --git a/arch/mips/boot/dts/loongson/loongson3-package.dtsi b/arch/mips/boot/dts/loongson/loongson64c-package.dtsi
similarity index 100%
rename from arch/mips/boot/dts/loongson/loongson3-package.dtsi
rename to arch/mips/boot/dts/loongson/loongson64c-package.dtsi
diff --git a/arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts b/arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts
similarity index 93%
rename from arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts
rename to arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts
index 6b5694c..acd53a1 100644
--- a/arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts
+++ b/arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts
@@ -2,7 +2,7 @@
 
 /dts-v1/;
 
-#include "loongson3-package.dtsi"
+#include "loongson64c-package.dtsi"
 #include "rs780e-pch.dtsi"
 
 / {
diff --git a/arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts b/arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts
similarity index 93%
rename from arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts
rename to arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts
index ffefa2f..433f9c3 100644
--- a/arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts
+++ b/arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts
@@ -2,7 +2,7 @@
 
 /dts-v1/;
 
-#include "loongson3-package.dtsi"
+#include "loongson64c-package.dtsi"
 #include "rs780e-pch.dtsi"
 
 / {
diff --git a/arch/mips/include/asm/mach-loongson64/builtin_dtbs.h b/arch/mips/include/asm/mach-loongson64/builtin_dtbs.h
index 853c6d80..930c8a1 100644
--- a/arch/mips/include/asm/mach-loongson64/builtin_dtbs.h
+++ b/arch/mips/include/asm/mach-loongson64/builtin_dtbs.h
@@ -8,6 +8,6 @@
 #ifndef __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_
 #define __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_
 
-extern u32 __dtb_loongson3_4core_rs780e_begin[];
-extern u32 __dtb_loongson3_8core_rs780e_begin[];
+extern u32 __dtb_loongson64c_4core_rs780e_begin[];
+extern u32 __dtb_loongson64c_8core_rs780e_begin[];
 #endif
diff --git a/arch/mips/loongson64/env.c b/arch/mips/loongson64/env.c
index d11bc34..3e7caba 100644
--- a/arch/mips/loongson64/env.c
+++ b/arch/mips/loongson64/env.c
@@ -133,11 +133,11 @@ void __init prom_init_env(void)
 		case PRID_REV_LOONGSON3A_R2_1:
 		case PRID_REV_LOONGSON3A_R3_0:
 		case PRID_REV_LOONGSON3A_R3_1:
-			loongson_fdt_blob = __dtb_loongson3_4core_rs780e_begin;
+			loongson_fdt_blob = __dtb_loongson64c_4core_rs780e_begin;
 			break;
 		case PRID_REV_LOONGSON3B_R1:
 		case PRID_REV_LOONGSON3B_R2:
-			loongson_fdt_blob = __dtb_loongson3_8core_rs780e_begin;
+			loongson_fdt_blob = __dtb_loongson64c_8core_rs780e_begin;
 			break;
 		default:
 			break;
-- 
2.7.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/2] dt-bindings: mips: Document two Loongson boards
  2020-06-15  6:04 [PATCH 1/2] MIPS: Loongson: Rename CPU device-tree binding Huacai Chen
@ 2020-06-15  6:04 ` Huacai Chen
  2020-07-08  9:33   ` Thomas Bogendoerfer
  2020-07-08  9:33 ` [PATCH 1/2] MIPS: Loongson: Rename CPU device-tree binding Thomas Bogendoerfer
  1 sibling, 1 reply; 4+ messages in thread
From: Huacai Chen @ 2020-06-15  6:04 UTC (permalink / raw)
  To: Rob Herring, Thomas Bogendoerfer
  Cc: devicetree, linux-mips, Huacai Chen, Jiaxun Yang, Huacai Chen

Document loongson64c-4core-ls7a and loongson64g-4core-ls7a, two boards
with LS7A PCH.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 Documentation/devicetree/bindings/mips/loongson/devices.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Documentation/devicetree/bindings/mips/loongson/devices.yaml b/Documentation/devicetree/bindings/mips/loongson/devices.yaml
index 0516fe2..88c5a29 100644
--- a/Documentation/devicetree/bindings/mips/loongson/devices.yaml
+++ b/Documentation/devicetree/bindings/mips/loongson/devices.yaml
@@ -17,6 +17,10 @@ properties:
   compatible:
     oneOf:
 
+      - description: Classic Loongson64 Quad Core + LS7A
+        items:
+          - const: loongson,loongson64c-4core-ls7a
+
       - description: Classic Loongson64 Quad Core + RS780E
         items:
           - const: loongson,loongson64c-4core-rs780e
@@ -24,4 +28,8 @@ properties:
       - description: Classic Loongson64 Octa Core + RS780E
         items:
           - const: loongson,loongson64c-8core-rs780e
+
+      - description: Generic Loongson64 Quad Core + LS7A
+        items:
+          - const: loongson,loongson64g-4core-ls7a
 ...
-- 
2.7.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] MIPS: Loongson: Rename CPU device-tree binding
  2020-06-15  6:04 [PATCH 1/2] MIPS: Loongson: Rename CPU device-tree binding Huacai Chen
  2020-06-15  6:04 ` [PATCH 2/2] dt-bindings: mips: Document two Loongson boards Huacai Chen
@ 2020-07-08  9:33 ` Thomas Bogendoerfer
  1 sibling, 0 replies; 4+ messages in thread
From: Thomas Bogendoerfer @ 2020-07-08  9:33 UTC (permalink / raw)
  To: Huacai Chen; +Cc: Rob Herring, devicetree, linux-mips, Huacai Chen, Jiaxun Yang

On Mon, Jun 15, 2020 at 02:04:16PM +0800, Huacai Chen wrote:
> Loongson-3A R1/R2/R3 and Loongson-3B R1/R2 use the same package naming
> in dts, and Loongson-3A R4 will be different. In cpu.h the classic 64bit
> Loongson processors are called Loongson64C (C for classic, pre Loongson-
> 3A R4), and the new 64bit Loongson processors are called Loongson64G (G
> for generic, Loongson-3A R4+). To keep consistency and make extensible,
> we rename the classic "loongson3" prefix to "loongson64c", and the new
> prefix for Loongson-3A R4+ will be "loongson64g".
> 
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> ---
>  Documentation/devicetree/bindings/mips/loongson/devices.yaml      | 8 ++++----
>  arch/mips/boot/dts/loongson/Makefile                              | 2 +-
>  .../loongson/{loongson3-package.dtsi => loongson64c-package.dtsi} | 0
>  .../{loongson3_4core_rs780e.dts => loongson64c_4core_rs780e.dts}  | 2 +-
>  .../{loongson3_8core_rs780e.dts => loongson64c_8core_rs780e.dts}  | 2 +-
>  arch/mips/include/asm/mach-loongson64/builtin_dtbs.h              | 4 ++--
>  arch/mips/loongson64/env.c                                        | 4 ++--
>  7 files changed, 11 insertions(+), 11 deletions(-)
>  rename arch/mips/boot/dts/loongson/{loongson3-package.dtsi => loongson64c-package.dtsi} (100%)
>  rename arch/mips/boot/dts/loongson/{loongson3_4core_rs780e.dts => loongson64c_4core_rs780e.dts} (93%)
>  rename arch/mips/boot/dts/loongson/{loongson3_8core_rs780e.dts => loongson64c_8core_rs780e.dts} (93%)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] dt-bindings: mips: Document two Loongson boards
  2020-06-15  6:04 ` [PATCH 2/2] dt-bindings: mips: Document two Loongson boards Huacai Chen
@ 2020-07-08  9:33   ` Thomas Bogendoerfer
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Bogendoerfer @ 2020-07-08  9:33 UTC (permalink / raw)
  To: Huacai Chen; +Cc: Rob Herring, devicetree, linux-mips, Huacai Chen, Jiaxun Yang

On Mon, Jun 15, 2020 at 02:04:17PM +0800, Huacai Chen wrote:
> Document loongson64c-4core-ls7a and loongson64g-4core-ls7a, two boards
> with LS7A PCH.
> 
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
>  Documentation/devicetree/bindings/mips/loongson/devices.yaml | 8 ++++++++
>  1 file changed, 8 insertions(+)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-08 11:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-15  6:04 [PATCH 1/2] MIPS: Loongson: Rename CPU device-tree binding Huacai Chen
2020-06-15  6:04 ` [PATCH 2/2] dt-bindings: mips: Document two Loongson boards Huacai Chen
2020-07-08  9:33   ` Thomas Bogendoerfer
2020-07-08  9:33 ` [PATCH 1/2] MIPS: Loongson: Rename CPU device-tree binding Thomas Bogendoerfer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).