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

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

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

authored by

Tudor Ambarus and committed by
Alexandre Belloni
96f63ffd 0afa4365

+29 -19
-7
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
··· 126 126 status = "okay"; 127 127 128 128 i2c3: i2c@600 { 129 - compatible = "atmel,sama5d2-i2c"; 130 - reg = <0x600 0x200>; 131 - interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>; 132 129 dmas = <0>, <0>; 133 130 dma-names = "tx", "rx"; 134 131 i2c-analog-filter; 135 132 i2c-digital-filter; 136 133 i2c-digital-filter-width-ns = <35>; 137 - #address-cells = <1>; 138 - #size-cells = <0>; 139 - clocks = <&pmc PMC_TYPE_PERIPHERAL 20>; 140 134 pinctrl-names = "default"; 141 135 pinctrl-0 = <&pinctrl_mikrobus_i2c>; 142 - atmel,fifo-size = <16>; 143 136 status = "okay"; 144 137 }; 145 138 };
-12
arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
··· 36 36 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>; 37 37 38 38 uart6: serial@200 { 39 - compatible = "atmel,at91sam9260-usart"; 40 - reg = <0x200 0x200>; 41 - interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>; 42 - dmas = <&dma0 43 - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | 44 - AT91_XDMAC_DT_PERID(13))>, 45 - <&dma0 46 - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | 47 - AT91_XDMAC_DT_PERID(14))>; 48 - dma-names = "tx", "rx"; 49 - clocks = <&pmc PMC_TYPE_PERIPHERAL 20>; 50 - clock-names = "usart"; 51 39 pinctrl-0 = <&pinctrl_flx1_default>; 52 40 pinctrl-names = "default"; 53 41 };
+29
arch/arm/boot/dts/sama5d2.dtsi
··· 645 645 #size-cells = <1>; 646 646 ranges = <0x0 0xf8038000 0x800>; 647 647 status = "disabled"; 648 + 649 + uart6: serial@200 { 650 + compatible = "atmel,at91sam9260-usart"; 651 + reg = <0x200 0x200>; 652 + interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>; 653 + clocks = <&pmc PMC_TYPE_PERIPHERAL 20>; 654 + clock-names = "usart"; 655 + dmas = <&dma0 656 + (AT91_XDMAC_DT_MEM_IF(0) | 657 + AT91_XDMAC_DT_PER_IF(1) | 658 + AT91_XDMAC_DT_PERID(13))>, 659 + <&dma0 660 + (AT91_XDMAC_DT_MEM_IF(0) | 661 + AT91_XDMAC_DT_PER_IF(1) | 662 + AT91_XDMAC_DT_PERID(14))>; 663 + dma-names = "tx", "rx"; 664 + status = "disabled"; 665 + }; 666 + 667 + i2c3: i2c@600 { 668 + compatible = "atmel,sama5d2-i2c"; 669 + reg = <0x600 0x200>; 670 + interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>; 671 + #address-cells = <1>; 672 + #size-cells = <0>; 673 + clocks = <&pmc PMC_TYPE_PERIPHERAL 20>; 674 + atmel,fifo-size = <16>; 675 + status = "disabled"; 676 + }; 648 677 }; 649 678 650 679 securam: sram@f8044000 {