Skip to content

Commit

Permalink
Merge branch 'QK-eleven' into upstreamed-common
Browse files Browse the repository at this point in the history
  • Loading branch information
@Official-Ayrton990
Official-Ayrton990 committed May 29, 2022
2 parents 70bbab3 + ae369b6 commit 5355d1d
Show file tree
Hide file tree
Showing 4 changed files with 235 additions and 152 deletions.
32 changes: 12 additions & 20 deletions arch/arm64/boot/dts/vendor/qcom/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,14 @@ ifeq ($(CONFIG_MACH_XIAOMI),y)

ifeq ($(CONFIG_MACH_XIAOMI_SM8250),y)
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
dtbo-$(CONFIG_MACH_XIAOMI_ALIOTH) += \
alioth-sm8250-overlay.dtbo
dtbo-$(CONFIG_MACH_XIAOMI_APOLLO) += \
apollo-sm8250-overlay.dtbo
dtbo-$(CONFIG_MACH_XIAOMI_CAS) += \
cas-sm8250-overlay.dtbo
dtbo-$(CONFIG_MACH_XIAOMI_CMI) += \
cmi-sm8250-overlay.dtbo
dtbo-$(CONFIG_MACH_XIAOMI_LMI) += \
lmi-sm8250-overlay.dtbo
dtbo-$(CONFIG_MACH_XIAOMI_THYME) += \
thyme-sm8250-overlay.dtbo
dtbo-$(CONFIG_MACH_XIAOMI_UMI) += \
umi-sm8250-overlay.dtbo
dtbo-$(CONFIG_ARCH_KONA) += \
alioth-sm8250-overlay.dtbo \
apollo-sm8250-overlay.dtbo \
cas-sm8250-overlay.dtbo \
cmi-sm8250-overlay.dtbo \
lmi-sm8250-overlay.dtbo \
thyme-sm8250-overlay.dtbo \
umi-sm8250-overlay.dtbo

alioth-sm8250-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb
apollo-sm8250-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb
Expand All @@ -29,12 +23,10 @@ endif # CONFIG_MACH_XIAOMI_SM8250

ifeq ($(CONFIG_MACH_XIAOMI_SM7250),y)
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
dtbo-$(CONFIG_MACH_XIAOMI_MONET) += \
monet-sm7250-overlay.dtbo
dtbo-$(CONFIG_MACH_XIAOMI_PICASSO) += \
picasso-sm7250-overlay.dtbo
dtbo-$(CONFIG_MACH_XIAOMI_VANGOGH) += \
vangogh-sm7250-overlay.dtbo
dtbo-$(CONFIG_ARCH_LITO) += \
monet-sm7250-overlay.dtbo \
picasso-sm7250-overlay.dtbo \
vangogh-sm7250-overlay.dtbo

monet-sm7250-overlay.dtbo-base := lito.dtb lito-v2.dtb
picasso-sm7250-overlay.dtbo-base := lito.dtb lito-v2.dtb
Expand Down
197 changes: 88 additions & 109 deletions arch/arm64/boot/dts/vendor/qcom/kona-v2-gpu.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,17 @@

gpu_opp_table_v2: gpu-opp-table_v2 {
compatible = "operating-points-v2";

opp-900000000 {
opp-hz = /bits/ 64 <900000000>;
opp-microvolt = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
};

opp-800000000 {
opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <RPMH_REGULATOR_LEVEL_TURBO>;
};

opp-670000000 {
opp-hz = /bits/ 64 <670000000>;
opp-microvolt = <RPMH_REGULATOR_LEVEL_NOM_L1>;
Expand Down Expand Up @@ -60,16 +70,16 @@
#address-cells = <1>;
#size-cells = <0>;

qcom,gpu-pwrlevels-0 {
qcom,gpu-pwrlevels-0 {
#address-cells = <1>;
#size-cells = <0>;
qcom,speed-bin = <0>;
qcom,initial-pwrlevel = <6>;
qcom,throttle-pwrlevel = <1>;
qcom,initial-pwrlevel = <8>;
qcom,throttle-pwrlevel = <0>;

qcom,gpu-pwrlevel@0 {
reg = <0>;
qcom,gpu-freq = <670000000>;
qcom,gpu-freq = <900000000>;
qcom,bus-freq-ddr7 = <11>;
qcom,bus-min-ddr7 = <11>;
qcom,bus-max-ddr7 = <11>;
Expand All @@ -80,10 +90,10 @@

qcom,acd-level = <0x802b5ffd>;
};

qcom,gpu-pwrlevel@1 {
reg = <1>;
qcom,gpu-freq = <587000000>;
qcom,gpu-freq = <800000000>;
qcom,bus-freq-ddr7 = <11>;
qcom,bus-min-ddr7 = <11>;
qcom,bus-max-ddr7 = <11>;
Expand All @@ -97,6 +107,34 @@

qcom,gpu-pwrlevel@2 {
reg = <2>;
qcom,gpu-freq = <670000000>;
qcom,bus-freq-ddr7 = <11>;
qcom,bus-min-ddr7 = <11>;
qcom,bus-max-ddr7 = <11>;

qcom,bus-freq-ddr8 = <11>;
qcom,bus-min-ddr8 = <11>;
qcom,bus-max-ddr8 = <11>;

qcom,acd-level = <0x802b5ffd>;
};

qcom,gpu-pwrlevel@3 {
reg = <3>;
qcom,gpu-freq = <587000000>;
qcom,bus-freq-ddr7 = <11>;
qcom,bus-min-ddr7 = <11>;
qcom,bus-max-ddr7 = <11>;

qcom,bus-freq-ddr8 = <11>;
qcom,bus-min-ddr8 = <11>;
qcom,bus-max-ddr8 = <11>;

qcom,acd-level = <0x802b5ffd>;
};

qcom,gpu-pwrlevel@4 {
reg = <4>;
qcom,gpu-freq = <525000000>;
qcom,bus-freq-ddr7 = <9>;
qcom,bus-min-ddr7 = <9>;
Expand All @@ -109,8 +147,8 @@
qcom,acd-level = <0x802b5ffd>;
};

qcom,gpu-pwrlevel@3 {
reg = <3>;
qcom,gpu-pwrlevel@5 {
reg = <5>;
qcom,gpu-freq = <490000000>;
qcom,bus-freq-ddr7 = <9>;
qcom,bus-min-ddr7 = <6>;
Expand All @@ -121,10 +159,10 @@
qcom,bus-max-ddr8 = <9>;

qcom,acd-level = <0xa02b5ffd>;
};
};

qcom,gpu-pwrlevel@4 {
reg = <4>;
qcom,gpu-pwrlevel@6 {
reg = <6>;
qcom,gpu-freq = <441600000>;
qcom,bus-freq-ddr7 = <9>;
qcom,bus-min-ddr7 = <6>;
Expand All @@ -137,8 +175,8 @@
qcom,acd-level = <0xa02b5ffd>;
};

qcom,gpu-pwrlevel@5 {
reg = <5>;
qcom,gpu-pwrlevel@7 {
reg = <7>;
qcom,gpu-freq = <400000000>;
qcom,bus-freq-ddr7 = <7>;
qcom,bus-min-ddr7 = <6>;
Expand All @@ -151,8 +189,8 @@
qcom,acd-level = <0xa02b5ffd>;
};

qcom,gpu-pwrlevel@6 {
reg = <6>;
qcom,gpu-pwrlevel@8 {
reg = <8>;
qcom,gpu-freq = <305000000>;
qcom,bus-freq-ddr7 = <3>;
qcom,bus-min-ddr7 = <2>;
Expand All @@ -165,8 +203,8 @@
qcom,acd-level = <0xa02b5ffd>;
};

qcom,gpu-pwrlevel@7 {
reg = <7>;
qcom,gpu-pwrlevel@9 {
reg = <9>;
qcom,gpu-freq = <0>;
qcom,bus-freq = <0>;
qcom,bus-min = <0>;
Expand All @@ -178,26 +216,25 @@
#address-cells = <1>;
#size-cells = <0>;
qcom,speed-bin = <1>;
qcom,initial-pwrlevel = <6>;
qcom,initial-pwrlevel = <8>;
qcom,throttle-pwrlevel = <1>;

qcom,gpu-pwrlevel@0 {
reg = <0>;
qcom,gpu-freq = <670000000>;
qcom,gpu-freq = <900000000>;
qcom,bus-freq-ddr7 = <11>;
qcom,bus-min-ddr7 = <11>;
qcom,bus-max-ddr7 = <11>;

qcom,bus-freq-ddr8 = <11>;
qcom,bus-min-ddr8 = <11>;
qcom,bus-max-ddr8 = <11>;

qcom,acd-level = <0x802b5ffd>;
};

qcom,gpu-pwrlevel@1 {
reg = <1>;
qcom,gpu-freq = <587000000>;
qcom,gpu-freq = <800000000>;
qcom,bus-freq-ddr7 = <11>;
qcom,bus-min-ddr7 = <11>;
qcom,bus-max-ddr7 = <11>;
Expand All @@ -211,106 +248,48 @@

qcom,gpu-pwrlevel@2 {
reg = <2>;
qcom,gpu-freq = <525000000>;
qcom,bus-freq-ddr7 = <9>;
qcom,bus-min-ddr7 = <9>;
qcom,gpu-freq = <670000000>;
qcom,bus-freq-ddr7 = <11>;
qcom,bus-min-ddr7 = <11>;
qcom,bus-max-ddr7 = <11>;

qcom,bus-freq-ddr8 = <8>;
qcom,bus-min-ddr8 = <8>;
qcom,bus-freq-ddr8 = <11>;
qcom,bus-min-ddr8 = <11>;
qcom,bus-max-ddr8 = <11>;

qcom,acd-level = <0x802b5ffd>;
};

qcom,gpu-pwrlevel@3 {
reg = <3>;
qcom,gpu-freq = <490000000>;
qcom,bus-freq-ddr7 = <9>;
qcom,bus-min-ddr7 = <6>;
qcom,bus-max-ddr7 = <9>;
qcom,gpu-freq = <587000000>;
qcom,bus-freq-ddr7 = <11>;
qcom,bus-min-ddr7 = <11>;
qcom,bus-max-ddr7 = <11>;

qcom,bus-freq-ddr8 = <8>;
qcom,bus-min-ddr8 = <7>;
qcom,bus-max-ddr8 = <9>;
qcom,bus-freq-ddr8 = <11>;
qcom,bus-min-ddr8 = <11>;
qcom,bus-max-ddr8 = <11>;

qcom,acd-level = <0xa02b5ffd>;
qcom,acd-level = <0x802b5ffd>;
};

qcom,gpu-pwrlevel@4 {
reg = <4>;
qcom,gpu-freq = <441600000>;
qcom,bus-freq-ddr7 = <9>;
qcom,bus-min-ddr7 = <6>;
qcom,bus-max-ddr7 = <9>;

qcom,bus-freq-ddr8 = <8>;
qcom,bus-min-ddr8 = <7>;
qcom,bus-max-ddr8 = <9>;

qcom,acd-level = <0xa02b5ffd>;
};

qcom,gpu-pwrlevel@5 {
reg = <5>;
qcom,gpu-freq = <400000000>;
qcom,bus-freq-ddr7 = <7>;
qcom,bus-min-ddr7 = <6>;
qcom,bus-max-ddr7 = <9>;

qcom,bus-freq-ddr8 = <8>;
qcom,bus-min-ddr8 = <6>;
qcom,bus-max-ddr8 = <9>;

qcom,acd-level = <0xa02b5ffd>;
};

qcom,gpu-pwrlevel@6 {
reg = <6>;
qcom,gpu-freq = <305000000>;
qcom,bus-freq-ddr7 = <3>;
qcom,bus-min-ddr7 = <2>;
qcom,bus-max-ddr7 = <9>;

qcom,bus-freq-ddr8 = <3>;
qcom,bus-min-ddr8 = <2>;
qcom,bus-max-ddr8 = <9>;

qcom,acd-level = <0xa02b5ffd>;
};

qcom,gpu-pwrlevel@7 {
reg = <7>;
qcom,gpu-freq = <0>;
qcom,bus-freq = <0>;
qcom,bus-min = <0>;
qcom,bus-max = <0>;
};
};

qcom,gpu-pwrlevels-2 {
#address-cells = <1>;
#size-cells = <0>;
qcom,speed-bin = <3>;
qcom,initial-pwrlevel = <4>;
qcom,throttle-pwrlevel = <0>;

qcom,gpu-pwrlevel@0 {
reg = <0>;
qcom,gpu-freq = <525000000>;
qcom,bus-freq-ddr7 = <11>;
qcom,bus-min-ddr7 = <10>;
qcom,bus-freq-ddr7 = <9>;
qcom,bus-min-ddr7 = <9>;
qcom,bus-max-ddr7 = <11>;

qcom,bus-freq-ddr8 = <11>;
qcom,bus-min-ddr8 = <10>;
qcom,bus-freq-ddr8 = <8>;
qcom,bus-min-ddr8 = <8>;
qcom,bus-max-ddr8 = <11>;

qcom,acd-level = <0x802b5ffd>;
};

qcom,gpu-pwrlevel@1 {
reg = <1>;
qcom,gpu-pwrlevel@5 {
reg = <5>;
qcom,gpu-freq = <490000000>;
qcom,bus-freq-ddr7 = <9>;
qcom,bus-min-ddr7 = <6>;
Expand All @@ -321,10 +300,10 @@
qcom,bus-max-ddr8 = <9>;

qcom,acd-level = <0xa02b5ffd>;
};
};

qcom,gpu-pwrlevel@2 {
reg = <2>;
qcom,gpu-pwrlevel@6 {
reg = <6>;
qcom,gpu-freq = <441600000>;
qcom,bus-freq-ddr7 = <9>;
qcom,bus-min-ddr7 = <6>;
Expand All @@ -337,8 +316,8 @@
qcom,acd-level = <0xa02b5ffd>;
};

qcom,gpu-pwrlevel@3 {
reg = <3>;
qcom,gpu-pwrlevel@7 {
reg = <7>;
qcom,gpu-freq = <400000000>;
qcom,bus-freq-ddr7 = <7>;
qcom,bus-min-ddr7 = <6>;
Expand All @@ -351,8 +330,8 @@
qcom,acd-level = <0xa02b5ffd>;
};

qcom,gpu-pwrlevel@4 {
reg = <4>;
qcom,gpu-pwrlevel@8 {
reg = <8>;
qcom,gpu-freq = <305000000>;
qcom,bus-freq-ddr7 = <3>;
qcom,bus-min-ddr7 = <2>;
Expand All @@ -365,8 +344,8 @@
qcom,acd-level = <0xa02b5ffd>;
};

qcom,gpu-pwrlevel@5 {
reg = <5>;
qcom,gpu-pwrlevel@9 {
reg = <9>;
qcom,gpu-freq = <0>;
qcom,bus-freq = <0>;
qcom,bus-min = <0>;
Expand Down
Loading

0 comments on commit 5355d1d

Please sign in to comment.