From: Vinod Koul Subject: Re: [PATCH 39/39] dmaengine: ste_dma40: Fetch disabled channels from DT Date: Thu, 16 May 2013 11:38:50 +0530 Message-ID: <20130516060850.GI27639@intel.com> References: <1368611522-9984-1-git-send-email-lee.jones@linaro.org> <1368611522-9984-40-git-send-email-lee.jones@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, balbi@ti.com, linux-usb@vger.kernel.org, linux-crypto@vger.kernel.org, davem@davemloft.net, herbert@gondor.hengli.com.au, arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, Dan Williams , Per Forlin , Rabin Vincent To: Lee Jones Return-path: Received: from mga14.intel.com ([143.182.124.37]:5682 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754402Ab3EPGoT (ORCPT ); Thu, 16 May 2013 02:44:19 -0400 Content-Disposition: inline In-Reply-To: <1368611522-9984-40-git-send-email-lee.jones@linaro.org> Sender: linux-crypto-owner@vger.kernel.org List-ID: On Wed, May 15, 2013 at 10:52:02AM +0100, Lee Jones wrote: > Some platforms have channels which are not available for normal use. > This information is currently passed though platform data in internal > BSP kernels. Once those platforms land, they'll need to configure them > appropriately, so we may as well add the infrastructure. > > Cc: Vinod Koul > Cc: Dan Williams > Cc: Per Forlin > Cc: Rabin Vincent > Acked-by: Arnd Bergmann > Signed-off-by: Lee Jones Acked-by: Vinod Koul > --- > Documentation/devicetree/bindings/dma/ste-dma40.txt | 2 ++ > drivers/dma/ste_dma40.c | 17 ++++++++++++++++- > 2 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/dma/ste-dma40.txt b/Documentation/devicetree/bindings/dma/ste-dma40.txt > index aa272d8..bea5b73 100644 > --- a/Documentation/devicetree/bindings/dma/ste-dma40.txt > +++ b/Documentation/devicetree/bindings/dma/ste-dma40.txt > @@ -11,6 +11,7 @@ Required properties: > Optional properties: > - dma-channels: Number of channels supported by hardware - if not present > the driver will attempt to obtain the information from H/W > +- disabled-channels: Channels which can not be used > > Example: > > @@ -23,6 +24,7 @@ Example: > > #dma-cells = <2>; > memcpy-channels = <56 57 58 59 60>; > + disabled-channels = <12>; > dma-channels = <8>; > }; > > diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c > index 4e528dd..ffac822 100644 > --- a/drivers/dma/ste_dma40.c > +++ b/drivers/dma/ste_dma40.c > @@ -3482,7 +3482,7 @@ static int __init d40_of_probe(struct platform_device *pdev, > struct device_node *np) > { > struct stedma40_platform_data *pdata; > - int num_phy = 0, num_memcpy = 0; > + int num_phy = 0, num_memcpy = 0, num_disabled = 0; > const const __be32 *list; > > pdata = devm_kzalloc(&pdev->dev, > @@ -3511,6 +3511,21 @@ static int __init d40_of_probe(struct platform_device *pdev, > dma40_memcpy_channels, > num_memcpy); > > + list = of_get_property(np, "disabled-channels", &num_disabled); > + num_disabled /= sizeof(*list); > + > + if (num_disabled > STEDMA40_MAX_PHYS || num_disabled < 0) { > + d40_err(&pdev->dev, > + "Invalid number of disabled channels specified (%d)\n", > + num_disabled); > + return -EINVAL; > + } > + > + of_property_read_u32_array(np, "disabled-channels", > + pdata->disabled_channels, > + num_disabled); > + pdata->disabled_channels[num_disabled] = -1; > + > pdev->dev.platform_data = pdata; > > return 0; > -- > 1.7.10.4 >