Subject: Re: [PATCH 06/14] dmaengine: bcm2835: DT spelling s/interrupts-names/interrupt-names/

From: Vinod Koul <[email-masked]>
Date: Mon, 25 Apr 2016 20:56:43 +0530

On Wed, Apr 20, 2016 at 05:32:11PM +0200, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <[email-masked]>
> ---
>  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

-- 
~Vinod

>  drivers/dma/bcm2835-dma.c                                 | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> 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
> -- 
> 1.9.1
>