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

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

The Flexcom IP is part of the sama5d2 SoC. Move the flx3 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-4-tudor.ambarus@microchip.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

authored by

Tudor Ambarus and committed by
Alexandre Belloni 445a9d6e 91fa03c9

+30 -31
-13
arch/arm/boot/dts/at91-kizbox3_common.dtsi
··· 325 325 status = "disabled"; 326 326 327 327 uart8: serial@200 { 328 - compatible = "atmel,at91sam9260-usart"; 329 - reg = <0x200 0x400>; 330 - interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; 331 - dmas = <&dma0 332 - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) 333 - | AT91_XDMAC_DT_PERID(17))>, 334 - <&dma0 335 - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) 336 - | AT91_XDMAC_DT_PERID(18))>; 337 - dma-names = "tx", "rx"; 338 - clocks = <&pmc PMC_TYPE_PERIPHERAL 22>; 339 - clock-names = "usart"; 340 328 pinctrl-names = "default"; 341 329 pinctrl-0 = <&pinctrl_flx3_default>; 342 - atmel,fifo-size = <32>; 343 330 atmel,use-dma-rx; 344 331 atmel,use-dma-tx; 345 332 status = "disabled";
+1 -12
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
··· 179 179 status = "disabled"; 180 180 181 181 uart8: serial@200 { 182 - compatible = "atmel,at91sam9260-usart"; 183 - reg = <0x200 0x200>; 184 - interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; 185 - clocks = <&pmc PMC_TYPE_PERIPHERAL 22>; 186 - clock-names = "usart"; 182 + dmas = <0>, <0>; 187 183 pinctrl-names = "default"; 188 184 pinctrl-0 = <&pinctrl_flx3_default>; 189 - atmel,fifo-size = <32>; 190 185 status = "disabled"; /* Conflict with isc. */ 191 186 }; 192 187 193 188 spi5: spi@400 { 194 - compatible = "atmel,at91rm9200-spi"; 195 - reg = <0x400 0x200>; 196 - interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; 197 - clocks = <&pmc PMC_TYPE_PERIPHERAL 22>; 198 - clock-names = "spi_clk"; 199 189 pinctrl-names = "default"; 200 190 pinctrl-0 = <&pinctrl_flx3_default>; 201 - atmel,fifo-size = <16>; 202 191 status = "disabled"; /* Conflict with isc. */ 203 192 }; 204 193 };
-6
arch/arm/boot/dts/at91-sama5d2_icp.dts
··· 185 185 status = "okay"; 186 186 187 187 spi5: spi@400 { 188 - compatible = "atmel,at91rm9200-spi"; 189 - reg = <0x400 0x200>; 190 - interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; 191 - clocks = <&pmc PMC_TYPE_PERIPHERAL 22>; 192 - clock-names = "spi_clk"; 193 188 pinctrl-names = "default"; 194 189 pinctrl-0 = <&pinctrl_mikrobus1_spi &pinctrl_mikrobus1_spi_cs>; 195 - atmel,fifo-size = <16>; 196 190 status = "okay"; 197 191 }; 198 192 };
+29
arch/arm/boot/dts/sama5d2.dtsi
··· 804 804 #size-cells = <1>; 805 805 ranges = <0x0 0xfc014000 0x800>; 806 806 status = "disabled"; 807 + 808 + uart8: serial@200 { 809 + compatible = "atmel,at91sam9260-usart"; 810 + reg = <0x200 0x200>; 811 + interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; 812 + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>; 813 + clock-names = "usart"; 814 + dmas = <&dma0 815 + (AT91_XDMAC_DT_MEM_IF(0) | 816 + AT91_XDMAC_DT_PER_IF(1) | 817 + AT91_XDMAC_DT_PERID(17))>, 818 + <&dma0 819 + (AT91_XDMAC_DT_MEM_IF(0) | 820 + AT91_XDMAC_DT_PER_IF(1) | 821 + AT91_XDMAC_DT_PERID(18))>; 822 + dma-names = "tx", "rx"; 823 + atmel,fifo-size = <32>; 824 + status = "disabled"; 825 + }; 826 + 827 + spi5: spi@400 { 828 + compatible = "atmel,at91rm9200-spi"; 829 + reg = <0x400 0x200>; 830 + interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; 831 + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>; 832 + clock-names = "spi_clk"; 833 + atmel,fifo-size = <16>; 834 + status = "disabled"; 835 + }; 807 836 }; 808 837 809 838 flx4: flexcom@fc018000 {