Commit 6905b0d9 authored by Louis-Alexis Eyraud's avatar Louis-Alexis Eyraud Committed by Steven Price
Browse files

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: default avatarLouis-Alexis Eyraud <louisalexis.eyraud@collabora.com>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarSteven Price <steven.price@arm.com>
Link: https://lore.kernel.org/r/20250509-mt8370-enable-gpu-v6-2-2833888cb1d3@collabora.com
parent ea024e6e

drivers/gpu/drm/panfrost/panfrost_drv.c

+11 −13
Original line number Diff line number Diff line
@@ -874,19 +874,18 @@ static const struct panfrost_compatible amlogic_data = { 
 * On new devicetrees please use the _b variant with a single and

 * coupled regulators instead.

 */

static const char * const mediatek_mt8183_supplies[] = { "mali", "sram", NULL };

static const char * const legacy_supplies[] = { "mali", "sram", NULL };

static const char * const mediatek_mt8183_pm_domains[] = { "core0", "core1", "core2" };

static const struct panfrost_compatible mediatek_mt8183_data = {

	.num_supplies = ARRAY_SIZE(mediatek_mt8183_supplies) - 1,

	.supply_names = mediatek_mt8183_supplies,

	.num_supplies = ARRAY_SIZE(legacy_supplies) - 1,

	.supply_names = legacy_supplies,

	.num_pm_domains = ARRAY_SIZE(mediatek_mt8183_pm_domains),

	.pm_domain_names = mediatek_mt8183_pm_domains,

};



static const char * const mediatek_mt8183_b_supplies[] = { "mali", NULL };

static const struct panfrost_compatible mediatek_mt8183_b_data = {

	.num_supplies = ARRAY_SIZE(mediatek_mt8183_b_supplies) - 1,

	.supply_names = mediatek_mt8183_b_supplies,

	.num_supplies = ARRAY_SIZE(default_supplies) - 1,

	.supply_names = default_supplies,

	.num_pm_domains = ARRAY_SIZE(mediatek_mt8183_pm_domains),

	.pm_domain_names = mediatek_mt8183_pm_domains,

	.pm_features = BIT(GPU_PM_CLK_DIS) | BIT(GPU_PM_VREG_OFF),
@@ -894,8 +893,8 @@ static const struct panfrost_compatible mediatek_mt8183_b_data = { 


static const char * const mediatek_mt8186_pm_domains[] = { "core0", "core1" };

static const struct panfrost_compatible mediatek_mt8186_data = {

	.num_supplies = ARRAY_SIZE(mediatek_mt8183_b_supplies) - 1,

	.supply_names = mediatek_mt8183_b_supplies,

	.num_supplies = ARRAY_SIZE(default_supplies) - 1,

	.supply_names = default_supplies,

	.num_pm_domains = ARRAY_SIZE(mediatek_mt8186_pm_domains),

	.pm_domain_names = mediatek_mt8186_pm_domains,

	.pm_features = BIT(GPU_PM_CLK_DIS) | BIT(GPU_PM_VREG_OFF),
@@ -903,20 +902,19 @@ static const struct panfrost_compatible mediatek_mt8186_data = { 


/* MT8188 uses the same power domains and power supplies as MT8183 */

static const struct panfrost_compatible mediatek_mt8188_data = {

	.num_supplies = ARRAY_SIZE(mediatek_mt8183_b_supplies) - 1,

	.supply_names = mediatek_mt8183_b_supplies,

	.num_supplies = ARRAY_SIZE(default_supplies) - 1,

	.supply_names = default_supplies,

	.num_pm_domains = ARRAY_SIZE(mediatek_mt8183_pm_domains),

	.pm_domain_names = mediatek_mt8183_pm_domains,

	.pm_features = BIT(GPU_PM_CLK_DIS) | BIT(GPU_PM_VREG_OFF),

	.gpu_quirks = BIT(GPU_QUIRK_FORCE_AARCH64_PGTABLE),

};



static const char * const mediatek_mt8192_supplies[] = { "mali", NULL };

static const char * const mediatek_mt8192_pm_domains[] = { "core0", "core1", "core2",

							   "core3", "core4" };

static const struct panfrost_compatible mediatek_mt8192_data = {

	.num_supplies = ARRAY_SIZE(mediatek_mt8192_supplies) - 1,

	.supply_names = mediatek_mt8192_supplies,

	.num_supplies = ARRAY_SIZE(default_supplies) - 1,

	.supply_names = default_supplies,

	.num_pm_domains = ARRAY_SIZE(mediatek_mt8192_pm_domains),

	.pm_domain_names = mediatek_mt8192_pm_domains,

	.pm_features = BIT(GPU_PM_CLK_DIS) | BIT(GPU_PM_VREG_OFF),