Adds properties declared in the new DT bindings:
- nxp,lpc3220-i2s.yaml
- nxp,lpc3220-dmamux.yaml
for dma router/mux and I2S interface.
Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk@xxxxxxxxxxx>
---
Changes for v4:
- This patch is renamed from
"ARM: dts: lpc32xx: Add missing properties for the i2s interfaces"
to describe dma changes as well
- Added dmas and dma-names properties in to all node which have dma request signals
- Add bus properties to pl08x dma node since they are removed from platform data in phy3250.c
- Put clock-controller@0 and dma-router@7c under the same syscon, simple-mfd device
Changes for v3:
- Split previous commit for separate subsystems
- Add properties to match dt binding
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 53 +++++++++++++++++++++++---
1 file changed, 48 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
index 974410918f35..c58dc127e59f 100644
--- a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
+++ b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
@@ -67,6 +67,8 @@ slc: flash@20020000 {
reg = <0x20020000 0x1000>;
clocks = <&clk LPC32XX_CLK_SLC>;
status = "disabled";
+ dmas = <&dma 1 1>;
+ dma-names = "rx-tx";
};
mlc: flash@200a8000 {
@@ -75,6 +77,8 @@ mlc: flash@200a8000 {
interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_MLC>;
status = "disabled";
+ dmas = <&dma 12 1>;
+ dma-names = "rx-tx";
};
dma: dma@31000000 {
@@ -83,6 +87,13 @@ dma: dma@31000000 {
interrupts = <28 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_DMA>;
clock-names = "apb_pclk";
+ #dma-cells = <2>;
+ dma-channels = <8>;
+ dma-requests = <16>;
+ lli-bus-interface-ahb1;
+ mem-bus-interface-ahb1;
+ memcpy-burst-size = <256>;
+ memcpy-bus-width = <32>;
};
usb {
@@ -182,6 +193,8 @@ ssp0: spi@20084000 {
clock-names = "apb_pclk";
#address-cells = <1>;
#size-cells = <0>;
+ dmas = <&dmamux 14 1 1>, <&dmamux 15 1 1>;
+ dma-names = "rx", "tx";
status = "disabled";
};
@@ -191,6 +204,8 @@ spi1: spi@20088000 {
clocks = <&clk LPC32XX_CLK_SPI1>;
#address-cells = <1>;
#size-cells = <0>;
+ dmas = <&dmamux 11 1 0>;
+ dma-names = "rx-tx";
status = "disabled";
};
@@ -206,6 +221,8 @@ ssp1: spi@2008c000 {
clock-names = "apb_pclk";
#address-cells = <1>;
#size-cells = <0>;
+ dmas = <&dmamux 3 1 1>, <&dmamux 11 1 1>;
+ dma-names = "rx", "tx";
status = "disabled";
};
@@ -215,12 +232,19 @@ spi2: spi@20090000 {
clocks = <&clk LPC32XX_CLK_SPI2>;
#address-cells = <1>;
#size-cells = <0>;
+ dmas = <&dmamux 3 1 0>;
+ dma-names = "rx-tx";
status = "disabled";
};
i2s0: i2s@20094000 {
compatible = "nxp,lpc3220-i2s";
reg = <0x20094000 0x1000>;
+ interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk LPC32XX_CLK_I2S0>;
+ dmas = <&dma 0 1>, <&dma 13 1>;
+ dma-names = "rx", "tx";
+ #sound-dai-cells = <0>;
status = "disabled";
};
@@ -231,12 +255,19 @@ sd: sd@20098000 {
<13 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_SD>;
clock-names = "apb_pclk";
+ dmas = <&dma 4 1>;
+ dma-names = "rx";
status = "disabled";
};
i2s1: i2s@2009c000 {
compatible = "nxp,lpc3220-i2s";
reg = <0x2009c000 0x1000>;
+ interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk LPC32XX_CLK_I2S1>;
+ dmas = <&dma 2 1>, <&dmamux 10 1 1>;
+ dma-names = "rx", "tx";
+ #sound-dai-cells = <0>;
status = "disabled";
};
@@ -312,21 +343,27 @@ fab {
compatible = "simple-bus";
ranges = <0x20000000 0x20000000 0x30000000>;
- /* System Control Block */
- scb {
- compatible = "simple-bus";
- ranges = <0x0 0x40004000 0x00001000>;
+ syscon@40004000 {
+ compatible = "nxp,lpc3220-creg", "syscon", "simple-mfd";
+ reg = <0x40004000 0x114>;
#address-cells = <1>;
#size-cells = <1>;
+ ranges = <0 0x40004000 0x114>;
clk: clock-controller@0 {
compatible = "nxp,lpc3220-clk";
reg = <0x00 0x114>;
#clock-cells = <1>;
-
clocks = <&xtal_32k>, <&xtal>;
clock-names = "xtal_32k", "xtal";
};
+
+ dmamux: dma-router@7c {
+ compatible = "nxp,lpc3220-dmamux";
+ reg = <0x7c 0x8>;
+ #dma-cells = <3>;
+ dma-masters = <&dma>;
+ };
};
mic: interrupt-controller@40008000 {
@@ -362,6 +399,8 @@ uart1: serial@40014000 {
compatible = "nxp,lpc3220-hsuart";
reg = <0x40014000 0x1000>;
interrupts = <26 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&dma 6 1>, <&dma 5 1>;
+ dma-names = "rx", "tx";
status = "disabled";
};
@@ -369,6 +408,8 @@ uart2: serial@40018000 {
compatible = "nxp,lpc3220-hsuart";
reg = <0x40018000 0x1000>;
interrupts = <25 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&dma 8 1>, <&dma 7 1>;
+ dma-names = "rx", "tx";
status = "disabled";
};
@@ -376,6 +417,8 @@ uart7: serial@4001c000 {
compatible = "nxp,lpc3220-hsuart";
reg = <0x4001c000 0x1000>;
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&dmamux 10 1 0>, <&dma 9 1>;
+ dma-names = "rx", "tx";
status = "disabled";
};
--
2.25.1
