| Message ID | 1452508600-3512-3-git-send-email-zhangqing@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi zhangqin, From my datasheet "Rockchip RK3368 TRM V2.0.pdf" Maybe i'm missing something. ? 2016?01?11? 18:36, zhangqing ??: > This driver is modified to support RK3368 SoC. > > Signed-off-by: zhangqing <zhangqing@rock-chips.com> > --- > drivers/soc/rockchip/pm_domains.c | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c > index 534c589..6cdffb1 100644 > --- a/drivers/soc/rockchip/pm_domains.c > +++ b/drivers/soc/rockchip/pm_domains.c > @@ -18,6 +18,7 @@ > #include <linux/regmap.h> > #include <linux/mfd/syscon.h> > #include <dt-bindings/power/rk3288-power.h> > +#include <dt-bindings/power/rk3368-power.h> > > struct rockchip_domain_info { > int pwr_mask; > @@ -75,6 +76,9 @@ struct rockchip_pmu { > #define DOMAIN_RK3288(pwr, status, req) \ > DOMAIN(pwr, status, req, req, (req) + 16) > > +#define DOMAIN_RK3368(pwr, status, req) \ > + DOMAIN(pwr, status, req, (req) + 16, req) > + You should remove it, that's seem same with the rk3288. The rk3368 datasheet: PMU_PMU_BUS_IDLE_ST ----->idle_vio[24]----->ack PMU_PMU_BUS_IDLE_REQ ---->idle_req_vio[8]----->idle > static bool rockchip_pmu_domain_is_idle(struct rockchip_pm_domain *pd) > { > struct rockchip_pmu *pmu = pd->pmu; > @@ -444,6 +448,14 @@ static const struct rockchip_domain_info rk3288_pm_domains[] = { > [RK3288_PD_GPU] = DOMAIN_RK3288(9, 9, 2), > }; > > +static const struct rockchip_domain_info rk3368_pm_domains[] = { > + [RK3368_PD_PERI] = DOMAIN_RK3368(13, 12, 6), > + [RK3368_PD_VIO] = DOMAIN_RK3368(15, 14, 8), > + [RK3368_PD_VIDEO] = DOMAIN_RK3368(14, 13, 7), > + [RK3368_PD_GPU_0] = DOMAIN_RK3368(16, 15, 2), > + [RK3368_PD_GPU_1] = DOMAIN_RK3368(17, 16, 2), > +}; > + > static const struct rockchip_pmu_info rk3288_pmu = { > .pwr_offset = 0x08, > .status_offset = 0x0c, > @@ -461,11 +473,32 @@ static const struct rockchip_pmu_info rk3288_pmu = { > .domain_info = rk3288_pm_domains, > }; > > +static const struct rockchip_pmu_info rk3368_pmu = { > + .pwr_offset = 0x0c, > + .status_offset = 0x10, > + .req_offset = 0x3c, > + .idle_offset = 0x40, > + .ack_offset = 0x40, > + > + .core_pwrcnt_offset = 0x48, > + .gpu_pwrcnt_offset = 0x50, > + > + .core_power_transition_time = 24, > + .gpu_power_transition_time = 24, > + > + .num_domains = ARRAY_SIZE(rk3368_pm_domains), > + .domain_info = rk3368_pm_domains, > +}; > + > static const struct of_device_id rockchip_pm_domain_dt_match[] = { > { > .compatible = "rockchip,rk3288-power-controller", > .data = (void *)&rk3288_pmu, > }, > + { > + .compatible = "rockchip,rk3368-power-controller", > + .data = (void *)&rk3368_pmu, > + }, > { /* sentinel */ }, > }; > > > -- > Thanks, > Caesar
? 2016?01?12? 16:57, zhangqing ??: > hi Caesar Wang > > you need check the datasheet again. > > The rk3368 datasheet: > > PMU_PMU_BUS_IDLE_ST ----->ack_vio[8]----->ack status > ----->idle_vio[24]----->idle status > > PMU_PMU_BUS_IDLE_REQ ---->idle_req_vio[8]----->idle req You are right from the new datasheet. > > On 01/11/2016 05:27 AM, Caesar Wang wrote: >> Hi zhangqin, >> >> From my datasheet "Rockchip RK3368 TRM V2.0.pdf" >> Maybe i'm missing something. >> >> >> ? 2016?01?11? 18:36, zhangqing ??: >>> This driver is modified to support RK3368 SoC. >>> >>> Signed-off-by: zhangqing <zhangqing@rock-chips.com> >>> --- >>> drivers/soc/rockchip/pm_domains.c | 33 >>> +++++++++++++++++++++++++++++++++ >>> 1 file changed, 33 insertions(+) >>> >>> diff --git a/drivers/soc/rockchip/pm_domains.c >>> b/drivers/soc/rockchip/pm_domains.c >>> index 534c589..6cdffb1 100644 >>> --- a/drivers/soc/rockchip/pm_domains.c >>> +++ b/drivers/soc/rockchip/pm_domains.c >>> @@ -18,6 +18,7 @@ >>> #include <linux/regmap.h> >>> #include <linux/mfd/syscon.h> >>> #include <dt-bindings/power/rk3288-power.h> >>> +#include <dt-bindings/power/rk3368-power.h> >>> struct rockchip_domain_info { >>> int pwr_mask; >>> @@ -75,6 +76,9 @@ struct rockchip_pmu { >>> #define DOMAIN_RK3288(pwr, status, req) \ >>> DOMAIN(pwr, status, req, req, (req) + 16) >>> +#define DOMAIN_RK3368(pwr, status, req) \ >>> + DOMAIN(pwr, status, req, (req) + 16, req) >>> + >> >> You should remove it, that's seem same with the rk3288. >> >> The rk3368 datasheet: >> PMU_PMU_BUS_IDLE_ST ----->idle_vio[24]----->ack >> PMU_PMU_BUS_IDLE_REQ ---->idle_req_vio[8]----->idle >> >>> static bool rockchip_pmu_domain_is_idle(struct rockchip_pm_domain >>> *pd) >>> { >>> struct rockchip_pmu *pmu = pd->pmu; >>> @@ -444,6 +448,14 @@ static const struct rockchip_domain_info >>> rk3288_pm_domains[] = { >>> [RK3288_PD_GPU] = DOMAIN_RK3288(9, 9, 2), >>> }; >>> +static const struct rockchip_domain_info rk3368_pm_domains[] = { >>> + [RK3368_PD_PERI] = DOMAIN_RK3368(13, 12, 6), >>> + [RK3368_PD_VIO] = DOMAIN_RK3368(15, 14, 8), >>> + [RK3368_PD_VIDEO] = DOMAIN_RK3368(14, 13, 7), >>> + [RK3368_PD_GPU_0] = DOMAIN_RK3368(16, 15, 2), >>> + [RK3368_PD_GPU_1] = DOMAIN_RK3368(17, 16, 2), >>> +}; >>> + >>> static const struct rockchip_pmu_info rk3288_pmu = { >>> .pwr_offset = 0x08, >>> .status_offset = 0x0c, >>> @@ -461,11 +473,32 @@ static const struct rockchip_pmu_info rk3288_pmu >>> = { >>> .domain_info = rk3288_pm_domains, >>> }; >>> +static const struct rockchip_pmu_info rk3368_pmu = { >>> + .pwr_offset = 0x0c, >>> + .status_offset = 0x10, >>> + .req_offset = 0x3c, >>> + .idle_offset = 0x40, >>> + .ack_offset = 0x40, >>> + >>> + .core_pwrcnt_offset = 0x48, >>> + .gpu_pwrcnt_offset = 0x50, >>> + >>> + .core_power_transition_time = 24, >>> + .gpu_power_transition_time = 24, >>> + >>> + .num_domains = ARRAY_SIZE(rk3368_pm_domains), >>> + .domain_info = rk3368_pm_domains, >>> +}; >>> + >>> static const struct of_device_id rockchip_pm_domain_dt_match[] = { >>> { >>> .compatible = "rockchip,rk3288-power-controller", >>> .data = (void *)&rk3288_pmu, >>> }, >>> + { >>> + .compatible = "rockchip,rk3368-power-controller", >>> + .data = (void *)&rk3368_pmu, >>> + }, >>> { /* sentinel */ }, >>> }; >>> >>> -- >>> Thanks, >>> Caesar >> >> >> > > > _______________________________________________ > Linux-rockchip mailing list > Linux-rockchip@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rockchip
Hi ? 2016?01?11? 18:36, zhangqing ??: > This driver is modified to support RK3368 SoC. > > Signed-off-by: zhangqing <zhangqing@rock-chips.com> Reviewed-by: Caesar Wang <wxt@rock-chips.com> > --- > drivers/soc/rockchip/pm_domains.c | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c > index 534c589..6cdffb1 100644 > --- a/drivers/soc/rockchip/pm_domains.c > +++ b/drivers/soc/rockchip/pm_domains.c > @@ -18,6 +18,7 @@ > #include <linux/regmap.h> > #include <linux/mfd/syscon.h> > #include <dt-bindings/power/rk3288-power.h> > +#include <dt-bindings/power/rk3368-power.h> > > struct rockchip_domain_info { > int pwr_mask; > @@ -75,6 +76,9 @@ struct rockchip_pmu { > #define DOMAIN_RK3288(pwr, status, req) \ > DOMAIN(pwr, status, req, req, (req) + 16) > > +#define DOMAIN_RK3368(pwr, status, req) \ > + DOMAIN(pwr, status, req, (req) + 16, req) > + > static bool rockchip_pmu_domain_is_idle(struct rockchip_pm_domain *pd) > { > struct rockchip_pmu *pmu = pd->pmu; > @@ -444,6 +448,14 @@ static const struct rockchip_domain_info rk3288_pm_domains[] = { > [RK3288_PD_GPU] = DOMAIN_RK3288(9, 9, 2), > }; > > +static const struct rockchip_domain_info rk3368_pm_domains[] = { > + [RK3368_PD_PERI] = DOMAIN_RK3368(13, 12, 6), > + [RK3368_PD_VIO] = DOMAIN_RK3368(15, 14, 8), > + [RK3368_PD_VIDEO] = DOMAIN_RK3368(14, 13, 7), > + [RK3368_PD_GPU_0] = DOMAIN_RK3368(16, 15, 2), > + [RK3368_PD_GPU_1] = DOMAIN_RK3368(17, 16, 2), > +}; > + > static const struct rockchip_pmu_info rk3288_pmu = { > .pwr_offset = 0x08, > .status_offset = 0x0c, > @@ -461,11 +473,32 @@ static const struct rockchip_pmu_info rk3288_pmu = { > .domain_info = rk3288_pm_domains, > }; > > +static const struct rockchip_pmu_info rk3368_pmu = { > + .pwr_offset = 0x0c, > + .status_offset = 0x10, > + .req_offset = 0x3c, > + .idle_offset = 0x40, > + .ack_offset = 0x40, > + > + .core_pwrcnt_offset = 0x48, > + .gpu_pwrcnt_offset = 0x50, > + > + .core_power_transition_time = 24, > + .gpu_power_transition_time = 24, > + > + .num_domains = ARRAY_SIZE(rk3368_pm_domains), > + .domain_info = rk3368_pm_domains, > +}; > + > static const struct of_device_id rockchip_pm_domain_dt_match[] = { > { > .compatible = "rockchip,rk3288-power-controller", > .data = (void *)&rk3288_pmu, > }, > + { > + .compatible = "rockchip,rk3368-power-controller", > + .data = (void *)&rk3368_pmu, > + }, > { /* sentinel */ }, > }; >
hi Caesar Wang you need check the datasheet again. > The rk3368 datasheet: > PMU_PMU_BUS_IDLE_ST ----->ack_vio[8]----->ack status ----->idle_vio[24]----->idle status > PMU_PMU_BUS_IDLE_REQ ---->idle_req_vio[8]----->idle req On 01/11/2016 05:27 AM, Caesar Wang wrote: > Hi zhangqin, > > From my datasheet "Rockchip RK3368 TRM V2.0.pdf" > Maybe i'm missing something. > > > ? 2016?01?11? 18:36, zhangqing ??: >> This driver is modified to support RK3368 SoC. >> >> Signed-off-by: zhangqing <zhangqing@rock-chips.com> >> --- >> drivers/soc/rockchip/pm_domains.c | 33 >> +++++++++++++++++++++++++++++++++ >> 1 file changed, 33 insertions(+) >> >> diff --git a/drivers/soc/rockchip/pm_domains.c >> b/drivers/soc/rockchip/pm_domains.c >> index 534c589..6cdffb1 100644 >> --- a/drivers/soc/rockchip/pm_domains.c >> +++ b/drivers/soc/rockchip/pm_domains.c >> @@ -18,6 +18,7 @@ >> #include <linux/regmap.h> >> #include <linux/mfd/syscon.h> >> #include <dt-bindings/power/rk3288-power.h> >> +#include <dt-bindings/power/rk3368-power.h> >> struct rockchip_domain_info { >> int pwr_mask; >> @@ -75,6 +76,9 @@ struct rockchip_pmu { >> #define DOMAIN_RK3288(pwr, status, req) \ >> DOMAIN(pwr, status, req, req, (req) + 16) >> +#define DOMAIN_RK3368(pwr, status, req) \ >> + DOMAIN(pwr, status, req, (req) + 16, req) >> + > > You should remove it, that's seem same with the rk3288. > > The rk3368 datasheet: > PMU_PMU_BUS_IDLE_ST ----->idle_vio[24]----->ack > PMU_PMU_BUS_IDLE_REQ ---->idle_req_vio[8]----->idle > >> static bool rockchip_pmu_domain_is_idle(struct rockchip_pm_domain *pd) >> { >> struct rockchip_pmu *pmu = pd->pmu; >> @@ -444,6 +448,14 @@ static const struct rockchip_domain_info >> rk3288_pm_domains[] = { >> [RK3288_PD_GPU] = DOMAIN_RK3288(9, 9, 2), >> }; >> +static const struct rockchip_domain_info rk3368_pm_domains[] = { >> + [RK3368_PD_PERI] = DOMAIN_RK3368(13, 12, 6), >> + [RK3368_PD_VIO] = DOMAIN_RK3368(15, 14, 8), >> + [RK3368_PD_VIDEO] = DOMAIN_RK3368(14, 13, 7), >> + [RK3368_PD_GPU_0] = DOMAIN_RK3368(16, 15, 2), >> + [RK3368_PD_GPU_1] = DOMAIN_RK3368(17, 16, 2), >> +}; >> + >> static const struct rockchip_pmu_info rk3288_pmu = { >> .pwr_offset = 0x08, >> .status_offset = 0x0c, >> @@ -461,11 +473,32 @@ static const struct rockchip_pmu_info rk3288_pmu >> = { >> .domain_info = rk3288_pm_domains, >> }; >> +static const struct rockchip_pmu_info rk3368_pmu = { >> + .pwr_offset = 0x0c, >> + .status_offset = 0x10, >> + .req_offset = 0x3c, >> + .idle_offset = 0x40, >> + .ack_offset = 0x40, >> + >> + .core_pwrcnt_offset = 0x48, >> + .gpu_pwrcnt_offset = 0x50, >> + >> + .core_power_transition_time = 24, >> + .gpu_power_transition_time = 24, >> + >> + .num_domains = ARRAY_SIZE(rk3368_pm_domains), >> + .domain_info = rk3368_pm_domains, >> +}; >> + >> static const struct of_device_id rockchip_pm_domain_dt_match[] = { >> { >> .compatible = "rockchip,rk3288-power-controller", >> .data = (void *)&rk3288_pmu, >> }, >> + { >> + .compatible = "rockchip,rk3368-power-controller", >> + .data = (void *)&rk3368_pmu, >> + }, >> { /* sentinel */ }, >> }; >> >> -- >> Thanks, >> Caesar > > >
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index 534c589..6cdffb1 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -18,6 +18,7 @@ #include <linux/regmap.h> #include <linux/mfd/syscon.h> #include <dt-bindings/power/rk3288-power.h> +#include <dt-bindings/power/rk3368-power.h> struct rockchip_domain_info { int pwr_mask; @@ -75,6 +76,9 @@ struct rockchip_pmu { #define DOMAIN_RK3288(pwr, status, req) \ DOMAIN(pwr, status, req, req, (req) + 16) +#define DOMAIN_RK3368(pwr, status, req) \ + DOMAIN(pwr, status, req, (req) + 16, req) + static bool rockchip_pmu_domain_is_idle(struct rockchip_pm_domain *pd) { struct rockchip_pmu *pmu = pd->pmu; @@ -444,6 +448,14 @@ static const struct rockchip_domain_info rk3288_pm_domains[] = { [RK3288_PD_GPU] = DOMAIN_RK3288(9, 9, 2), }; +static const struct rockchip_domain_info rk3368_pm_domains[] = { + [RK3368_PD_PERI] = DOMAIN_RK3368(13, 12, 6), + [RK3368_PD_VIO] = DOMAIN_RK3368(15, 14, 8), + [RK3368_PD_VIDEO] = DOMAIN_RK3368(14, 13, 7), + [RK3368_PD_GPU_0] = DOMAIN_RK3368(16, 15, 2), + [RK3368_PD_GPU_1] = DOMAIN_RK3368(17, 16, 2), +}; + static const struct rockchip_pmu_info rk3288_pmu = { .pwr_offset = 0x08, .status_offset = 0x0c, @@ -461,11 +473,32 @@ static const struct rockchip_pmu_info rk3288_pmu = { .domain_info = rk3288_pm_domains, }; +static const struct rockchip_pmu_info rk3368_pmu = { + .pwr_offset = 0x0c, + .status_offset = 0x10, + .req_offset = 0x3c, + .idle_offset = 0x40, + .ack_offset = 0x40, + + .core_pwrcnt_offset = 0x48, + .gpu_pwrcnt_offset = 0x50, + + .core_power_transition_time = 24, + .gpu_power_transition_time = 24, + + .num_domains = ARRAY_SIZE(rk3368_pm_domains), + .domain_info = rk3368_pm_domains, +}; + static const struct of_device_id rockchip_pm_domain_dt_match[] = { { .compatible = "rockchip,rk3288-power-controller", .data = (void *)&rk3288_pmu, }, + { + .compatible = "rockchip,rk3368-power-controller", + .data = (void *)&rk3368_pmu, + }, { /* sentinel */ }, };
This driver is modified to support RK3368 SoC. Signed-off-by: zhangqing <zhangqing@rock-chips.com> --- drivers/soc/rockchip/pm_domains.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)