Skip to content

Commit 6905b0d

Browse files
laeyraudstevenprice-arm
authored andcommitted
drm/panfrost: Drop duplicated Mediatek supplies arrays
In the panfrost driver, the platform data of several Mediatek SoC declares and uses custom supplies array definitions (mediatek_mt8192_supplies, mediatek_mt8183_b_supplies), that are the same as default_supplies (used by default platform data). So drop these duplicated definitions and use default_supplies instead. Also, rename mediatek_mt8183_supplies to a more generic name too (legacy_supplies). Signed-off-by: Louis-Alexis Eyraud <louisalexis.eyraud@collabora.com> Reviewed-by: Steven Price <steven.price@arm.com> Signed-off-by: Steven Price <steven.price@arm.com> Link: https://lore.kernel.org/r/20250509-mt8370-enable-gpu-v6-2-2833888cb1d3@collabora.com
1 parent ea024e6 commit 6905b0d

1 file changed

Lines changed: 11 additions & 13 deletions

File tree

drivers/gpu/drm/panfrost/panfrost_drv.c

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -874,49 +874,47 @@ static const struct panfrost_compatible amlogic_data = {
874874
* On new devicetrees please use the _b variant with a single and
875875
* coupled regulators instead.
876876
*/
877-
static const char * const mediatek_mt8183_supplies[] = { "mali", "sram", NULL };
877+
static const char * const legacy_supplies[] = { "mali", "sram", NULL };
878878
static const char * const mediatek_mt8183_pm_domains[] = { "core0", "core1", "core2" };
879879
static const struct panfrost_compatible mediatek_mt8183_data = {
880-
.num_supplies = ARRAY_SIZE(mediatek_mt8183_supplies) - 1,
881-
.supply_names = mediatek_mt8183_supplies,
880+
.num_supplies = ARRAY_SIZE(legacy_supplies) - 1,
881+
.supply_names = legacy_supplies,
882882
.num_pm_domains = ARRAY_SIZE(mediatek_mt8183_pm_domains),
883883
.pm_domain_names = mediatek_mt8183_pm_domains,
884884
};
885885

886-
static const char * const mediatek_mt8183_b_supplies[] = { "mali", NULL };
887886
static const struct panfrost_compatible mediatek_mt8183_b_data = {
888-
.num_supplies = ARRAY_SIZE(mediatek_mt8183_b_supplies) - 1,
889-
.supply_names = mediatek_mt8183_b_supplies,
887+
.num_supplies = ARRAY_SIZE(default_supplies) - 1,
888+
.supply_names = default_supplies,
890889
.num_pm_domains = ARRAY_SIZE(mediatek_mt8183_pm_domains),
891890
.pm_domain_names = mediatek_mt8183_pm_domains,
892891
.pm_features = BIT(GPU_PM_CLK_DIS) | BIT(GPU_PM_VREG_OFF),
893892
};
894893

895894
static const char * const mediatek_mt8186_pm_domains[] = { "core0", "core1" };
896895
static const struct panfrost_compatible mediatek_mt8186_data = {
897-
.num_supplies = ARRAY_SIZE(mediatek_mt8183_b_supplies) - 1,
898-
.supply_names = mediatek_mt8183_b_supplies,
896+
.num_supplies = ARRAY_SIZE(default_supplies) - 1,
897+
.supply_names = default_supplies,
899898
.num_pm_domains = ARRAY_SIZE(mediatek_mt8186_pm_domains),
900899
.pm_domain_names = mediatek_mt8186_pm_domains,
901900
.pm_features = BIT(GPU_PM_CLK_DIS) | BIT(GPU_PM_VREG_OFF),
902901
};
903902

904903
/* MT8188 uses the same power domains and power supplies as MT8183 */
905904
static const struct panfrost_compatible mediatek_mt8188_data = {
906-
.num_supplies = ARRAY_SIZE(mediatek_mt8183_b_supplies) - 1,
907-
.supply_names = mediatek_mt8183_b_supplies,
905+
.num_supplies = ARRAY_SIZE(default_supplies) - 1,
906+
.supply_names = default_supplies,
908907
.num_pm_domains = ARRAY_SIZE(mediatek_mt8183_pm_domains),
909908
.pm_domain_names = mediatek_mt8183_pm_domains,
910909
.pm_features = BIT(GPU_PM_CLK_DIS) | BIT(GPU_PM_VREG_OFF),
911910
.gpu_quirks = BIT(GPU_QUIRK_FORCE_AARCH64_PGTABLE),
912911
};
913912

914-
static const char * const mediatek_mt8192_supplies[] = { "mali", NULL };
915913
static const char * const mediatek_mt8192_pm_domains[] = { "core0", "core1", "core2",
916914
"core3", "core4" };
917915
static const struct panfrost_compatible mediatek_mt8192_data = {
918-
.num_supplies = ARRAY_SIZE(mediatek_mt8192_supplies) - 1,
919-
.supply_names = mediatek_mt8192_supplies,
916+
.num_supplies = ARRAY_SIZE(default_supplies) - 1,
917+
.supply_names = default_supplies,
920918
.num_pm_domains = ARRAY_SIZE(mediatek_mt8192_pm_domains),
921919
.pm_domain_names = mediatek_mt8192_pm_domains,
922920
.pm_features = BIT(GPU_PM_CLK_DIS) | BIT(GPU_PM_VREG_OFF),

0 commit comments

Comments
 (0)