[PATCH 2/2] arm64: dts: allwinner: Correct the model names for Pine64 boards

[Dragan Simic]

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 <gamiee at pine64.org>
>> Signed-off-by: Dragan Simic <dsimic at manjaro.org>
> 
> Acked-by: Jernej Skrabec <jernej.skrabec at gmail.com>

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