Skip to content

L
linux
Commit 2c2dc545 authored by Jon Hunter's avatar Jon Hunter Committed by Benoit Cousson
Browse files
Options

ARM: dts: OMAP2+: Add SDMA controller bindings and nodes 

Add SDMA controller binding for OMAP2+ devices and populate DMA client
information for SPI and MMC peripheral on OMAP3+ devices. Please note
that OMAP24xx devices do not have SPI and MMC bindings available yet and
so DMA client information is not populated.
Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarBenoit Cousson <benoit.cousson@linaro.org>
parent 9b07b477
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 0 deletions
arch/arm/boot/dts/omap2.dtsi
View file @ 2c2dc545
...@@ -54,6 +54,18 @@ intc: interrupt-controller@1 { ...@@ -54,6 +54,18 @@ intc: interrupt-controller@1 {
reg = <0x480FE000 0x1000>; reg = <0x480FE000 0x1000>;
}; };
sdma: dma-controller@48056000 {
compatible = "ti,omap2430-sdma", "ti,omap2420-sdma";
reg = <0x48056000 0x1000>;
interrupts = <12>,
<13>,
<14>,
<15>;
#dma-cells = <1>;
#dma-channels = <32>;
#dma-requests = <64>;
};
uart1: serial@4806a000 { uart1: serial@4806a000 {
compatible = "ti,omap2-uart"; compatible = "ti,omap2-uart";
ti,hwmods = "uart1"; ti,hwmods = "uart1";
......
arch/arm/boot/dts/omap3.dtsi
View file @ 2c2dc545
...@@ -81,6 +81,18 @@ intc: interrupt-controller@48200000 { ...@@ -81,6 +81,18 @@ intc: interrupt-controller@48200000 {
reg = <0x48200000 0x1000>; reg = <0x48200000 0x1000>;
}; };
sdma: dma-controller@48056000 {
compatible = "ti,omap3630-sdma", "ti,omap3430-sdma";
reg = <0x48056000 0x1000>;
interrupts = <12>,
<13>,
<14>,
<15>;
#dma-cells = <1>;
#dma-channels = <32>;
#dma-requests = <96>;
};
omap3_pmx_core: pinmux@48002030 { omap3_pmx_core: pinmux@48002030 {
compatible = "ti,omap3-padconf", "pinctrl-single"; compatible = "ti,omap3-padconf", "pinctrl-single";
reg = <0x48002030 0x05cc>; reg = <0x48002030 0x05cc>;
...@@ -198,6 +210,16 @@ mcspi1: spi@48098000 { ...@@ -198,6 +210,16 @@ mcspi1: spi@48098000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi1"; ti,hwmods = "mcspi1";
ti,spi-num-cs = <4>; ti,spi-num-cs = <4>;
dmas = <&sdma 35>,
<&sdma 36>,
<&sdma 37>,
<&sdma 38>,
<&sdma 39>,
<&sdma 40>,
<&sdma 41>,
<&sdma 42>;
dma-names = "tx0", "rx0", "tx1", "rx1",
"tx2", "rx2", "tx3", "rx3";
}; };
mcspi2: spi@4809a000 { mcspi2: spi@4809a000 {
...@@ -206,6 +228,11 @@ mcspi2: spi@4809a000 { ...@@ -206,6 +228,11 @@ mcspi2: spi@4809a000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi2"; ti,hwmods = "mcspi2";
ti,spi-num-cs = <2>; ti,spi-num-cs = <2>;
dmas = <&sdma 43>,
<&sdma 44>,
<&sdma 45>,
<&sdma 46>;
dma-names = "tx0", "rx0", "tx1", "rx1";
}; };
mcspi3: spi@480b8000 { mcspi3: spi@480b8000 {
...@@ -214,6 +241,11 @@ mcspi3: spi@480b8000 { ...@@ -214,6 +241,11 @@ mcspi3: spi@480b8000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi3"; ti,hwmods = "mcspi3";
ti,spi-num-cs = <2>; ti,spi-num-cs = <2>;
dmas = <&sdma 15>,
<&sdma 16>,
<&sdma 23>,
<&sdma 24>;
dma-names = "tx0", "rx0", "tx1", "rx1";
}; };
mcspi4: spi@480ba000 { mcspi4: spi@480ba000 {
...@@ -222,22 +254,30 @@ mcspi4: spi@480ba000 { ...@@ -222,22 +254,30 @@ mcspi4: spi@480ba000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi4"; ti,hwmods = "mcspi4";
ti,spi-num-cs = <1>; ti,spi-num-cs = <1>;
dmas = <&sdma 70>, <&sdma 71>;
dma-names = "tx0", "rx0";
}; };
mmc1: mmc@4809c000 { mmc1: mmc@4809c000 {
compatible = "ti,omap3-hsmmc"; compatible = "ti,omap3-hsmmc";
ti,hwmods = "mmc1"; ti,hwmods = "mmc1";
ti,dual-volt; ti,dual-volt;
dmas = <&sdma 61>, <&sdma 62>;
dma-names = "tx", "rx";
}; };
mmc2: mmc@480b4000 { mmc2: mmc@480b4000 {
compatible = "ti,omap3-hsmmc"; compatible = "ti,omap3-hsmmc";
ti,hwmods = "mmc2"; ti,hwmods = "mmc2";
dmas = <&sdma 47>, <&sdma 48>;
dma-names = "tx", "rx";
}; };
mmc3: mmc@480ad000 { mmc3: mmc@480ad000 {
compatible = "ti,omap3-hsmmc"; compatible = "ti,omap3-hsmmc";
ti,hwmods = "mmc3"; ti,hwmods = "mmc3";
dmas = <&sdma 77>, <&sdma 78>;
dma-names = "tx", "rx";
}; };
wdt2: wdt@48314000 { wdt2: wdt@48314000 {
......
arch/arm/boot/dts/omap4.dtsi
View file @ 2c2dc545
...@@ -118,6 +118,18 @@ omap4_pmx_wkup: pinmux@4a31e040 { ...@@ -118,6 +118,18 @@ omap4_pmx_wkup: pinmux@4a31e040 {
pinctrl-single,function-mask = <0x7fff>; pinctrl-single,function-mask = <0x7fff>;
}; };
sdma: dma-controller@4a056000 {
compatible = "ti,omap4430-sdma";
reg = <0x4a056000 0x1000>;
interrupts = <0 12 0x4>,
<0 13 0x4>,
<0 14 0x4>,
<0 15 0x4>;
#dma-cells = <1>;
#dma-channels = <32>;
#dma-requests = <127>;
};
gpio1: gpio@4a310000 { gpio1: gpio@4a310000 {
compatible = "ti,omap4-gpio"; compatible = "ti,omap4-gpio";
reg = <0x4a310000 0x200>; reg = <0x4a310000 0x200>;
...@@ -260,6 +272,16 @@ mcspi1: spi@48098000 { ...@@ -260,6 +272,16 @@ mcspi1: spi@48098000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi1"; ti,hwmods = "mcspi1";
ti,spi-num-cs = <4>; ti,spi-num-cs = <4>;
dmas = <&sdma 35>,
<&sdma 36>,
<&sdma 37>,
<&sdma 38>,
<&sdma 39>,
<&sdma 40>,
<&sdma 41>,
<&sdma 42>;
dma-names = "tx0", "rx0", "tx1", "rx1",
"tx2", "rx2", "tx3", "rx3";
}; };
mcspi2: spi@4809a000 { mcspi2: spi@4809a000 {
...@@ -270,6 +292,11 @@ mcspi2: spi@4809a000 { ...@@ -270,6 +292,11 @@ mcspi2: spi@4809a000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi2"; ti,hwmods = "mcspi2";
ti,spi-num-cs = <2>; ti,spi-num-cs = <2>;
dmas = <&sdma 43>,
<&sdma 44>,
<&sdma 45>,
<&sdma 46>;
dma-names = "tx0", "rx0", "tx1", "rx1";
}; };
mcspi3: spi@480b8000 { mcspi3: spi@480b8000 {
...@@ -280,6 +307,8 @@ mcspi3: spi@480b8000 { ...@@ -280,6 +307,8 @@ mcspi3: spi@480b8000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi3"; ti,hwmods = "mcspi3";
ti,spi-num-cs = <2>; ti,spi-num-cs = <2>;
dmas = <&sdma 15>, <&sdma 16>;
dma-names = "tx0", "rx0";
}; };
mcspi4: spi@480ba000 { mcspi4: spi@480ba000 {
...@@ -290,6 +319,8 @@ mcspi4: spi@480ba000 { ...@@ -290,6 +319,8 @@ mcspi4: spi@480ba000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi4"; ti,hwmods = "mcspi4";
ti,spi-num-cs = <1>; ti,spi-num-cs = <1>;
dmas = <&sdma 70>, <&sdma 71>;
dma-names = "tx0", "rx0";
}; };
mmc1: mmc@4809c000 { mmc1: mmc@4809c000 {
...@@ -299,6 +330,8 @@ mmc1: mmc@4809c000 { ...@@ -299,6 +330,8 @@ mmc1: mmc@4809c000 {
ti,hwmods = "mmc1"; ti,hwmods = "mmc1";
ti,dual-volt; ti,dual-volt;
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 61>, <&sdma 62>;
dma-names = "tx", "rx";
}; };
mmc2: mmc@480b4000 { mmc2: mmc@480b4000 {
...@@ -307,6 +340,8 @@ mmc2: mmc@480b4000 { ...@@ -307,6 +340,8 @@ mmc2: mmc@480b4000 {
interrupts = <0 86 0x4>; interrupts = <0 86 0x4>;
ti,hwmods = "mmc2"; ti,hwmods = "mmc2";
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 47>, <&sdma 48>;
dma-names = "tx", "rx";
}; };
mmc3: mmc@480ad000 { mmc3: mmc@480ad000 {
...@@ -315,6 +350,8 @@ mmc3: mmc@480ad000 { ...@@ -315,6 +350,8 @@ mmc3: mmc@480ad000 {
interrupts = <0 94 0x4>; interrupts = <0 94 0x4>;
ti,hwmods = "mmc3"; ti,hwmods = "mmc3";
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 77>, <&sdma 78>;
dma-names = "tx", "rx";
}; };
mmc4: mmc@480d1000 { mmc4: mmc@480d1000 {
...@@ -323,6 +360,8 @@ mmc4: mmc@480d1000 { ...@@ -323,6 +360,8 @@ mmc4: mmc@480d1000 {
interrupts = <0 96 0x4>; interrupts = <0 96 0x4>;
ti,hwmods = "mmc4"; ti,hwmods = "mmc4";
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 57>, <&sdma 58>;
dma-names = "tx", "rx";
}; };
mmc5: mmc@480d5000 { mmc5: mmc@480d5000 {
...@@ -331,6 +370,8 @@ mmc5: mmc@480d5000 { ...@@ -331,6 +370,8 @@ mmc5: mmc@480d5000 {
interrupts = <0 59 0x4>; interrupts = <0 59 0x4>;
ti,hwmods = "mmc5"; ti,hwmods = "mmc5";
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 59>, <&sdma 60>;
dma-names = "tx", "rx";
}; };
wdt2: wdt@4a314000 { wdt2: wdt@4a314000 {
......
arch/arm/boot/dts/omap5.dtsi
View file @ 2c2dc545
...@@ -108,6 +108,18 @@ gic: interrupt-controller@48211000 { ...@@ -108,6 +108,18 @@ gic: interrupt-controller@48211000 {
<0x48212000 0x1000>; <0x48212000 0x1000>;
}; };
sdma: dma-controller@4a056000 {
compatible = "ti,omap4430-sdma";
reg = <0x4a056000 0x1000>;
interrupts = <0 12 0x4>,
<0 13 0x4>,
<0 14 0x4>,
<0 15 0x4>;
#dma-cells = <1>;
#dma-channels = <32>;
#dma-requests = <127>;
};
gpio1: gpio@4ae10000 { gpio1: gpio@4ae10000 {
compatible = "ti,omap4-gpio"; compatible = "ti,omap4-gpio";
reg = <0x4ae10000 0x200>; reg = <0x4ae10000 0x200>;
...@@ -249,6 +261,16 @@ mcspi1: spi@48098000 { ...@@ -249,6 +261,16 @@ mcspi1: spi@48098000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi1"; ti,hwmods = "mcspi1";
ti,spi-num-cs = <4>; ti,spi-num-cs = <4>;
dmas = <&sdma 35>,
<&sdma 36>,
<&sdma 37>,
<&sdma 38>,
<&sdma 39>,
<&sdma 40>,
<&sdma 41>,
<&sdma 42>;
dma-names = "tx0", "rx0", "tx1", "rx1",
"tx2", "rx2", "tx3", "rx3";
}; };
mcspi2: spi@4809a000 { mcspi2: spi@4809a000 {
...@@ -259,6 +281,11 @@ mcspi2: spi@4809a000 { ...@@ -259,6 +281,11 @@ mcspi2: spi@4809a000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi2"; ti,hwmods = "mcspi2";
ti,spi-num-cs = <2>; ti,spi-num-cs = <2>;
dmas = <&sdma 43>,
<&sdma 44>,
<&sdma 45>,
<&sdma 46>;
dma-names = "tx0", "rx0", "tx1", "rx1";
}; };
mcspi3: spi@480b8000 { mcspi3: spi@480b8000 {
...@@ -269,6 +296,8 @@ mcspi3: spi@480b8000 { ...@@ -269,6 +296,8 @@ mcspi3: spi@480b8000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi3"; ti,hwmods = "mcspi3";
ti,spi-num-cs = <2>; ti,spi-num-cs = <2>;
dmas = <&sdma 15>, <&sdma 16>;
dma-names = "tx0", "rx0";
}; };
mcspi4: spi@480ba000 { mcspi4: spi@480ba000 {
...@@ -279,6 +308,8 @@ mcspi4: spi@480ba000 { ...@@ -279,6 +308,8 @@ mcspi4: spi@480ba000 {
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "mcspi4"; ti,hwmods = "mcspi4";
ti,spi-num-cs = <1>; ti,spi-num-cs = <1>;
dmas = <&sdma 70>, <&sdma 71>;
dma-names = "tx0", "rx0";
}; };
uart1: serial@4806a000 { uart1: serial@4806a000 {
...@@ -336,6 +367,8 @@ mmc1: mmc@4809c000 { ...@@ -336,6 +367,8 @@ mmc1: mmc@4809c000 {
ti,hwmods = "mmc1"; ti,hwmods = "mmc1";
ti,dual-volt; ti,dual-volt;
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 61>, <&sdma 62>;
dma-names = "tx", "rx";
}; };
mmc2: mmc@480b4000 { mmc2: mmc@480b4000 {
...@@ -344,6 +377,8 @@ mmc2: mmc@480b4000 { ...@@ -344,6 +377,8 @@ mmc2: mmc@480b4000 {
interrupts = <0 86 0x4>; interrupts = <0 86 0x4>;
ti,hwmods = "mmc2"; ti,hwmods = "mmc2";
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 47>, <&sdma 48>;
dma-names = "tx", "rx";
}; };
mmc3: mmc@480ad000 { mmc3: mmc@480ad000 {
...@@ -352,6 +387,8 @@ mmc3: mmc@480ad000 { ...@@ -352,6 +387,8 @@ mmc3: mmc@480ad000 {
interrupts = <0 94 0x4>; interrupts = <0 94 0x4>;
ti,hwmods = "mmc3"; ti,hwmods = "mmc3";
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 77>, <&sdma 78>;
dma-names = "tx", "rx";
}; };
mmc4: mmc@480d1000 { mmc4: mmc@480d1000 {
...@@ -360,6 +397,8 @@ mmc4: mmc@480d1000 { ...@@ -360,6 +397,8 @@ mmc4: mmc@480d1000 {
interrupts = <0 96 0x4>; interrupts = <0 96 0x4>;
ti,hwmods = "mmc4"; ti,hwmods = "mmc4";
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 57>, <&sdma 58>;
dma-names = "tx", "rx";
}; };
mmc5: mmc@480d5000 { mmc5: mmc@480d5000 {
...@@ -368,6 +407,8 @@ mmc5: mmc@480d5000 { ...@@ -368,6 +407,8 @@ mmc5: mmc@480d5000 {
interrupts = <0 59 0x4>; interrupts = <0 59 0x4>;
ti,hwmods = "mmc5"; ti,hwmods = "mmc5";
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&sdma 59>, <&sdma 60>;
dma-names = "tx", "rx";
}; };
keypad: keypad@4ae1c000 { keypad: keypad@4ae1c000 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7