Message ID | 20201130033055.38462-1-biwen.li@oss.nxp.com |
---|---|
State | Superseded |
Headers | show |
Series | [v3,01/11] irqchip: ls-extirq: Add LS1043A, LS1088A external interrupt | expand |
[- jason] On 2020-11-30 03:30, Biwen Li wrote: > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > Add an new IRQ chip declaration for LS1043A and LS1088A > - compatible "fsl,ls1043a-extirq" for LS1043A, LS1046A. > - compatible "fsl,ls1088a-extirq" for LS1088A, LS208xA, LX216xA > > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > Signed-off-by: Biwen Li <biwen.li@nxp.com> > --- > Change in v3: > - cleanup code > - remove robust copyright > > Change in v2: > - add despcription of bit reverse > - update copyright > > drivers/irqchip/irq-ls-extirq.c | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > > diff --git a/drivers/irqchip/irq-ls-extirq.c > b/drivers/irqchip/irq-ls-extirq.c > index 4d1179fed77c..47804ce78b21 100644 > --- a/drivers/irqchip/irq-ls-extirq.c > +++ b/drivers/irqchip/irq-ls-extirq.c > @@ -18,7 +18,7 @@ > struct ls_extirq_data { > struct regmap *syscon; > u32 intpcr; > - bool bit_reverse; > + bool is_ls1021a_or_ls1043a; > u32 nirq; > struct irq_fwspec map[MAXIRQ]; > }; > @@ -30,7 +30,7 @@ ls_extirq_set_type(struct irq_data *data, unsigned > int type) > irq_hw_number_t hwirq = data->hwirq; > u32 value, mask; > > - if (priv->bit_reverse) > + if (priv->is_ls1021a_or_ls1043a) > mask = 1U << (31 - hwirq); > else > mask = 1U << hwirq; > @@ -174,14 +174,9 @@ ls_extirq_of_init(struct device_node *node, > struct device_node *parent) > if (ret) > goto out; > > - if (of_device_is_compatible(node, "fsl,ls1021a-extirq")) { > - u32 revcr; > - > - ret = regmap_read(priv->syscon, LS1021A_SCFGREVCR, &revcr); > - if (ret) > - goto out; > - priv->bit_reverse = (revcr != 0); > - } This isn't explained in the commit message. You are changing the way you infer some properties, and that's not innocent. Please describe all important changes in the commit message. > + if (of_device_is_compatible(node, "fsl,ls1021a-extirq") || \ Spurious trailing \? > + of_device_is_compatible(node, "fsl,ls1043a-extirq")) > + priv->is_ls1021a_or_ls1043a = true; Which is better written as: priv->is_ls1021a_or_ls1043a = (of_device_is_compatible(node, "fsl,ls1021a-extirq") || of_device_is_compatible(node, "fsl,ls1043a-extirq")); > > domain = irq_domain_add_hierarchy(parent_domain, 0, priv->nirq, node, > &extirq_domain_ops, priv); > @@ -195,3 +190,5 @@ ls_extirq_of_init(struct device_node *node, struct > device_node *parent) > } > > IRQCHIP_DECLARE(ls1021a_extirq, "fsl,ls1021a-extirq", > ls_extirq_of_init); > +IRQCHIP_DECLARE(ls1043a_extirq, "fsl,ls1043a-extirq", > ls_extirq_of_init); > +IRQCHIP_DECLARE(ls1088a_extirq, "fsl,ls1088a-extirq", > ls_extirq_of_init); Thanks, M.
diff --git a/drivers/irqchip/irq-ls-extirq.c b/drivers/irqchip/irq-ls-extirq.c index 4d1179fed77c..47804ce78b21 100644 --- a/drivers/irqchip/irq-ls-extirq.c +++ b/drivers/irqchip/irq-ls-extirq.c @@ -18,7 +18,7 @@ struct ls_extirq_data { struct regmap *syscon; u32 intpcr; - bool bit_reverse; + bool is_ls1021a_or_ls1043a; u32 nirq; struct irq_fwspec map[MAXIRQ]; }; @@ -30,7 +30,7 @@ ls_extirq_set_type(struct irq_data *data, unsigned int type) irq_hw_number_t hwirq = data->hwirq; u32 value, mask; - if (priv->bit_reverse) + if (priv->is_ls1021a_or_ls1043a) mask = 1U << (31 - hwirq); else mask = 1U << hwirq; @@ -174,14 +174,9 @@ ls_extirq_of_init(struct device_node *node, struct device_node *parent) if (ret) goto out; - if (of_device_is_compatible(node, "fsl,ls1021a-extirq")) { - u32 revcr; - - ret = regmap_read(priv->syscon, LS1021A_SCFGREVCR, &revcr); - if (ret) - goto out; - priv->bit_reverse = (revcr != 0); - } + if (of_device_is_compatible(node, "fsl,ls1021a-extirq") || \ + of_device_is_compatible(node, "fsl,ls1043a-extirq")) + priv->is_ls1021a_or_ls1043a = true; domain = irq_domain_add_hierarchy(parent_domain, 0, priv->nirq, node, &extirq_domain_ops, priv); @@ -195,3 +190,5 @@ ls_extirq_of_init(struct device_node *node, struct device_node *parent) } IRQCHIP_DECLARE(ls1021a_extirq, "fsl,ls1021a-extirq", ls_extirq_of_init); +IRQCHIP_DECLARE(ls1043a_extirq, "fsl,ls1043a-extirq", ls_extirq_of_init); +IRQCHIP_DECLARE(ls1088a_extirq, "fsl,ls1088a-extirq", ls_extirq_of_init);