Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: at91: sama5d2: Move flx2 definitions in the SoC dtsi

The Flexcom IP is part of the sama5d2 SoC. Move the flx2 node together
with its function definitions in sama5d2.dtsi. Boards will just fill
the pins and enable the desired functions.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20200514050301.147442-5-tudor.ambarus@microchip.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

authored by

Tudor Ambarus and committed by
Alexandre Belloni
0afa4365 445a9d6e

+18 -12
-12
arch/arm/boot/dts/at91-sama5d2_icp.dts
··· 160 160 status = "okay"; 161 161 162 162 uart7: serial@200 { 163 - compatible = "atmel,at91sam9260-usart"; 164 - reg = <0x200 0x200>; 165 - interrupts = <21 IRQ_TYPE_LEVEL_HIGH 7>; 166 - dmas = <&dma0 167 - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | 168 - AT91_XDMAC_DT_PERID(15))>, 169 - <&dma0 170 - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | 171 - AT91_XDMAC_DT_PERID(16))>; 172 - dma-names = "tx", "rx"; 173 - clocks = <&pmc PMC_TYPE_PERIPHERAL 21>; 174 - clock-names = "usart"; 175 163 pinctrl-0 = <&pinctrl_flx2_default>; 176 164 pinctrl-names = "default"; 177 165 atmel,use-dma-rx;
+18
arch/arm/boot/dts/sama5d2.dtsi
··· 794 794 #size-cells = <1>; 795 795 ranges = <0x0 0xfc010000 0x800>; 796 796 status = "disabled"; 797 + 798 + uart7: serial@200 { 799 + compatible = "atmel,at91sam9260-usart"; 800 + reg = <0x200 0x200>; 801 + interrupts = <21 IRQ_TYPE_LEVEL_HIGH 7>; 802 + clocks = <&pmc PMC_TYPE_PERIPHERAL 21>; 803 + clock-names = "usart"; 804 + dmas = <&dma0 805 + (AT91_XDMAC_DT_MEM_IF(0) | 806 + AT91_XDMAC_DT_PER_IF(1) | 807 + AT91_XDMAC_DT_PERID(15))>, 808 + <&dma0 809 + (AT91_XDMAC_DT_MEM_IF(0) | 810 + AT91_XDMAC_DT_PER_IF(1) | 811 + AT91_XDMAC_DT_PERID(16))>; 812 + dma-names = "tx", "rx"; 813 + status = "disabled"; 814 + }; 797 815 }; 798 816 799 817 flx3: flexcom@fc014000 {