diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2013-11-15 12:23:17 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2013-11-15 12:23:17 +0000 |
| commit | b041af2c640ab6716e0c1db72950b1e0e99afae0 (patch) | |
| tree | a9572752deb28aa978615d39b24eeb9d8b9362b6 /target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch | |
| parent | 6bf4a75ce914ad43855d24d98cb8eeba179e4b2b (diff) | |
| download | upstream-b041af2c640ab6716e0c1db72950b1e0e99afae0.tar.gz upstream-b041af2c640ab6716e0c1db72950b1e0e99afae0.tar.bz2 upstream-b041af2c640ab6716e0c1db72950b1e0e99afae0.zip | |
[omap]: replace the TI patch with a smaller patchset
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38816 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch')
| -rw-r--r-- | target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch b/target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch new file mode 100644 index 0000000000..f474eb812b --- /dev/null +++ b/target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch @@ -0,0 +1,38 @@ +Adds AM33XX EDMA support to the am33xx.dtsi as documented in +Documentation/devicetree/bindings/dma/ti-edma.txt + +[Joel Fernandes <joelf@ti.com>] +Drop DT entries that are non-hardware-description as discussed in [1] + +[1] https://patchwork.kernel.org/patch/2226761/ + +Signed-off-by: Matt Porter <mporter@ti.com> +Signed-off-by: Joel A Fernandes <joelagnel@ti.com> + +--- +arch/arm/boot/dts/am33xx.dtsi | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi +index f9c5da9..19a1c1d 100644 +--- a/arch/arm/boot/dts/am33xx.dtsi ++++ b/arch/arm/boot/dts/am33xx.dtsi +@@ -100,6 +100,18 @@ + reg = <0x48200000 0x1000>; + }; + ++ edma: edma@49000000 { ++ compatible = "ti,edma3"; ++ ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; ++ reg = <0x49000000 0x10000>, ++ <0x44e10f90 0x10>; ++ interrupts = <12 13 14>; ++ #dma-cells = <1>; ++ dma-channels = <64>; ++ ti,edma-regions = <4>; ++ ti,edma-slots = <256>; ++ }; ++ + gpio0: gpio@44e07000 { + compatible = "ti,omap4-gpio"; + ti,hwmods = "gpio1"; |