diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-02-09 14:04:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-02-09 14:04:20 +0100 |
| commit | 306b8201b0bb625853efd6da5c5d7a22a1ecc123 (patch) | |
| tree | 103cfeadcb0c0e434a583c8464ec3f0c2e4566d2 /arch/arm/boot/dts/Makefile | |
| parent | 2508d5efd7a588d07915a762e1731173854525f9 (diff) | |
| parent | 3048a4deee801c549259fe044f71a3fcd55591a8 (diff) | |
Merge tag 'at91-dt-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt
AT91 device tree updates for 6.3 #2
It contains:
- cleanups arround flexcom nodes on SAM9X60 SoC as follows:
- preserve same ID for flexcoms and the embedded nodes (e.g. flx4
will embed uart4, spi4, i2c4 but not e.g. uart1, spi2, i2c3);
- SoC specific bindings were moved from board specific file to SoC
specific file
- DMA bindings for all flexcom nodes were added
- SoC file was filled with missing flexcom nodes
- new SAM9X60 Curiosity board that contains 1 uSDcard interface, 1 SDcard
interface, 1 USB device interface, 2 USB Type-A interfaces, 2 CAN
interfaces, 1 10/100 Ethernet interface, 1 LCD RGB666 interface,
1 Gb DDR2, 4 Gb NAND Flash, 2Kb EEPROM, leds, button, power
regulators, UART and JTAG connectors
* tag 'at91-dt-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: at91: sam9x60_curiosity: Add device tree for sam9x60 curiosity board
dt-bindings: arm: at91: Add info on sam9x60 curiosity
ARM: dts: at91: sam9x60: Add missing flexcom definitions
ARM: dts: at91: sam9x60: Add DMA bindings for the flexcom nodes
ARM: dts: at91: sam9x60: Specify the FIFO size for the Flexcom UART
ARM: dts: at91: sam9x60: fix spi4 node
ARM: dts: at91: sam9x60: move flexcom definitions
ARM: dts: at91: sam9x60: Fix the label numbering for the flexcom functions
Link: https://lore.kernel.org/r/20230209084930.289721-1-claudiu.beznea@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 8a18ac1a3c31..f78c0ae16bc5 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -51,6 +51,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ at91sam9x25ek.dtb \ at91sam9x35ek.dtb dtb-$(CONFIG_SOC_SAM9X60) += \ + at91-sam9x60_curiosity.dtb \ at91-sam9x60ek.dtb dtb-$(CONFIG_SOC_SAM_V7) += \ at91-kizbox2-2.dtb \ |