diff mbox series

[2/2] arm64: dts: amlogic: change product name for Radxa ZERO 2 (Pro)

Message ID 20240711034035.3921122-2-naoki@radxa.com (mailing list archive)
State New
Headers show
Series [1/2] dt-bindings: arm: amlogic: change product name for Radxa ZERO 2 (Pro) | expand

Commit Message

FUKAUMI Naoki July 11, 2024, 3:40 a.m. UTC 
a while ago, we changed product name (hardware is same),

from: Radxa ZERO2
  to: Radxa ZERO 2 Pro

this patch reflect the change in dts.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 arch/arm64/boot/dts/amlogic/Makefile                        | 2 +-
 ...-g12b-radxa-zero2.dts => meson-g12b-radxa-zero-2pro.dts} | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/arm64/boot/dts/amlogic/{meson-g12b-radxa-zero2.dts => meson-g12b-radxa-zero-2pro.dts} (98%)

Comments

Krzysztof Kozlowski July 11, 2024, 6:24 a.m. UTC | #1 
On 11/07/2024 05:40, FUKAUMI Naoki wrote:
> a while ago, we changed product name (hardware is same),
> 
> from: Radxa ZERO2
>   to: Radxa ZERO 2 Pro
> 
> this patch reflect the change in dts.
> 
> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
> ---
>  arch/arm64/boot/dts/amlogic/Makefile                        | 2 +-
>  ...-g12b-radxa-zero2.dts => meson-g12b-radxa-zero-2pro.dts} | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>  rename arch/arm64/boot/dts/amlogic/{meson-g12b-radxa-zero2.dts => meson-g12b-radxa-zero-2pro.dts} (98%)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
> index 29417f04f886..5694ad0edcde 100644
> --- a/arch/arm64/boot/dts/amlogic/Makefile
> +++ b/arch/arm64/boot/dts/amlogic/Makefile
> @@ -31,7 +31,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb
>  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
>  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
>  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2l.dtb
> -dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
> +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero-2pro.dtb
>  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-bananapi-m2s.dtb
>  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
>  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero-2pro.dts
> similarity index 98%
> rename from arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
> rename to arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero-2pro.dts
> index 8445701100d0..5514ca9a62fb 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero-2pro.dts
> @@ -16,8 +16,8 @@
>  #include <dt-bindings/sound/meson-g12a-tohdmitx.h>
>  
>  / {
> -	compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b";
> -	model = "Radxa Zero2";
> +	compatible = "radxa,zero-2pro", "amlogic,a311d", "amlogic,g12b";

Keep old compatible.


Best regards,
Krzysztof
FUKAUMI Naoki July 11, 2024, 6:58 a.m. UTC | #2 
Hi,

thanks for your reply.

On 7/11/24 15:24, Krzysztof Kozlowski wrote:
> On 11/07/2024 05:40, FUKAUMI Naoki wrote:
>> a while ago, we changed product name (hardware is same),
>>
>> from: Radxa ZERO2
>>    to: Radxa ZERO 2 Pro
>>
>> this patch reflect the change in dts.
>>
>> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
>> ---
>>   arch/arm64/boot/dts/amlogic/Makefile                        | 2 +-
>>   ...-g12b-radxa-zero2.dts => meson-g12b-radxa-zero-2pro.dts} | 6 +++---
>>   2 files changed, 4 insertions(+), 4 deletions(-)
>>   rename arch/arm64/boot/dts/amlogic/{meson-g12b-radxa-zero2.dts => meson-g12b-radxa-zero-2pro.dts} (98%)
>>
>> diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
>> index 29417f04f886..5694ad0edcde 100644
>> --- a/arch/arm64/boot/dts/amlogic/Makefile
>> +++ b/arch/arm64/boot/dts/amlogic/Makefile
>> @@ -31,7 +31,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb
>>   dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
>>   dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
>>   dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2l.dtb
>> -dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
>> +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero-2pro.dtb
>>   dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-bananapi-m2s.dtb
>>   dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
>>   dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero-2pro.dts
>> similarity index 98%
>> rename from arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
>> rename to arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero-2pro.dts
>> index 8445701100d0..5514ca9a62fb 100644
>> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
>> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero-2pro.dts
>> @@ -16,8 +16,8 @@
>>   #include <dt-bindings/sound/meson-g12a-tohdmitx.h>
>>   
>>   / {
>> -	compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b";
>> -	model = "Radxa Zero2";
>> +	compatible = "radxa,zero-2pro", "amlogic,a311d", "amlogic,g12b";
> 
> Keep old compatible.

which is better?

compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b"; (no change)
  or
compatible = "radxa,zero-2pro", "radxa,zero2", "amlogic,a311d", 
"amlogic,g12b"; (keep old one)

Best regards,

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

> Best regards,
> Krzysztof
> 
>
Krzysztof Kozlowski July 11, 2024, 7:45 a.m. UTC | #3 
On 11/07/2024 08:58, FUKAUMI Naoki wrote:
>>>   
>>>   / {
>>> -	compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b";
>>> -	model = "Radxa Zero2";
>>> +	compatible = "radxa,zero-2pro", "amlogic,a311d", "amlogic,g12b";
>>
>> Keep old compatible.
> 
> which is better?
> 
> compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b"; (no change)
>   or
> compatible = "radxa,zero-2pro", "radxa,zero2", "amlogic,a311d", 
> "amlogic,g12b"; (keep old one)

I propose not to change anything, at least based on your
explanations/rationale.

Best regards,
Krzysztof
FUKAUMI Naoki July 11, 2024, 8:52 a.m. UTC | #4 
Hi

On 7/11/24 16:45, Krzysztof Kozlowski wrote:
> On 11/07/2024 08:58, FUKAUMI Naoki wrote:
>>>>    
>>>>    / {
>>>> -	compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b";
>>>> -	model = "Radxa Zero2";
>>>> +	compatible = "radxa,zero-2pro", "amlogic,a311d", "amlogic,g12b";
>>>
>>> Keep old compatible.
>>
>> which is better?
>>
>> compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b"; (no change)
>>    or
>> compatible = "radxa,zero-2pro", "radxa,zero2", "amlogic,a311d",
>> "amlogic,g12b"; (keep old one)
> 
> I propose not to change anything, at least based on your
> explanations/rationale.

I see, I don't touch anything which already exists.
then, can I add new "Radxa ZERO 2 Pro" product?

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

> Best regards,
> Krzysztof
> 
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 29417f04f886..5694ad0edcde 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -31,7 +31,7 @@  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2l.dtb
-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero-2pro.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-bananapi-m2s.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero-2pro.dts
similarity index 98%
rename from arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
rename to arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero-2pro.dts
index 8445701100d0..5514ca9a62fb 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero-2pro.dts
@@ -16,8 +16,8 @@ 
 #include <dt-bindings/sound/meson-g12a-tohdmitx.h>
 
 / {
-	compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b";
-	model = "Radxa Zero2";
+	compatible = "radxa,zero-2pro", "amlogic,a311d", "amlogic,g12b";
+	model = "Radxa ZERO 2 Pro";
 
 	aliases {
 		serial0 = &uart_AO;
@@ -169,7 +169,7 @@  vddcpu_b: regulator-vddcpu-b {
 
 	sound {
 		compatible = "amlogic,axg-sound-card";
-		model = "RADXA-ZERO2";
+		model = "RADXA-ZERO-2PRO";
 		audio-aux-devs = <&tdmout_b>;
 		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
 				"TDMOUT_B IN 1", "FRDDR_B OUT 1",