diff options
author | Florian Fainelli <florian@openwrt.org> | 2013-01-08 22:20:16 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2013-01-08 22:20:16 +0000 |
commit | 91e3a3252f68589aaa7d5131cbe77c2c552c1df4 (patch) | |
tree | a5cbc0f5235b30a249d4532479600f183be2eec6 /target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch | |
parent | b5988e0640bd2ad96cc2c0b79197873f7ab9085c (diff) | |
download | upstream-91e3a3252f68589aaa7d5131cbe77c2c552c1df4.tar.gz upstream-91e3a3252f68589aaa7d5131cbe77c2c552c1df4.tar.bz2 upstream-91e3a3252f68589aaa7d5131cbe77c2c552c1df4.zip |
mvebu: add inital support for Marvell Armada XP/370 SoCs
This brings in the initial support for the Marvell Armada XP/370 SoCs.
Successfully tested on RD-A370-A1 and DB-MV784MP-GP boards the following
interfaces:
- Ethernet
- SDIO
- GPIOs
- SATA
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35058 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch b/target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch new file mode 100644 index 0000000000..9bee8acded --- /dev/null +++ b/target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch @@ -0,0 +1,35 @@ +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +When a channel fails to initialize, we release all ressources, +including clocks. However, a XOR unit is not necessarily associated to +a clock (some variants of Marvell SoCs have a clock for XOR units, +some don't), so we shouldn't unconditionally be releasing the clock. + +Instead, just like we do in the mv_xor_remove() function, we should +check if one clock was found before releasing it. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + drivers/dma/mv_xor.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c +index cc5d23d..e17fad0 100644 +--- a/drivers/dma/mv_xor.c ++++ b/drivers/dma/mv_xor.c +@@ -1366,8 +1366,11 @@ err_channel_add: + irq_dispose_mapping(xordev->channels[i]->irq); + } + +- clk_disable_unprepare(xordev->clk); +- clk_put(xordev->clk); ++ if (!IS_ERR(xordev->clk)) { ++ clk_disable_unprepare(xordev->clk); ++ clk_put(xordev->clk); ++ } ++ + return ret; + } + +-- +1.7.10.4 |