Message ID | 1617259087-5502-4-git-send-email-nina-cm.wu@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v2,1/6] dt-bindings: devapc: Update bindings | expand |
Regarding the commit subject: "soc: mediatek: devapc: rename variable for new IC support" maybe something like: "soc: mediatek: devapc: rename register variable infra_base" Other then that looks good to me. On 01/04/2021 08:38, Nina Wu wrote: > From: Nina Wu <Nina-CM.Wu@mediatek.com> > > For new ICs, there are multiple devapc HWs for different subsys. > For example, there is devapc respectively for infra, peri, peri2, etc. > So we rename the variable 'infra_base' to 'base' for code readability. > > Signed-off-by: Nina Wu <Nina-CM.Wu@mediatek.com> > --- > drivers/soc/mediatek/mtk-devapc.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c > index 68c3e35..bcf6e3c 100644 > --- a/drivers/soc/mediatek/mtk-devapc.c > +++ b/drivers/soc/mediatek/mtk-devapc.c > @@ -45,7 +45,7 @@ struct mtk_devapc_data { > > struct mtk_devapc_context { > struct device *dev; > - void __iomem *infra_base; > + void __iomem *base; > u32 vio_idx_num; > struct clk *infra_clk; > const struct mtk_devapc_data *data; > @@ -56,7 +56,7 @@ static void clear_vio_status(struct mtk_devapc_context *ctx) > void __iomem *reg; > int i; > > - reg = ctx->infra_base + ctx->data->vio_sta_offset; > + reg = ctx->base + ctx->data->vio_sta_offset; > > for (i = 0; i < VIO_MOD_TO_REG_IND(ctx->vio_idx_num - 1); i++) > writel(GENMASK(31, 0), reg + 4 * i); > @@ -71,7 +71,7 @@ static void mask_module_irq(struct mtk_devapc_context *ctx, bool mask) > u32 val; > int i; > > - reg = ctx->infra_base + ctx->data->vio_mask_offset; > + reg = ctx->base + ctx->data->vio_mask_offset; > > if (mask) > val = GENMASK(31, 0); > @@ -113,11 +113,11 @@ static int devapc_sync_vio_dbg(struct mtk_devapc_context *ctx) > int ret; > u32 val; > > - pd_vio_shift_sta_reg = ctx->infra_base + > + pd_vio_shift_sta_reg = ctx->base + > ctx->data->vio_shift_sta_offset; > - pd_vio_shift_sel_reg = ctx->infra_base + > + pd_vio_shift_sel_reg = ctx->base + > ctx->data->vio_shift_sel_offset; > - pd_vio_shift_con_reg = ctx->infra_base + > + pd_vio_shift_con_reg = ctx->base + > ctx->data->vio_shift_con_offset; > > /* Find the minimum shift group which has violation */ > @@ -159,8 +159,8 @@ static void devapc_extract_vio_dbg(struct mtk_devapc_context *ctx) > void __iomem *vio_dbg0_reg; > void __iomem *vio_dbg1_reg; > > - vio_dbg0_reg = ctx->infra_base + ctx->data->vio_dbg0_offset; > - vio_dbg1_reg = ctx->infra_base + ctx->data->vio_dbg1_offset; > + vio_dbg0_reg = ctx->base + ctx->data->vio_dbg0_offset; > + vio_dbg1_reg = ctx->base + ctx->data->vio_dbg1_offset; > > vio_dbgs.vio_dbg0 = readl(vio_dbg0_reg); > vio_dbgs.vio_dbg1 = readl(vio_dbg1_reg); > @@ -198,7 +198,7 @@ static irqreturn_t devapc_violation_irq(int irq_number, void *data) > */ > static void start_devapc(struct mtk_devapc_context *ctx) > { > - writel(BIT(31), ctx->infra_base + ctx->data->apc_con_offset); > + writel(BIT(31), ctx->base + ctx->data->apc_con_offset); > > mask_module_irq(ctx, false); > } > @@ -210,7 +210,7 @@ static void stop_devapc(struct mtk_devapc_context *ctx) > { > mask_module_irq(ctx, true); > > - writel(BIT(2), ctx->infra_base + ctx->data->apc_con_offset); > + writel(BIT(2), ctx->base + ctx->data->apc_con_offset); > } > > static const struct mtk_devapc_data devapc_mt6779 = { > @@ -249,8 +249,8 @@ static int mtk_devapc_probe(struct platform_device *pdev) > ctx->data = of_device_get_match_data(&pdev->dev); > ctx->dev = &pdev->dev; > > - ctx->infra_base = of_iomap(node, 0); > - if (!ctx->infra_base) > + ctx->base = of_iomap(node, 0); > + if (!ctx->base) > return -EINVAL; > > if (of_property_read_u32(node, "vio_idx_num", &ctx->vio_idx_num)) >
Hi, Matthias On Tue, 2021-04-06 at 15:43 +0200, Matthias Brugger wrote: > Regarding the commit subject: > "soc: mediatek: devapc: rename variable for new IC support" > maybe something like: > "soc: mediatek: devapc: rename register variable infra_base" > > Other then that looks good to me. > OK. I will fix it in the next version. Thanks > On 01/04/2021 08:38, Nina Wu wrote: > > From: Nina Wu <Nina-CM.Wu@mediatek.com> > > > > For new ICs, there are multiple devapc HWs for different subsys. > > For example, there is devapc respectively for infra, peri, peri2, etc. > > So we rename the variable 'infra_base' to 'base' for code readability. > > > > Signed-off-by: Nina Wu <Nina-CM.Wu@mediatek.com> > > --- > > drivers/soc/mediatek/mtk-devapc.c | 24 ++++++++++++------------ > > 1 file changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c > > index 68c3e35..bcf6e3c 100644 > > --- a/drivers/soc/mediatek/mtk-devapc.c > > +++ b/drivers/soc/mediatek/mtk-devapc.c > > @@ -45,7 +45,7 @@ struct mtk_devapc_data { > > > > struct mtk_devapc_context { > > struct device *dev; > > - void __iomem *infra_base; > > + void __iomem *base; > > u32 vio_idx_num; > > struct clk *infra_clk; > > const struct mtk_devapc_data *data; > > @@ -56,7 +56,7 @@ static void clear_vio_status(struct mtk_devapc_context *ctx) > > void __iomem *reg; > > int i; > > > > - reg = ctx->infra_base + ctx->data->vio_sta_offset; > > + reg = ctx->base + ctx->data->vio_sta_offset; > > > > for (i = 0; i < VIO_MOD_TO_REG_IND(ctx->vio_idx_num - 1); i++) > > writel(GENMASK(31, 0), reg + 4 * i); > > @@ -71,7 +71,7 @@ static void mask_module_irq(struct mtk_devapc_context *ctx, bool mask) > > u32 val; > > int i; > > > > - reg = ctx->infra_base + ctx->data->vio_mask_offset; > > + reg = ctx->base + ctx->data->vio_mask_offset; > > > > if (mask) > > val = GENMASK(31, 0); > > @@ -113,11 +113,11 @@ static int devapc_sync_vio_dbg(struct mtk_devapc_context *ctx) > > int ret; > > u32 val; > > > > - pd_vio_shift_sta_reg = ctx->infra_base + > > + pd_vio_shift_sta_reg = ctx->base + > > ctx->data->vio_shift_sta_offset; > > - pd_vio_shift_sel_reg = ctx->infra_base + > > + pd_vio_shift_sel_reg = ctx->base + > > ctx->data->vio_shift_sel_offset; > > - pd_vio_shift_con_reg = ctx->infra_base + > > + pd_vio_shift_con_reg = ctx->base + > > ctx->data->vio_shift_con_offset; > > > > /* Find the minimum shift group which has violation */ > > @@ -159,8 +159,8 @@ static void devapc_extract_vio_dbg(struct mtk_devapc_context *ctx) > > void __iomem *vio_dbg0_reg; > > void __iomem *vio_dbg1_reg; > > > > - vio_dbg0_reg = ctx->infra_base + ctx->data->vio_dbg0_offset; > > - vio_dbg1_reg = ctx->infra_base + ctx->data->vio_dbg1_offset; > > + vio_dbg0_reg = ctx->base + ctx->data->vio_dbg0_offset; > > + vio_dbg1_reg = ctx->base + ctx->data->vio_dbg1_offset; > > > > vio_dbgs.vio_dbg0 = readl(vio_dbg0_reg); > > vio_dbgs.vio_dbg1 = readl(vio_dbg1_reg); > > @@ -198,7 +198,7 @@ static irqreturn_t devapc_violation_irq(int irq_number, void *data) > > */ > > static void start_devapc(struct mtk_devapc_context *ctx) > > { > > - writel(BIT(31), ctx->infra_base + ctx->data->apc_con_offset); > > + writel(BIT(31), ctx->base + ctx->data->apc_con_offset); > > > > mask_module_irq(ctx, false); > > } > > @@ -210,7 +210,7 @@ static void stop_devapc(struct mtk_devapc_context *ctx) > > { > > mask_module_irq(ctx, true); > > > > - writel(BIT(2), ctx->infra_base + ctx->data->apc_con_offset); > > + writel(BIT(2), ctx->base + ctx->data->apc_con_offset); > > } > > > > static const struct mtk_devapc_data devapc_mt6779 = { > > @@ -249,8 +249,8 @@ static int mtk_devapc_probe(struct platform_device *pdev) > > ctx->data = of_device_get_match_data(&pdev->dev); > > ctx->dev = &pdev->dev; > > > > - ctx->infra_base = of_iomap(node, 0); > > - if (!ctx->infra_base) > > + ctx->base = of_iomap(node, 0); > > + if (!ctx->base) > > return -EINVAL; > > > > if (of_property_read_u32(node, "vio_idx_num", &ctx->vio_idx_num)) > >
diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c index 68c3e35..bcf6e3c 100644 --- a/drivers/soc/mediatek/mtk-devapc.c +++ b/drivers/soc/mediatek/mtk-devapc.c @@ -45,7 +45,7 @@ struct mtk_devapc_data { struct mtk_devapc_context { struct device *dev; - void __iomem *infra_base; + void __iomem *base; u32 vio_idx_num; struct clk *infra_clk; const struct mtk_devapc_data *data; @@ -56,7 +56,7 @@ static void clear_vio_status(struct mtk_devapc_context *ctx) void __iomem *reg; int i; - reg = ctx->infra_base + ctx->data->vio_sta_offset; + reg = ctx->base + ctx->data->vio_sta_offset; for (i = 0; i < VIO_MOD_TO_REG_IND(ctx->vio_idx_num - 1); i++) writel(GENMASK(31, 0), reg + 4 * i); @@ -71,7 +71,7 @@ static void mask_module_irq(struct mtk_devapc_context *ctx, bool mask) u32 val; int i; - reg = ctx->infra_base + ctx->data->vio_mask_offset; + reg = ctx->base + ctx->data->vio_mask_offset; if (mask) val = GENMASK(31, 0); @@ -113,11 +113,11 @@ static int devapc_sync_vio_dbg(struct mtk_devapc_context *ctx) int ret; u32 val; - pd_vio_shift_sta_reg = ctx->infra_base + + pd_vio_shift_sta_reg = ctx->base + ctx->data->vio_shift_sta_offset; - pd_vio_shift_sel_reg = ctx->infra_base + + pd_vio_shift_sel_reg = ctx->base + ctx->data->vio_shift_sel_offset; - pd_vio_shift_con_reg = ctx->infra_base + + pd_vio_shift_con_reg = ctx->base + ctx->data->vio_shift_con_offset; /* Find the minimum shift group which has violation */ @@ -159,8 +159,8 @@ static void devapc_extract_vio_dbg(struct mtk_devapc_context *ctx) void __iomem *vio_dbg0_reg; void __iomem *vio_dbg1_reg; - vio_dbg0_reg = ctx->infra_base + ctx->data->vio_dbg0_offset; - vio_dbg1_reg = ctx->infra_base + ctx->data->vio_dbg1_offset; + vio_dbg0_reg = ctx->base + ctx->data->vio_dbg0_offset; + vio_dbg1_reg = ctx->base + ctx->data->vio_dbg1_offset; vio_dbgs.vio_dbg0 = readl(vio_dbg0_reg); vio_dbgs.vio_dbg1 = readl(vio_dbg1_reg); @@ -198,7 +198,7 @@ static irqreturn_t devapc_violation_irq(int irq_number, void *data) */ static void start_devapc(struct mtk_devapc_context *ctx) { - writel(BIT(31), ctx->infra_base + ctx->data->apc_con_offset); + writel(BIT(31), ctx->base + ctx->data->apc_con_offset); mask_module_irq(ctx, false); } @@ -210,7 +210,7 @@ static void stop_devapc(struct mtk_devapc_context *ctx) { mask_module_irq(ctx, true); - writel(BIT(2), ctx->infra_base + ctx->data->apc_con_offset); + writel(BIT(2), ctx->base + ctx->data->apc_con_offset); } static const struct mtk_devapc_data devapc_mt6779 = { @@ -249,8 +249,8 @@ static int mtk_devapc_probe(struct platform_device *pdev) ctx->data = of_device_get_match_data(&pdev->dev); ctx->dev = &pdev->dev; - ctx->infra_base = of_iomap(node, 0); - if (!ctx->infra_base) + ctx->base = of_iomap(node, 0); + if (!ctx->base) return -EINVAL; if (of_property_read_u32(node, "vio_idx_num", &ctx->vio_idx_num))