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

Configure Feed

Select the types of activity you want to include in your feed.

ARM: dts: at91: sam9x60: fix the SOC detection

Remove the dbgu compatible strings in the UART submodule of the
flexcom for the proper SOC detection.

Fixes: 99c808335877 (ARM: dts: at91: sam9x60: Add missing flexcom definitions)
Signed-off-by: Durai Manickam KR <durai.manickamkr@microchip.com>
Link: https://lore.kernel.org/r/20230712100042.317856-1-durai.manickamkr@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Durai Manickam KR and committed by
Arnd Bergmann
f6ad3c13 b44c11d8

+13 -13
+13 -13
arch/arm/boot/dts/microchip/sam9x60.dtsi
··· 172 172 status = "disabled"; 173 173 174 174 uart4: serial@200 { 175 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 175 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 176 176 reg = <0x200 0x200>; 177 177 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>; 178 178 dmas = <&dma0 ··· 240 240 status = "disabled"; 241 241 242 242 uart5: serial@200 { 243 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 243 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 244 244 reg = <0x200 0x200>; 245 245 atmel,usart-mode = <AT91_USART_MODE_SERIAL>; 246 246 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>; ··· 370 370 status = "disabled"; 371 371 372 372 uart11: serial@200 { 373 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 373 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 374 374 reg = <0x200 0x200>; 375 375 interrupts = <32 IRQ_TYPE_LEVEL_HIGH 7>; 376 376 dmas = <&dma0 ··· 419 419 status = "disabled"; 420 420 421 421 uart12: serial@200 { 422 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 422 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 423 423 reg = <0x200 0x200>; 424 424 interrupts = <33 IRQ_TYPE_LEVEL_HIGH 7>; 425 425 dmas = <&dma0 ··· 576 576 status = "disabled"; 577 577 578 578 uart6: serial@200 { 579 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 579 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 580 580 reg = <0x200 0x200>; 581 581 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>; 582 582 dmas = <&dma0 ··· 625 625 status = "disabled"; 626 626 627 627 uart7: serial@200 { 628 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 628 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 629 629 reg = <0x200 0x200>; 630 630 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 7>; 631 631 dmas = <&dma0 ··· 674 674 status = "disabled"; 675 675 676 676 uart8: serial@200 { 677 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 677 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 678 678 reg = <0x200 0x200>; 679 679 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 7>; 680 680 dmas = <&dma0 ··· 723 723 status = "disabled"; 724 724 725 725 uart0: serial@200 { 726 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 726 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 727 727 reg = <0x200 0x200>; 728 728 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>; 729 729 dmas = <&dma0 ··· 791 791 status = "disabled"; 792 792 793 793 uart1: serial@200 { 794 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 794 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 795 795 reg = <0x200 0x200>; 796 796 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 7>; 797 797 dmas = <&dma0 ··· 859 859 status = "disabled"; 860 860 861 861 uart2: serial@200 { 862 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 862 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 863 863 reg = <0x200 0x200>; 864 864 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 7>; 865 865 dmas = <&dma0 ··· 927 927 status = "disabled"; 928 928 929 929 uart3: serial@200 { 930 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 930 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 931 931 reg = <0x200 0x200>; 932 932 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 7>; 933 933 dmas = <&dma0 ··· 1050 1050 status = "disabled"; 1051 1051 1052 1052 uart9: serial@200 { 1053 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 1053 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 1054 1054 reg = <0x200 0x200>; 1055 1055 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 7>; 1056 1056 dmas = <&dma0 ··· 1099 1099 status = "disabled"; 1100 1100 1101 1101 uart10: serial@200 { 1102 - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; 1102 + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart"; 1103 1103 reg = <0x200 0x200>; 1104 1104 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 7>; 1105 1105 dmas = <&dma0