Salut Jon,
On 03/12/2013 10:43 PM, Jon Hunter wrote:
> Salut Benoit!
>
> On 03/12/2013 06:00 AM, Benoit Cousson wrote:
>> + Seb G.
>>
>> Hi Jon,
>>
>> How to you plan to merge that series?
>
> Good question ... my thinking was that you or Tony would take 1/2 and
> once that is queued then I would ask Tony to ack 2/2 and Vinod take that
> patch.
Yep, this is what I was thinking too.
> By the way, I have accumulated several DT patches which I sent out
> altogether [1] (at least for my own sanity if no one elses ;-) and I
> have included the below patch with it. I was hoping that may be I could
> create a branch for you to pull. If you would rather cherry-pick the
> various patches and merge yourself then I can separate them too.
Merging your branch is indeed even better for me. So go ahead.
Thanks,
Benoit
>
>> Seb's just posted a McBSP adaptation to SDMA binding, so I'll have to
>> take this one before being able to merge any other SDMA driver
>> adaptation patches.
>>
>> I'm fine to take that one, if you are OK, to avoid merge conflict in DTS
>> later.
>
> Fine with me and that would be preferred. I don't see any downside in
> taking this one and then having Vinod take the other later.
>
>> On 02/26/2013 07:27 PM, Jon Hunter wrote:
>>> Add SDMA controller binding for OMAP2+ devices and populate DMA client
>>> information for SPI and MMC periperhal on OMAP3+ devices. Please note
>>
>> typo-------------------------------^
>
> Thanks! Will fix.
>
>>> that OMAP24xx devices do not have SPI and MMC bindings available yet and
>>> so DMA client information is not populated.
>>>
>>> Signed-off-by: Jon Hunter <jon-hunter@xxxxxx>
>>> Reviewed-by: Felipe Balbi <balbi@xxxxxx>
>>> Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
>>> Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
>>> ---
>>> .../devicetree/bindings/dma/omap-sdma.txt | 51 ++++++++++++++++++++
>>
>> That's a detail, but the bindings should be introduced along with the
>> driver DT adaptation since it does represent its "interface".
>
> Ok, I can add that to patch 2/2 instead.
>
>>> arch/arm/boot/dts/omap2.dtsi | 12 +++++
>>> arch/arm/boot/dts/omap3.dtsi | 40 +++++++++++++++
>>> arch/arm/boot/dts/omap4.dtsi | 41 ++++++++++++++++
>>> arch/arm/boot/dts/omap5.dtsi | 41 ++++++++++++++++
>>> 5 files changed, 185 insertions(+)
>>> create mode 100644 Documentation/devicetree/bindings/dma/omap-sdma.txt
>>>
>>> diff --git a/Documentation/devicetree/bindings/dma/omap-sdma.txt b/Documentation/devicetree/bindings/dma/omap-sdma.txt
>>> new file mode 100644
>>> index 0000000..22aab28
>>> --- /dev/null
>>> +++ b/Documentation/devicetree/bindings/dma/omap-sdma.txt
>>> @@ -0,0 +1,51 @@
>>> +* TI OMAP SDMA controller
>>> +
>>> +Required properties:
>>> +- compatible: Should be set to one of the following:
>>> +
>>> + ti,omap2420-sdma (omap2420)
>>> + ti,omap2430-sdma (omap2430)
>>> + ti,omap3430-sdma (omap3430)
>>> + ti,omap3630-sdma (omap3630)
>>> + ti,omap4430-sdma (omap4430 & omap4460 & omap543x)
>>> +
>>> +- reg: Contains DMA registers location and length.
>>> +- interrupts: Contains DMA interrupt information.
>>> +- #dma-cells: Must be 1.
>>> +- #dma-channels: Contains total number of programmable DMA channels.
>>> +- #dma-requests: Contains total number of DMA requests.
>>> +
>>> +Example:
>>> +
>>> + sdma: dma-controller@4A056000 {
>>> + compatible = "ti,omap-sdma";
>>> + reg = <0x4A056000 0x1000>;
>>
>>
>> Nit: you do have several hexa values in upper case, here and in some dts
>> as well.
>
> Yes will fix that too.
>
> Cheers
> Jon
>
> [1]
> http://www.mail-archive.com/devicetree-discuss@xxxxxxxxxxxxxxxx/msg28050.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
