Skip to content

Commit 5250547

Browse files
superna9999khilman
authored andcommitted
soc: amlogic: meson-ee-pwrc: add support for the Meson AXG SoCs
The Power Controller in the Amlogic AXG SoCs is similar to the GXL one but with less VPU memory domains to enable and a supplementary Audio memory power domain. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Link: https://lore.kernel.org/r/20200917064702.1459-3-narmstrong@baylibre.com
1 parent 97de44c commit 5250547

1 file changed

Lines changed: 26 additions & 0 deletions

File tree

drivers/soc/amlogic/meson-ee-pwrc.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/reset.h>
1616
#include <linux/clk.h>
1717
#include <dt-bindings/power/meson8-power.h>
18+
#include <dt-bindings/power/meson-axg-power.h>
1819
#include <dt-bindings/power/meson-g12a-power.h>
1920
#include <dt-bindings/power/meson-gxbb-power.h>
2021
#include <dt-bindings/power/meson-sm1-power.h>
@@ -134,6 +135,11 @@ static struct meson_ee_pwrc_top_domain sm1_pwrc_ge2d = SM1_EE_PD(19);
134135
{ __reg, BIT(14) }, \
135136
{ __reg, BIT(15) }
136137

138+
static struct meson_ee_pwrc_mem_domain axg_pwrc_mem_vpu[] = {
139+
VPU_MEMPD(HHI_VPU_MEM_PD_REG0),
140+
VPU_HHI_MEMPD(HHI_MEM_PD_REG0),
141+
};
142+
137143
static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_vpu[] = {
138144
VPU_MEMPD(HHI_VPU_MEM_PD_REG0),
139145
VPU_MEMPD(HHI_VPU_MEM_PD_REG1),
@@ -190,6 +196,10 @@ static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_ge2d[] = {
190196
{ HHI_MEM_PD_REG0, GENMASK(25, 18) },
191197
};
192198

199+
static struct meson_ee_pwrc_mem_domain axg_pwrc_mem_audio[] = {
200+
{ HHI_MEM_PD_REG0, GENMASK(5, 4) },
201+
};
202+
193203
static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_audio[] = {
194204
{ HHI_MEM_PD_REG0, GENMASK(5, 4) },
195205
{ HHI_AUDIO_MEM_PD_REG0, GENMASK(1, 0) },
@@ -231,6 +241,13 @@ static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_audio[] = {
231241

232242
static bool pwrc_ee_get_power(struct meson_ee_pwrc_domain *pwrc_domain);
233243

244+
static struct meson_ee_pwrc_domain_desc axg_pwrc_domains[] = {
245+
[PWRC_AXG_VPU_ID] = VPU_PD("VPU", &gx_pwrc_vpu, axg_pwrc_mem_vpu,
246+
pwrc_ee_get_power, 5, 2),
247+
[PWRC_AXG_ETHERNET_MEM_ID] = MEM_PD("ETH", meson_pwrc_mem_eth),
248+
[PWRC_AXG_AUDIO_ID] = MEM_PD("AUDIO", axg_pwrc_mem_audio),
249+
};
250+
234251
static struct meson_ee_pwrc_domain_desc g12a_pwrc_domains[] = {
235252
[PWRC_G12A_VPU_ID] = VPU_PD("VPU", &gx_pwrc_vpu, g12a_pwrc_mem_vpu,
236253
pwrc_ee_get_power, 11, 2),
@@ -529,6 +546,11 @@ static struct meson_ee_pwrc_domain_data meson_ee_g12a_pwrc_data = {
529546
.domains = g12a_pwrc_domains,
530547
};
531548

549+
static struct meson_ee_pwrc_domain_data meson_ee_axg_pwrc_data = {
550+
.count = ARRAY_SIZE(axg_pwrc_domains),
551+
.domains = axg_pwrc_domains,
552+
};
553+
532554
static struct meson_ee_pwrc_domain_data meson_ee_gxbb_pwrc_data = {
533555
.count = ARRAY_SIZE(gxbb_pwrc_domains),
534556
.domains = gxbb_pwrc_domains,
@@ -562,6 +584,10 @@ static const struct of_device_id meson_ee_pwrc_match_table[] = {
562584
.compatible = "amlogic,meson8m2-pwrc",
563585
.data = &meson_ee_m8b_pwrc_data,
564586
},
587+
{
588+
.compatible = "amlogic,meson-axg-pwrc",
589+
.data = &meson_ee_axg_pwrc_data,
590+
},
565591
{
566592
.compatible = "amlogic,meson-gxbb-pwrc",
567593
.data = &meson_ee_gxbb_pwrc_data,

0 commit comments

Comments
 (0)