[PATCH dev-5.15] ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom

[Jae Hyun Yoo]

Gentle ping...

On 7/8/2022 7:25 AM, Jae Hyun Yoo wrote:
> Nuvia has been acquired by Qualcomm and the vendor name 'nuvia' will
> not be used anymore so rename aspeed-bmc-nuvia-dc-scm.dts to
> aspeed-bmc-qcom-dc-scm-v1.dts and change 'nuvia' to 'qcom' as its vendor
> name in the file.
> 
> Fixes: 7b46aa7c008d ("ARM: dts: aspeed: Add Nuvia DC-SCM BMC")
> Signed-off-by: Jae Hyun Yoo <quic_jaehyoo at quicinc.com>
> Signed-off-by: Joel Stanley <joel at jms.id.au>
> Link: https://lore.kernel.org/r/20220523175640.60155-1-quic_jaehyoo@quicinc.com
> Link: https://lore.kernel.org/r/20220624070511.4070659-1-joel@jms.id.au'
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>
> ---
> It's a backporting patch from upstream. Please apply it as it's needed for
> making a bitbake machine target in OpenBMC yocto build.
> 
> Thanks,
> Jae
> 
>   arch/arm/boot/dts/Makefile                                    | 2 +-
>   ...eed-bmc-nuvia-dc-scm.dts => aspeed-bmc-qcom-dc-scm-v1.dts} | 4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
>   rename arch/arm/boot/dts/{aspeed-bmc-nuvia-dc-scm.dts => aspeed-bmc-qcom-dc-scm-v1.dts} (97%)
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index dc225e354791..134cdcdec271 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1487,7 +1487,6 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
>   	aspeed-bmc-lenovo-hr630.dtb \
>   	aspeed-bmc-lenovo-hr855xg2.dtb \
>   	aspeed-bmc-microsoft-olympus.dtb \
> -	aspeed-bmc-nuvia-dc-scm.dtb \
>   	aspeed-bmc-opp-lanyang.dtb \
>   	aspeed-bmc-opp-mihawk.dtb \
>   	aspeed-bmc-opp-mowgli.dtb \
> @@ -1500,6 +1499,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
>   	aspeed-bmc-opp-witherspoon.dtb \
>   	aspeed-bmc-opp-zaius.dtb \
>   	aspeed-bmc-portwell-neptune.dtb \
> +	aspeed-bmc-qcom-dc-scm-v1.dtb \
>   	aspeed-bmc-quanta-q71l.dtb \
>   	aspeed-bmc-quanta-s6q.dtb \
>   	aspeed-bmc-supermicro-x11spi.dtb \
> diff --git a/arch/arm/boot/dts/aspeed-bmc-nuvia-dc-scm.dts b/arch/arm/boot/dts/aspeed-bmc-qcom-dc-scm-v1.dts
> similarity index 97%
> rename from arch/arm/boot/dts/aspeed-bmc-nuvia-dc-scm.dts
> rename to arch/arm/boot/dts/aspeed-bmc-qcom-dc-scm-v1.dts
> index f4a97cfb0f23..259ef3f54c5c 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-nuvia-dc-scm.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-qcom-dc-scm-v1.dts
> @@ -6,8 +6,8 @@
>   #include "aspeed-g6.dtsi"
>   
>   / {
> -	model = "Nuvia DC-SCM BMC";
> -	compatible = "nuvia,dc-scm-bmc", "aspeed,ast2600";
> +	model = "Qualcomm DC-SCM V1 BMC";
> +	compatible = "qcom,dc-scm-v1-bmc", "aspeed,ast2600";
>   
>   	aliases {
>   		serial4 = &uart5;