Message ID | 1548853196-11447-2-git-send-email-aisheng.dong@nxp.com |
---|---|
State | Superseded, archived |
Headers | show |
Series | irq: imx-irqsteer: add 32 interrupts chan and multi outputs support | expand |
Context | Check | Description |
---|---|---|
robh/checkpatch | warning | "total: 0 errors, 1 warnings, 18 lines checked" |
Am Mittwoch, den 30.01.2019, 13:05 +0000 schrieb Aisheng Dong: > Not all 64 interrupts may be used in one group. e.g. most irqsteer in > imx8qxp and imx8qm subsystems supports only 32 interrupts. > > As the IP integration parameters are Channel number and interrupts number, > let's use fsl,num-irqs to represents how many interrupts supported > by this irqsteer channel. > > > Cc: Marc Zyngier <marc.zyngier@arm.com> > > Cc: Rob Herring <robh+dt@kernel.org> > > Cc: Lucas Stach <l.stach@pengutronix.de> > > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: devicetree@vger.kernel.org > Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> As the original fsl,irq-groups was born out of a misunderstanding of the HW config options and I'm not aware of any users of the current binding, I'm fine with merging this. I do think this warrants a backport to stable though, so we don't end up with different bindings in stable and current kernels. Reviewed-by: Lucas Stach <l.stach@pengutronix.de> > --- > ChangeLog: > v1->v2: > * change property name fsl,irqs-per-chan to fsl,num-irqs. > --- > .../devicetree/bindings/interrupt-controller/fsl,irqsteer.txt | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt b/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt > index 45790ce..6d0a41b 100644 > --- a/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt > +++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt > @@ -16,8 +16,8 @@ Required properties: > - #interrupt-cells: Specifies the number of cells needed to encode an > interrupt source. The value must be 1. > - fsl,channel: The output channel that all input IRQs should be steered into. > -- fsl,irq-groups: Number of IRQ groups managed by this controller instance. > - Each group manages 64 input interrupts. > +- fsl,num-irqs: Number of input interrupts of this channel. > + Should be multiple of 32 input interrupts and up to 512 interrupts. > > Example: > > @@ -28,7 +28,7 @@ Example: > > clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; > > clock-names = "ipg"; > > fsl,channel = <0>; > > - fsl,irq-groups = <1>; > > + fsl,num-irqs = <64>; > > interrupt-controller; > > #interrupt-cells = <1>; > > };
diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt b/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt index 45790ce..6d0a41b 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt @@ -16,8 +16,8 @@ Required properties: - #interrupt-cells: Specifies the number of cells needed to encode an interrupt source. The value must be 1. - fsl,channel: The output channel that all input IRQs should be steered into. -- fsl,irq-groups: Number of IRQ groups managed by this controller instance. - Each group manages 64 input interrupts. +- fsl,num-irqs: Number of input interrupts of this channel. + Should be multiple of 32 input interrupts and up to 512 interrupts. Example: @@ -28,7 +28,7 @@ Example: clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; clock-names = "ipg"; fsl,channel = <0>; - fsl,irq-groups = <1>; + fsl,num-irqs = <64>; interrupt-controller; #interrupt-cells = <1>; };
Not all 64 interrupts may be used in one group. e.g. most irqsteer in imx8qxp and imx8qm subsystems supports only 32 interrupts. As the IP integration parameters are Channel number and interrupts number, let's use fsl,num-irqs to represents how many interrupts supported by this irqsteer channel. Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Shawn Guo <shawnguo@kernel.org> Cc: devicetree@vger.kernel.org Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> --- ChangeLog: v1->v2: * change property name fsl,irqs-per-chan to fsl,num-irqs. --- .../devicetree/bindings/interrupt-controller/fsl,irqsteer.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)