| Message ID | 1461166339-11109-7-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Wed, Apr 20, 2016 at 05:32:11PM +0200, Geert Uytterhoeven wrote: > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > Documentation/devicetree/bindings/sound/davinci-mcbsp.txt | 2 +- This change does not apply for me, can you please split it up and send the sound ones thru sound tree
Hi Vinod, On Mon, Apr 25, 2016 at 5:26 PM, Vinod Koul <vinod.koul@intel.com> wrote: > On Wed, Apr 20, 2016 at 05:32:11PM +0200, Geert Uytterhoeven wrote: >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> --- >> Documentation/devicetree/bindings/sound/davinci-mcbsp.txt | 2 +- > > This change does not apply for me, can you please split it up and send the > sound ones thru sound tree Sorry, I seem to have mixed two unrelated drivers. Will split and resend... Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt b/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt index 55b53e1fd72c9d6e..e0b6165c9cfcec19 100644 --- a/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt +++ b/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt @@ -43,7 +43,7 @@ mcbsp0: mcbsp@1d10000 { <0x00310000 0x1000>; reg-names = "mpu", "dat"; interrupts = <97 98>; - interrupts-names = "rx", "tx"; + interrupt-names = "rx", "tx"; dmas = <&edma0 3 1 &edma0 2 1>; dma-names = "tx", "rx"; diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index 974015193b93cdb3..d724393e904e9a41 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -974,7 +974,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev) /* legacy device tree case handling */ dev_warn_once(&pdev->dev, - "missing interrupts-names property in device tree - legacy interpretation is used"); + "missing interrupt-names property in device tree - legacy interpretation is used"); /* * in case of channel >= 11 * use the 11th interrupt and that is shared
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Documentation/devicetree/bindings/sound/davinci-mcbsp.txt | 2 +- drivers/dma/bcm2835-dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)