From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Current SSI interrupts has been set to each port. But it is too ugly style. SSI interrupts will be listed under rcar_sound,ssi node by this patch
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com ---
Mark
There is still no DT user for this driver at this point. No conflict happens on platform.
.../devicetree/bindings/sound/renesas,rsnd.txt | 50 ++++++++------------ sound/soc/sh/rcar/ssi.c | 2 +- 2 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index 8346cab..1fba56b 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -53,36 +53,26 @@ rcar_sound: rcar_sound@0xffd90000 { };
rcar_sound,ssi { - ssi0: ssi@0 { - interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi1: ssi@1 { - interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi2: ssi@2 { - interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi3: ssi@3 { - interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi4: ssi@4 { - interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi5: ssi@5 { - interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi6: ssi@6 { - interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi7: ssi@7 { - interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi8: ssi@8 { - interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi9: ssi@9 { - interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; - }; + interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>, + <0 371 IRQ_TYPE_LEVEL_HIGH>, + <0 372 IRQ_TYPE_LEVEL_HIGH>, + <0 373 IRQ_TYPE_LEVEL_HIGH>, + <0 374 IRQ_TYPE_LEVEL_HIGH>, + <0 375 IRQ_TYPE_LEVEL_HIGH>, + <0 376 IRQ_TYPE_LEVEL_HIGH>, + <0 377 IRQ_TYPE_LEVEL_HIGH>, + <0 378 IRQ_TYPE_LEVEL_HIGH>, + <0 379 IRQ_TYPE_LEVEL_HIGH>; + ssi0: ssi@0 { }; + ssi1: ssi@1 { }; + ssi2: ssi@2 { }; + ssi3: ssi@3 { }; + ssi4: ssi@4 { }; + ssi5: ssi@5 { }; + ssi6: ssi@6 { }; + ssi7: ssi@7 { }; + ssi8: ssi@8 { }; + ssi9: ssi@9 { }; };
rcar_sound,dai { diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 2df723d..b311bc6 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -588,7 +588,7 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev, /* * irq */ - ssi_info->pio_irq = irq_of_parse_and_map(np, 0); + ssi_info->pio_irq = irq_of_parse_and_map(node, i);
/* * DMA