Correct the descriptions of a few Pine64 boards and devices, according
to their official names used on the Pine64 wiki. This ensures consistency
between the officially used names and the names in the source code.
Cc: Marek Kraus <[email protected]>
Signed-off-by: Dragan Simic <[email protected]>
---
Notes:
This completes the correction of the descriptions of the Pine64 boards
and devices, which was started with the Pine64 boards and devices based
on Rockchip SoCs. [1]
[1] https://lore.kernel.org/linux-rockchip/ec124dab2b1a8776aa39177ecce34babca3a50e2.1713832790.git.dsimic@manjaro.org/
Documentation/devicetree/bindings/arm/sunxi.yaml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml
index 09d835db6db5..b66873ae2d71 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.yaml
+++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
@@ -709,17 +709,17 @@ properties:
- const: sochip,s3
- const: allwinner,sun8i-v3
- - description: Pine64 PineH64 model A
+ - description: Pine64 H64 Model A
items:
- const: pine64,pine-h64
- const: allwinner,sun50i-h6
- - description: Pine64 PineH64 model B
+ - description: Pine64 H64 Model B
items:
- const: pine64,pine-h64-model-b
- const: allwinner,sun50i-h6
- - description: Pine64 LTS
+ - description: Pine64 A64 LTS
items:
- const: pine64,pine64-lts
- const: allwinner,sun50i-r18
@@ -748,17 +748,17 @@ properties:
- const: pine64,pinephone
- const: allwinner,sun50i-a64
- - description: Pine64 PineTab, Development Sample
+ - description: Pine64 PineTab Developer Sample
items:
- const: pine64,pinetab
- const: allwinner,sun50i-a64
- - description: Pine64 PineTab, Early Adopter's batch (and maybe later ones)
+ - description: Pine64 PineTab Early Adopter
items:
- const: pine64,pinetab-early-adopter
- const: allwinner,sun50i-a64
- - description: Pine64 SoPine Baseboard
+ - description: Pine64 SOPine
items:
- const: pine64,sopine-baseboard
- const: pine64,sopine
Correct the model names of a few Pine64 boards and devices, according
to their official names used on the Pine64 wiki. This ensures consistency
between the officially used names and the names in the source code.
Cc: Marek Kraus <[email protected]>
Signed-off-by: Dragan Simic <[email protected]>
---
Notes:
This completes the correction of the model names of the Pine64 boards
and devices, which was started with the Pine64 boards and devices based
on Rockchip SoCs. [1]
These improvements may cause certain issues if some scripts misuse
/proc/device-tree/model to detect the board they're executed on. Though,
the right way to detect a board is to use /proc/device-tree/compatible
instead, because its contents is part of the ABI. Such scripts, if they
actually exist in the field, should be improved to use the right way to
detect the board model.
[1] https://lore.kernel.org/linux-rockchip/06ce014a1dedff11a785fe523056b3b8ffdf21ee.1713832790.git.dsimic@manjaro.org/
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 2 +-
arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +-
.../boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts | 2 +-
arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +-
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +-
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 2 +-
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
index 596a25907432..4aab1f98fac7 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
@@ -5,7 +5,7 @@
#include "sun50i-a64-sopine-baseboard.dts"
/ {
- model = "Pine64 LTS";
+ model = "Pine64 A64 LTS";
compatible = "pine64,pine64-lts", "allwinner,sun50i-r18",
"allwinner,sun50i-a64";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 50ed2e9f10ed..a3c1752fc5d8 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -13,7 +13,7 @@
#include <dt-bindings/pwm/pwm.h>
/ {
- model = "Pinebook";
+ model = "Pine64 Pinebook";
compatible = "pine64,pinebook", "allwinner,sun50i-a64";
chassis-type = "laptop";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
index 6265360ce623..86cc85eb3d48 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
@@ -9,7 +9,7 @@
#include "sun50i-a64-pinetab.dts"
/ {
- model = "PineTab, Early Adopter's version";
+ model = "Pine64 PineTab Early Adopter";
compatible = "pine64,pinetab-early-adopter", "allwinner,sun50i-a64";
};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
index 0a5607f73049..ebeb04156eb6 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
@@ -14,7 +14,7 @@
#include <dt-bindings/pwm/pwm.h>
/ {
- model = "PineTab, Development Sample";
+ model = "Pine64 PineTab Developer Sample";
compatible = "pine64,pinetab", "allwinner,sun50i-a64";
chassis-type = "tablet";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
index 5e66ce1a334f..411d97610be9 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@ -8,7 +8,7 @@
#include "sun50i-a64-sopine.dtsi"
/ {
- model = "SoPine with baseboard";
+ model = "Pine64 SOPine on Baseboard carrier board";
compatible = "pine64,sopine-baseboard", "pine64,sopine",
"allwinner,sun50i-a64";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
index b710f1a0f53a..52d81ff0d77d 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
@@ -6,7 +6,7 @@
#include "sun50i-h6-pine-h64.dts"
/ {
- model = "Pine H64 model B";
+ model = "Pine64 H64 Model B";
compatible = "pine64,pine-h64-model-b", "allwinner,sun50i-h6";
/delete-node/ reg_gmac_3v3;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
index 1ffd68f43f87..f8b524d02429 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
@@ -9,7 +9,7 @@
#include <dt-bindings/gpio/gpio.h>
/ {
- model = "Pine H64 model A";
+ model = "Pine64 H64 Model A";
compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
aliases {
On Tue, 23 Apr 2024 03:00:19 +0200, Dragan Simic wrote:
> Correct the descriptions of a few Pine64 boards and devices, according
> to their official names used on the Pine64 wiki. This ensures consistency
> between the officially used names and the names in the source code.
>
> Cc: Marek Kraus <[email protected]>
> Signed-off-by: Dragan Simic <[email protected]>
> ---
>
> Notes:
> This completes the correction of the descriptions of the Pine64 boards
> and devices, which was started with the Pine64 boards and devices based
> on Rockchip SoCs. [1]
>
> [1] https://lore.kernel.org/linux-rockchip/ec124dab2b1a8776aa39177ecce34babca3a50e2.1713832790.git.dsimic@manjaro.org/
>
> Documentation/devicetree/bindings/arm/sunxi.yaml | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
Reviewed-by: Rob Herring (Arm) <[email protected]>
On 2024-04-23 17:10, Rob Herring wrote:
> On Tue, 23 Apr 2024 03:00:19 +0200, Dragan Simic wrote:
>> Correct the descriptions of a few Pine64 boards and devices, according
>> to their official names used on the Pine64 wiki. This ensures
>> consistency
>> between the officially used names and the names in the source code.
>>
>> Cc: Marek Kraus <[email protected]>
>> Signed-off-by: Dragan Simic <[email protected]>
>> ---
>>
>> Notes:
>> This completes the correction of the descriptions of the Pine64
>> boards
>> and devices, which was started with the Pine64 boards and devices
>> based
>> on Rockchip SoCs. [1]
>>
>> [1]
>> https://lore.kernel.org/linux-rockchip/ec124dab2b1a8776aa39177ecce34babca3a50e2.1713832790.git.dsimic@manjaro.org/
>>
>> Documentation/devicetree/bindings/arm/sunxi.yaml | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> Reviewed-by: Rob Herring (Arm) <[email protected]>
Thanks!
Dne torek, 23. april 2024 ob 03:00:20 GMT +2 je Dragan Simic napisal(a):
> Correct the model names of a few Pine64 boards and devices, according
> to their official names used on the Pine64 wiki. This ensures consistency
> between the officially used names and the names in the source code.
>
> Cc: Marek Kraus <[email protected]>
> Signed-off-by: Dragan Simic <[email protected]>
Acked-by: Jernej Skrabec <[email protected]>
Best regards,
Jernej
> ---
>
> Notes:
> This completes the correction of the model names of the Pine64 boards
> and devices, which was started with the Pine64 boards and devices based
> on Rockchip SoCs. [1]
>
> These improvements may cause certain issues if some scripts misuse
> /proc/device-tree/model to detect the board they're executed on. Though,
> the right way to detect a board is to use /proc/device-tree/compatible
> instead, because its contents is part of the ABI. Such scripts, if they
> actually exist in the field, should be improved to use the right way to
> detect the board model.
>
> [1] https://lore.kernel.org/linux-rockchip/06ce014a1dedff11a785fe523056b3b8ffdf21ee.1713832790.git.dsimic@manjaro.org/
>
> arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 2 +-
> arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +-
> .../boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts | 2 +-
> arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +-
> arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +-
> arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 2 +-
> arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
> index 596a25907432..4aab1f98fac7 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
> @@ -5,7 +5,7 @@
> #include "sun50i-a64-sopine-baseboard.dts"
>
> / {
> - model = "Pine64 LTS";
> + model = "Pine64 A64 LTS";
> compatible = "pine64,pine64-lts", "allwinner,sun50i-r18",
> "allwinner,sun50i-a64";
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
> index 50ed2e9f10ed..a3c1752fc5d8 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
> @@ -13,7 +13,7 @@
> #include <dt-bindings/pwm/pwm.h>
>
> / {
> - model = "Pinebook";
> + model = "Pine64 Pinebook";
> compatible = "pine64,pinebook", "allwinner,sun50i-a64";
> chassis-type = "laptop";
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
> index 6265360ce623..86cc85eb3d48 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
> @@ -9,7 +9,7 @@
> #include "sun50i-a64-pinetab.dts"
>
> / {
> - model = "PineTab, Early Adopter's version";
> + model = "Pine64 PineTab Early Adopter";
> compatible = "pine64,pinetab-early-adopter", "allwinner,sun50i-a64";
> };
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
> index 0a5607f73049..ebeb04156eb6 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
> @@ -14,7 +14,7 @@
> #include <dt-bindings/pwm/pwm.h>
>
> / {
> - model = "PineTab, Development Sample";
> + model = "Pine64 PineTab Developer Sample";
> compatible = "pine64,pinetab", "allwinner,sun50i-a64";
> chassis-type = "tablet";
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> index 5e66ce1a334f..411d97610be9 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> @@ -8,7 +8,7 @@
> #include "sun50i-a64-sopine.dtsi"
>
> / {
> - model = "SoPine with baseboard";
> + model = "Pine64 SOPine on Baseboard carrier board";
> compatible = "pine64,sopine-baseboard", "pine64,sopine",
> "allwinner,sun50i-a64";
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
> index b710f1a0f53a..52d81ff0d77d 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
> @@ -6,7 +6,7 @@
> #include "sun50i-h6-pine-h64.dts"
>
> / {
> - model = "Pine H64 model B";
> + model = "Pine64 H64 Model B";
> compatible = "pine64,pine-h64-model-b", "allwinner,sun50i-h6";
>
> /delete-node/ reg_gmac_3v3;
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
> index 1ffd68f43f87..f8b524d02429 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
> @@ -9,7 +9,7 @@
> #include <dt-bindings/gpio/gpio.h>
>
> / {
> - model = "Pine H64 model A";
> + model = "Pine64 H64 Model A";
> compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
>
> aliases {
>
On 2024-04-24 20:51, Jernej Škrabec wrote:
> Dne torek, 23. april 2024 ob 03:00:20 GMT +2 je Dragan Simic
> napisal(a):
>> Correct the model names of a few Pine64 boards and devices, according
>> to their official names used on the Pine64 wiki. This ensures
>> consistency
>> between the officially used names and the names in the source code.
>>
>> Cc: Marek Kraus <[email protected]>
>> Signed-off-by: Dragan Simic <[email protected]>
>
> Acked-by: Jernej Skrabec <[email protected]>
Thanks!
>> ---
>>
>> Notes:
>> This completes the correction of the model names of the Pine64
>> boards
>> and devices, which was started with the Pine64 boards and devices
>> based
>> on Rockchip SoCs. [1]
>>
>> These improvements may cause certain issues if some scripts misuse
>> /proc/device-tree/model to detect the board they're executed on.
>> Though,
>> the right way to detect a board is to use
>> /proc/device-tree/compatible
>> instead, because its contents is part of the ABI. Such scripts,
>> if they
>> actually exist in the field, should be improved to use the right
>> way to
>> detect the board model.
>>
>> [1]
>> https://lore.kernel.org/linux-rockchip/06ce014a1dedff11a785fe523056b3b8ffdf21ee.1713832790.git.dsimic@manjaro.org/
>>
>> arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 2
>> +-
>> arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 2
>> +-
>> .../boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts | 2
>> +-
>> arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 2
>> +-
>> arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2
>> +-
>> arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 2
>> +-
>> arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2
>> +-
>> 7 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
>> b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
>> index 596a25907432..4aab1f98fac7 100644
>> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
>> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
>> @@ -5,7 +5,7 @@
>> #include "sun50i-a64-sopine-baseboard.dts"
>>
>> / {
>> - model = "Pine64 LTS";
>> + model = "Pine64 A64 LTS";
>> compatible = "pine64,pine64-lts", "allwinner,sun50i-r18",
>> "allwinner,sun50i-a64";
>>
>> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
>> b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
>> index 50ed2e9f10ed..a3c1752fc5d8 100644
>> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
>> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
>> @@ -13,7 +13,7 @@
>> #include <dt-bindings/pwm/pwm.h>
>>
>> / {
>> - model = "Pinebook";
>> + model = "Pine64 Pinebook";
>> compatible = "pine64,pinebook", "allwinner,sun50i-a64";
>> chassis-type = "laptop";
>>
>> diff --git
>> a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
>> b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
>> index 6265360ce623..86cc85eb3d48 100644
>> ---
>> a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
>> +++
>> b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
>> @@ -9,7 +9,7 @@
>> #include "sun50i-a64-pinetab.dts"
>>
>> / {
>> - model = "PineTab, Early Adopter's version";
>> + model = "Pine64 PineTab Early Adopter";
>> compatible = "pine64,pinetab-early-adopter", "allwinner,sun50i-a64";
>> };
>>
>> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
>> b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
>> index 0a5607f73049..ebeb04156eb6 100644
>> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
>> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
>> @@ -14,7 +14,7 @@
>> #include <dt-bindings/pwm/pwm.h>
>>
>> / {
>> - model = "PineTab, Development Sample";
>> + model = "Pine64 PineTab Developer Sample";
>> compatible = "pine64,pinetab", "allwinner,sun50i-a64";
>> chassis-type = "tablet";
>>
>> diff --git
>> a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
>> b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
>> index 5e66ce1a334f..411d97610be9 100644
>> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
>> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
>> @@ -8,7 +8,7 @@
>> #include "sun50i-a64-sopine.dtsi"
>>
>> / {
>> - model = "SoPine with baseboard";
>> + model = "Pine64 SOPine on Baseboard carrier board";
>> compatible = "pine64,sopine-baseboard", "pine64,sopine",
>> "allwinner,sun50i-a64";
>>
>> diff --git
>> a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
>> b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
>> index b710f1a0f53a..52d81ff0d77d 100644
>> --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
>> +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
>> @@ -6,7 +6,7 @@
>> #include "sun50i-h6-pine-h64.dts"
>>
>> / {
>> - model = "Pine H64 model B";
>> + model = "Pine64 H64 Model B";
>> compatible = "pine64,pine-h64-model-b", "allwinner,sun50i-h6";
>>
>> /delete-node/ reg_gmac_3v3;
>> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
>> b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
>> index 1ffd68f43f87..f8b524d02429 100644
>> --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
>> +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
>> @@ -9,7 +9,7 @@
>> #include <dt-bindings/gpio/gpio.h>
>>
>> / {
>> - model = "Pine H64 model A";
>> + model = "Pine64 H64 Model A";
>> compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
>>
>> aliases {
>>
在 2024-04-23星期二的 03:00 +0200，Dragan Simic写道：
> Correct the descriptions of a few Pine64 boards and devices,
> according
> to their official names used on the Pine64 wiki. This ensures
> consistency
> between the officially used names and the names in the source code.
>
> Cc: Marek Kraus <[email protected]>
> Signed-off-by: Dragan Simic <[email protected]>
> ---
>
> Notes:
> This completes the correction of the descriptions of the Pine64
> boards
> and devices, which was started with the Pine64 boards and devices
> based
> on Rockchip SoCs. [1]
>
> [1]
> https://lore.kernel.org/linux-rockchip/ec124dab2b1a8776aa39177ecce34babca3a50e2.1713832790.git.dsimic@manjaro.org/
>
> Documentation/devicetree/bindings/arm/sunxi.yaml | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml
> b/Documentation/devicetree/bindings/arm/sunxi.yaml
> index 09d835db6db5..b66873ae2d71 100644
> --- a/Documentation/devicetree/bindings/arm/sunxi.yaml
> +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
> @@ -709,17 +709,17 @@ properties:
> - const: sochip,s3
> - const: allwinner,sun8i-v3
>
> - - description: Pine64 PineH64 model A
> + - description: Pine64 H64 Model A
> items:
> - const: pine64,pine-h64
> - const: allwinner,sun50i-h6
>
> - - description: Pine64 PineH64 model B
> + - description: Pine64 H64 Model B
Sorry for replying so late, but I don't think there is a Pine64 H64
board. The Pine64 wiki calls it Pine H64. [1]
[1] https://wiki.pine64.org/wiki/PINE_H64
> items:
> - const: pine64,pine-h64-model-b
> - const: allwinner,sun50i-h6
>
> - - description: Pine64 LTS
> + - description: Pine64 A64 LTS
> items:
> - const: pine64,pine64-lts
> - const: allwinner,sun50i-r18
> @@ -748,17 +748,17 @@ properties:
> - const: pine64,pinephone
> - const: allwinner,sun50i-a64
>
> - - description: Pine64 PineTab, Development Sample
> + - description: Pine64 PineTab Developer Sample
> items:
> - const: pine64,pinetab
> - const: allwinner,sun50i-a64
>
> - - description: Pine64 PineTab, Early Adopter's batch (and
> maybe later ones)
> + - description: Pine64 PineTab Early Adopter
> items:
> - const: pine64,pinetab-early-adopter
> - const: allwinner,sun50i-a64
>
> - - description: Pine64 SoPine Baseboard
> + - description: Pine64 SOPine
> items:
> - const: pine64,sopine-baseboard
> - const: pine64,sopine
>
Hello Icenowy,
On 2024-05-22 02:48, Icenowy Zheng wrote:
> 在 2024-04-23星期二的 03:00 +0200，Dragan Simic写道：
>> Correct the descriptions of a few Pine64 boards and devices,
>> according
>> to their official names used on the Pine64 wiki. This ensures
>> consistency
>> between the officially used names and the names in the source code.
>>
>> Cc: Marek Kraus <[email protected]>
>> Signed-off-by: Dragan Simic <[email protected]>
>> ---
>>
>> Notes:
>> This completes the correction of the descriptions of the Pine64
>> boards
>> and devices, which was started with the Pine64 boards and devices
>> based
>> on Rockchip SoCs. [1]
>>
>> [1]
>> https://lore.kernel.org/linux-rockchip/ec124dab2b1a8776aa39177ecce34babca3a50e2.1713832790.git.dsimic@manjaro.org/
>>
>> Documentation/devicetree/bindings/arm/sunxi.yaml | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml
>> b/Documentation/devicetree/bindings/arm/sunxi.yaml
>> index 09d835db6db5..b66873ae2d71 100644
>> --- a/Documentation/devicetree/bindings/arm/sunxi.yaml
>> +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
>> @@ -709,17 +709,17 @@ properties:
>> - const: sochip,s3
>> - const: allwinner,sun8i-v3
>>
>> - - description: Pine64 PineH64 model A
>> + - description: Pine64 H64 Model A
>> items:
>> - const: pine64,pine-h64
>> - const: allwinner,sun50i-h6
>>
>> - - description: Pine64 PineH64 model B
>> + - description: Pine64 H64 Model B
>
> Sorry for replying so late, but I don't think there is a Pine64 H64
> board. The Pine64 wiki calls it Pine H64. [1]
>
> [1] https://wiki.pine64.org/wiki/PINE_H64
Good point, thanks. Though, this board is really an exception to
the naming scheme employed for the Pine64 boards, so perhaps it would
actually be better to rename the board in the Pine64 wiki, by adding
"64" to "Pine", to ensure consistency.
Alas, the Pine64 wiki is currently in read-only mode, due to some
recent issues with the underlying hardware that runs it. Migration to
another form of documentation for Pine64 boards is also a possibility,
which makes the updates even more complicated.
With all this in mind, I think it would be the best to rename the board
on the Pine64 side, to ensure consistency, and keep this patch as-is.
I'll make a mental note to do that on the Pine64 side once the current
situation with the Pine64 wiki is resolved.
>> items:
>> - const: pine64,pine-h64-model-b
>> - const: allwinner,sun50i-h6
>>
>> - - description: Pine64 LTS
>> + - description: Pine64 A64 LTS
>> items:
>> - const: pine64,pine64-lts
>> - const: allwinner,sun50i-r18
>> @@ -748,17 +748,17 @@ properties:
>> - const: pine64,pinephone
>> - const: allwinner,sun50i-a64
>>
>> - - description: Pine64 PineTab, Development Sample
>> + - description: Pine64 PineTab Developer Sample
>> items:
>> - const: pine64,pinetab
>> - const: allwinner,sun50i-a64
>>
>> - - description: Pine64 PineTab, Early Adopter's batch (and
>> maybe later ones)
>> + - description: Pine64 PineTab Early Adopter
>> items:
>> - const: pine64,pinetab-early-adopter
>> - const: allwinner,sun50i-a64
>>
>> - - description: Pine64 SoPine Baseboard
>> + - description: Pine64 SOPine
>> items:
>> - const: pine64,sopine-baseboard
>> - const: pine64,sopine
>>
On Wed, 22 May 2024 08:10:21 +0200
Dragan Simic <[email protected]> wrote:
Hi,
> Hello Icenowy,
>
> On 2024-05-22 02:48, Icenowy Zheng wrote:
> > 在 2024-04-23星期二的 03:00 +0200，Dragan Simic写道：
> >> Correct the descriptions of a few Pine64 boards and devices,
> >> according
> >> to their official names used on the Pine64 wiki. This ensures
> >> consistency
> >> between the officially used names and the names in the source code.
> >>
> >> Cc: Marek Kraus <[email protected]>
> >> Signed-off-by: Dragan Simic <[email protected]>
> >> ---
> >>
> >> Notes:
> >> This completes the correction of the descriptions of the Pine64
> >> boards
> >> and devices, which was started with the Pine64 boards and devices
> >> based
> >> on Rockchip SoCs. [1]
> >>
> >> [1]
> >> https://lore.kernel.org/linux-rockchip/ec124dab2b1a8776aa39177ecce34babca3a50e2.1713832790.git.dsimic@manjaro.org/
> >>
> >> Documentation/devicetree/bindings/arm/sunxi.yaml | 12 ++++++------
> >> 1 file changed, 6 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml
> >> b/Documentation/devicetree/bindings/arm/sunxi.yaml
> >> index 09d835db6db5..b66873ae2d71 100644
> >> --- a/Documentation/devicetree/bindings/arm/sunxi.yaml
> >> +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
> >> @@ -709,17 +709,17 @@ properties:
> >> - const: sochip,s3
> >> - const: allwinner,sun8i-v3
> >>
> >> - - description: Pine64 PineH64 model A
> >> + - description: Pine64 H64 Model A
> >> items:
> >> - const: pine64,pine-h64
> >> - const: allwinner,sun50i-h6
> >>
> >> - - description: Pine64 PineH64 model B
> >> + - description: Pine64 H64 Model B
> >
> > Sorry for replying so late, but I don't think there is a Pine64 H64
> > board. The Pine64 wiki calls it Pine H64. [1]
> >
> > [1] https://wiki.pine64.org/wiki/PINE_H64
>
> Good point, thanks. Though, this board is really an exception to
> the naming scheme employed for the Pine64 boards, so perhaps it would
> actually be better to rename the board in the Pine64 wiki, by adding
> "64" to "Pine", to ensure consistency.
I am sorry, but I don't think this is how it works. The board is really
called "Pine H64", that's printed on the board [1] and everywhere else [2].
That's a choice the manufacturer made, and renaming some Wiki page won't
change that. I understand the engineer's desire to make everything nice and
consistent ;-) , but I am afraid that's not our call. After all this file
is to document the device naming, not to be an example of consistent
naming schemes.
Cheers,
Andre
[1] https://linux-sunxi.org/images/5/53/Pineh64_top.jpg
[2] https://pine64.org/devices/pine_h64_model_a/
>
> Alas, the Pine64 wiki is currently in read-only mode, due to some
> recent issues with the underlying hardware that runs it. Migration to
> another form of documentation for Pine64 boards is also a possibility,
> which makes the updates even more complicated.
>
> With all this in mind, I think it would be the best to rename the board
> on the Pine64 side, to ensure consistency, and keep this patch as-is.
> I'll make a mental note to do that on the Pine64 side once the current
> situation with the Pine64 wiki is resolved.
>
> >> items:
> >> - const: pine64,pine-h64-model-b
> >> - const: allwinner,sun50i-h6
> >>
> >> - - description: Pine64 LTS
> >> + - description: Pine64 A64 LTS
> >> items:
> >> - const: pine64,pine64-lts
> >> - const: allwinner,sun50i-r18
> >> @@ -748,17 +748,17 @@ properties:
> >> - const: pine64,pinephone
> >> - const: allwinner,sun50i-a64
> >>
> >> - - description: Pine64 PineTab, Development Sample
> >> + - description: Pine64 PineTab Developer Sample
> >> items:
> >> - const: pine64,pinetab
> >> - const: allwinner,sun50i-a64
> >>
> >> - - description: Pine64 PineTab, Early Adopter's batch (and
> >> maybe later ones)
> >> + - description: Pine64 PineTab Early Adopter
> >> items:
> >> - const: pine64,pinetab-early-adopter
> >> - const: allwinner,sun50i-a64
> >>
> >> - - description: Pine64 SoPine Baseboard
> >> + - description: Pine64 SOPine
> >> items:
> >> - const: pine64,sopine-baseboard
> >> - const: pine64,sopine
> >>
>
Hello Andre,
On 2024-05-22 12:05, Andre Przywara wrote:
> On Wed, 22 May 2024 08:10:21 +0200
> Dragan Simic <[email protected]> wrote:
>> On 2024-05-22 02:48, Icenowy Zheng wrote:
>> > 在 2024-04-23星期二的 03:00 +0200，Dragan Simic写道：
>> >> Correct the descriptions of a few Pine64 boards and devices,
>> >> according
>> >> to their official names used on the Pine64 wiki. This ensures
>> >> consistency
>> >> between the officially used names and the names in the source code.
>> >>
>> >> Cc: Marek Kraus <[email protected]>
>> >> Signed-off-by: Dragan Simic <[email protected]>
>> >> ---
>> >>
>> >> Notes:
>> >> This completes the correction of the descriptions of the Pine64
>> >> boards
>> >> and devices, which was started with the Pine64 boards and devices
>> >> based
>> >> on Rockchip SoCs. [1]
>> >>
>> >> [1]
>> >> https://lore.kernel.org/linux-rockchip/ec124dab2b1a8776aa39177ecce34babca3a50e2.1713832790.git.dsimic@manjaro.org/
>> >>
>> >> Documentation/devicetree/bindings/arm/sunxi.yaml | 12 ++++++------
>> >> 1 file changed, 6 insertions(+), 6 deletions(-)
>> >>
>> >> diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml
>> >> b/Documentation/devicetree/bindings/arm/sunxi.yaml
>> >> index 09d835db6db5..b66873ae2d71 100644
>> >> --- a/Documentation/devicetree/bindings/arm/sunxi.yaml
>> >> +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
>> >> @@ -709,17 +709,17 @@ properties:
>> >> - const: sochip,s3
>> >> - const: allwinner,sun8i-v3
>> >>
>> >> - - description: Pine64 PineH64 model A
>> >> + - description: Pine64 H64 Model A
>> >> items:
>> >> - const: pine64,pine-h64
>> >> - const: allwinner,sun50i-h6
>> >>
>> >> - - description: Pine64 PineH64 model B
>> >> + - description: Pine64 H64 Model B
>> >
>> > Sorry for replying so late, but I don't think there is a Pine64 H64
>> > board. The Pine64 wiki calls it Pine H64. [1]
>> >
>> > [1] https://wiki.pine64.org/wiki/PINE_H64
>>
>> Good point, thanks. Though, this board is really an exception to
>> the naming scheme employed for the Pine64 boards, so perhaps it would
>> actually be better to rename the board in the Pine64 wiki, by adding
>> "64" to "Pine", to ensure consistency.
>
> I am sorry, but I don't think this is how it works. The board is really
> called "Pine H64", that's printed on the board [1] and everywhere else
> [2].
> That's a choice the manufacturer made, and renaming some Wiki page
> won't
> change that. I understand the engineer's desire to make everything nice
> and
> consistent ;-) , but I am afraid that's not our call. After all this
> file
> is to document the device naming, not to be an example of consistent
> naming schemes.
>
> [1] https://linux-sunxi.org/images/5/53/Pineh64_top.jpg
> [2] https://pine64.org/devices/pine_h64_model_a/
Those are all valid concerns. Though, when it comes to the silkscreened
labels on PCBs, sometimes they have no connection with the real,
official
board names. An almost funny example :) is the QuartzPro64 board, also
from Pine64. [3]
I'll check with Pine64 are there some intentions for unifying the
officially
used board names, and if there aren't, I'll submit the v2 of this series
with the corrected board names.
[3]
https://wiki.pine64.org/images/f/fe/Quartzpro64_whole_board_top_resized.jpeg
>> Alas, the Pine64 wiki is currently in read-only mode, due to some
>> recent issues with the underlying hardware that runs it. Migration to
>> another form of documentation for Pine64 boards is also a possibility,
>> which makes the updates even more complicated.
>>
>> With all this in mind, I think it would be the best to rename the
>> board
>> on the Pine64 side, to ensure consistency, and keep this patch as-is.
>> I'll make a mental note to do that on the Pine64 side once the current
>> situation with the Pine64 wiki is resolved.
>>
>> >> items:
>> >> - const: pine64,pine-h64-model-b
>> >> - const: allwinner,sun50i-h6
>> >>
>> >> - - description: Pine64 LTS
>> >> + - description: Pine64 A64 LTS
>> >> items:
>> >> - const: pine64,pine64-lts
>> >> - const: allwinner,sun50i-r18
>> >> @@ -748,17 +748,17 @@ properties:
>> >> - const: pine64,pinephone
>> >> - const: allwinner,sun50i-a64
>> >>
>> >> - - description: Pine64 PineTab, Development Sample
>> >> + - description: Pine64 PineTab Developer Sample
>> >> items:
>> >> - const: pine64,pinetab
>> >> - const: allwinner,sun50i-a64
>> >>
>> >> - - description: Pine64 PineTab, Early Adopter's batch (and
>> >> maybe later ones)
>> >> + - description: Pine64 PineTab Early Adopter
>> >> items:
>> >> - const: pine64,pinetab-early-adopter
>> >> - const: allwinner,sun50i-a64
>> >>
>> >> - - description: Pine64 SoPine Baseboard
>> >> + - description: Pine64 SOPine
>> >> items:
>> >> - const: pine64,sopine-baseboard
>> >> - const: pine64,sopine
>> >>
>>
Hello Andre and Icenowy,
On 2024-05-22 15:06, Dragan Simic wrote:
> On 2024-05-22 12:05, Andre Przywara wrote:
>> On Wed, 22 May 2024 08:10:21 +0200
>> Dragan Simic <[email protected]> wrote:
>>> On 2024-05-22 02:48, Icenowy Zheng wrote:
>>> > 在 2024-04-23星期二的 03:00 +0200，Dragan Simic写道：
>>> >> Correct the descriptions of a few Pine64 boards and devices,
>>> >> according
>>> >> to their official names used on the Pine64 wiki. This ensures
>>> >> consistency
>>> >> between the officially used names and the names in the source code.
>>> >>
>>> >> [...]
>>> >>
>>> >> - - description: Pine64 PineH64 model A
>>> >> + - description: Pine64 H64 Model A
>>> >> items:
>>> >> - const: pine64,pine-h64
>>> >> - const: allwinner,sun50i-h6
>>> >>
>>> >> - - description: Pine64 PineH64 model B
>>> >> + - description: Pine64 H64 Model B
>>> >
>>> > Sorry for replying so late, but I don't think there is a Pine64 H64
>>> > board. The Pine64 wiki calls it Pine H64. [1]
>>> >
>>> > [1] https://wiki.pine64.org/wiki/PINE_H64
>>>
>>> Good point, thanks. Though, this board is really an exception to
>>> the naming scheme employed for the Pine64 boards, so perhaps it would
>>> actually be better to rename the board in the Pine64 wiki, by adding
>>> "64" to "Pine", to ensure consistency.
>>
>> I am sorry, but I don't think this is how it works. The board is
>> really
>> called "Pine H64", that's printed on the board [1] and everywhere else
>> [2].
>> That's a choice the manufacturer made, and renaming some Wiki page
>> won't
>> change that. I understand the engineer's desire to make everything
>> nice and
>> consistent ;-) , but I am afraid that's not our call. After all this
>> file
>> is to document the device naming, not to be an example of consistent
>> naming schemes.
>>
>> [1] https://linux-sunxi.org/images/5/53/Pineh64_top.jpg
>> [2] https://pine64.org/devices/pine_h64_model_a/
>
> Those are all valid concerns. Though, when it comes to the
> silkscreened
> labels on PCBs, sometimes they have no connection with the real,
> official
> board names. An almost funny example :) is the QuartzPro64 board, also
> from Pine64. [3]
>
> I'll check with Pine64 are there some intentions for unifying the
> officially
> used board names, and if there aren't, I'll submit the v2 of this
> series
> with the corrected board names.
>
> [3]
> https://wiki.pine64.org/images/f/fe/Quartzpro64_whole_board_top_resized.jpeg
It's been decided that the history should be preserved, so I'll prepare
and submit the v2 of this series with the original Pine64 board names
that
are currently used officially.
>>> Alas, the Pine64 wiki is currently in read-only mode, due to some
>>> recent issues with the underlying hardware that runs it. Migration
>>> to
>>> another form of documentation for Pine64 boards is also a
>>> possibility,
>>> which makes the updates even more complicated.
>>>
>>> With all this in mind, I think it would be the best to rename the
>>> board
>>> on the Pine64 side, to ensure consistency, and keep this patch as-is.
>>> I'll make a mental note to do that on the Pine64 side once the
>>> current
>>> situation with the Pine64 wiki is resolved.
