Merge baeb53fab9 on remote branch

Change-Id: Ie4ad0da634b3d5baf9d22d229659c946ea9526de
This commit is contained in:
Linux Build Service Account
2024-05-20 22:44:10 -07:00
4 changed files with 4 additions and 1 deletions

1
Kbuild
View File

@@ -2,6 +2,7 @@ ifneq ($(CONFIG_ARCH_QTI_VM), y)
ifeq ($(CONFIG_ARCH_SUN), y) ifeq ($(CONFIG_ARCH_SUN), y)
dtbo-y += sun-eva.dtbo dtbo-y += sun-eva.dtbo
dtbo-y += sun-eva-v2.dtbo
endif endif
ifeq ($(CONFIG_ARCH_PINEAPPLE), y) ifeq ($(CONFIG_ARCH_PINEAPPLE), y)

View File

@@ -13,7 +13,7 @@
#include <dt-bindings/clock/qcom,gcc-sun.h> #include <dt-bindings/clock/qcom,gcc-sun.h>
#include <dt-bindings/clock/qcom,evacc-sun.h> #include <dt-bindings/clock/qcom,evacc-sun.h>
#include <dt-bindings/arm/msm/qti-smmu-proxy-dt-ids.h> #include <dt-bindings/arm/msm/qti-smmu-proxy-dt-ids.h>
#include "sun-eva.dtsi" #include "sun-eva-v2.dtsi"
/ { / {
model = "Qualcomm Technologies, Inc. Sun v2 SoC"; model = "Qualcomm Technologies, Inc. Sun v2 SoC";

View File

@@ -7,5 +7,6 @@
&msm_cvp { &msm_cvp {
qcom,allowed-clock-rates = <350000000 400000000 450000000 500000000 550000000>; qcom,allowed-clock-rates = <350000000 400000000 450000000 500000000 550000000>;
soc_ver = <0x20000>;
}; };

View File

@@ -46,6 +46,7 @@
qcom,gcc-reg = <0x110000 0x90000>; qcom,gcc-reg = <0x110000 0x90000>;
pas-id = <26>; pas-id = <26>;
soc_ver = <0x10000>;
memory-region = <&cvp_mem>; memory-region = <&cvp_mem>;
/* UC region mapping */ /* UC region mapping */