Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e60f7911 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Alexandre Belloni
Browse files

ARM: dts: at91: sama5d4: change DMA allocation for secure peripherals 



Some peripherals are "Programmable Secure" but left as "Secure" by default.
If tried to be connected to Non-Secure DMA controller, the possibility to
leak secure data is prevented so using these peripherals with DMA1 is not
possible with this default configuration (MATRIX_SPSELR registers setup by
bootloader).
Move them to DMA0 which is an "Always-Secure" DMA controller.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 1c1d3694

arch/arm/boot/dts/sama5d4.dtsi

+8 −8
Original line number Original line Diff line number Diff line
@@ -854,10 +854,10 @@ 
				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8004000 0x100>;

				reg = <0xf8004000 0x100>;

				interrupts = <27 IRQ_TYPE_LEVEL_HIGH 5>;

				interrupts = <27 IRQ_TYPE_LEVEL_HIGH 5>;

				dmas = <&dma1

				dmas = <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(22))>,

					| AT91_XDMAC_DT_PERID(22))>,

				       <&dma1

				       <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(23))>;

					| AT91_XDMAC_DT_PERID(23))>;

				dma-names = "tx", "rx";

				dma-names = "tx", "rx";
@@ -938,10 +938,10 @@ 
				compatible = "atmel,sama5d4-i2c";

				compatible = "atmel,sama5d4-i2c";

				reg = <0xf8018000 0x4000>;

				reg = <0xf8018000 0x4000>;

				interrupts = <33 IRQ_TYPE_LEVEL_HIGH 6>;

				interrupts = <33 IRQ_TYPE_LEVEL_HIGH 6>;

				dmas = <&dma1

				dmas = <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(4))>,

					| AT91_XDMAC_DT_PERID(4))>,

				       <&dma1

				       <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(5))>;

					| AT91_XDMAC_DT_PERID(5))>;

				dma-names = "tx", "rx";

				dma-names = "tx", "rx";
@@ -1055,10 +1055,10 @@ 
				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

				reg = <0xfc004000 0x100>;

				reg = <0xfc004000 0x100>;

				interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;

				interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;

				dmas = <&dma1

				dmas = <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(24))>,

					| AT91_XDMAC_DT_PERID(24))>,

				       <&dma1

				       <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(25))>;

					| AT91_XDMAC_DT_PERID(25))>;

				dma-names = "tx", "rx";

				dma-names = "tx", "rx";
@@ -1167,10 +1167,10 @@ 
				compatible = "atmel,at91rm9200-spi";

				compatible = "atmel,at91rm9200-spi";

				reg = <0xfc01c000 0x100>;

				reg = <0xfc01c000 0x100>;

				interrupts = <39 IRQ_TYPE_LEVEL_HIGH 3>;

				interrupts = <39 IRQ_TYPE_LEVEL_HIGH 3>;

				dmas = <&dma1

				dmas = <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(14))>,

					| AT91_XDMAC_DT_PERID(14))>,

				       <&dma1

				       <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(15))>;

					| AT91_XDMAC_DT_PERID(15))>;

				dma-names = "tx", "rx";

				dma-names = "tx", "rx";