On Thu, Oct 11, 2012 at 02:24:03PM +0200, Florian Fainelli wrote:
> I did not get any feedback from you on this, is it ok from your perspective?
My perspective is that you sent this in the merge window so there's no
rush to look at it until after the merge window.
---
On Thu, Oct 11, 2012 at 10:31:58PM +0100, Grant Likely wrote:
> Hey Matt,
>
> Do you know now similar are the EDMA engines on the am33xx and am389x? I've
> been working on am389x upstreaming and I'll try these patches out if it is
> the same engine.
Hi Grant,
It's the same one. am389x/ti816x and
Hey Matt,
Do you know now similar are the EDMA engines on the am33xx and am389x? I've
been working on am389x upstreaming and I'll try these patches out if it is
the same engine.
g.
On Oct 11, 2012 8:03 PM, "Matt Porter" wrote:
> Changes since v1:
> - Rebased on top of mainline from 1225
Adds AM33XX SPI support to the am33xx.dtsi and the BeagleBone
dts.
Signed-off-by: Matt Porter
---
arch/arm/boot/dts/am335x-bone.dts | 17 +++
arch/arm/boot/dts/am33xx.dtsi | 43 +
2 files changed, 60 insertions(+)
diff --git a/arch/arm/boo
The binding definition is based on the generic DMA request binding.
Signed-off-by: Matt Porter
---
Documentation/devicetree/bindings/spi/omap-spi.txt | 27 +++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/spi/omap-spi.txt
b/D
Adds AM33XX MMC support to the am33xx.dtsi and the BeagleBone
dts.
Signed-off-by: Matt Porter
---
arch/arm/boot/dts/am335x-bone.dts |6 ++
arch/arm/boot/dts/am33xx.dtsi | 27 +++
2 files changed, 33 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-bone.d
Convert dmaengine channel requests to use
dma_request_slave_channel_compat(). This supports the DT case of
platforms requiring channel selection from either the OMAP DMA or
the EDMA engine. AM33xx only boots from DT and is the only user
implementing EDMA so in the !DT case we can default to the OMA
Convert dmaengine channel requests to use
dma_request_slave_channel_compat(). This supports the DT case of
platforms requiring channel selection from either the OMAP DMA or
the EDMA engine. AM33xx only boots from DT and is the only user
implementing EDMA so in the !DT case we can default to the OMA
The EDMA DMAC has a hardware limitation that prevents supporting
scatter gather lists with any number of segments. Since the EDMA
DMA Engine driver sets the maximum segments to 16, we do the
same.
TODO: this will be replaced once the DMA Engine API supports an
API to query the DMAC's segment size
The binding definition is based on the generic DMA request binding.
Signed-off-by: Matt Porter
---
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 25 +++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
Adds support for parsing the TI EDMA DT data into the required
EDMA private API platform data.
Calls runtime PM API only in the DT case in order to unidle the
associated hwmods on AM335x.
TODO: add AM33XX crossbar support and DT binding
Signed-off-by: Matt Porter
---
arch/arm/common/edma.c
Adds a dma_request_slave_channel_compat() wrapper which accepts
both the arguments from dma_request_channel() and
dma_request_slave_channel(). Based on whether the driver is
instantiated via DT, the appropriate channel request call will be
made.
This allows for a much cleaner migration of drivers
AM33xx requires special handling in hsmmc initialization
platform glue.
Signed-off-by: Matt Porter
---
arch/arm/mach-omap2/hsmmc.c |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 4d3a632..42ce988 100644
Adds AM33XX EDMA support to the am33xx.dtsi as documented in
Documentation/devicetree/bindings/dma/ti-edma.txt
Signed-off-by: Matt Porter
---
arch/arm/boot/dts/am33xx.dtsi | 30 ++
1 file changed, 30 insertions(+)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/a
Enable TI EDMA option on OMAP.
Signed-off-by: Matt Porter
---
drivers/dma/Kconfig |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 677cd6e..eaea1c2 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -210,7 +210,7 @@
The binding definition is based on the generic DMA controller
binding.
Signed-off-by: Matt Porter
---
Documentation/devicetree/bindings/dma/ti-edma.txt | 49 +
1 file changed, 49 insertions(+)
create mode 100644 Documentation/devicetree/bindings/dma/ti-edma.txt
diff --git
Move mach-davinci/dma.c to common/edma.c so it can be used
by OMAP (specifically AM33xx) as well. This just moves the
private EDMA API but does not support OMAP.
Signed-off-by: Matt Porter
---
arch/arm/Kconfig |1 +
arch/arm/common/Kconfig
The edma_slave_config() implementation depends on the
direction field such that it will not properly configure
a slave channel when called without direction set.
This fixes the implementation so that the slave config
is copied as is and prep_slave_sg() handles the
direction dependent handling. spi
Changes since v1:
- Rebased on top of mainline from 12250d8
- Dropped the feature removal schedule patch
- Implemented dma_request_slave_channel_compat() and
converted the mmc and spi drivers to use it
- Dropped unneeded #address-cells and #size-cells from
Fix build on OMAP, the irqs are undefined on AM33xx.
These error interrupt handlers were hardcoded as disabled
so since they are unused code, simply remove them.
Signed-off-by: Matt Porter
---
arch/arm/common/edma.c | 37 -
1 file changed, 37 deletions(-)
d
Hi Mark,
On Wednesday 03 October 2012 11:56:52 Florian Fainelli wrote:
> Hi Mark, Grant,
>
> This small series contains cleanups and fixes that had already been previously
> merged by Grant in his tree, but not pushed upstream. I am resending them
> rebased on Mark's spi-next branch.
I did not g
Allow D0 to be an input and D1 to be an output, configurable via
platform data and a new DT property.
Based on a patch from Matus Ujhelyi
Signed-off-by: Daniel Mack
Cc: Matus Ujhelyi
Cc: Mark Brown
Cc: Grant Likely
Cc: Linus Walleij
Cc: Samuel Ortiz
Cc: Juha Yrjola
Cc: Vaibhav Hiremath
From: Patrice Chotard
This commit allow to put pins in IDLE state in
runtime_suspend and in SLEEP state in suspend, corresponding
to defined semantics in .
To do this, just add a boolean parameter runtime
to pl022_resume_resources/pl022_suspend_resources which
indicates if it's called from PM_RU
23 matches
Mail list logo