diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 18:08:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 18:08:35 +0100 |
| commit | 3bd1c133f7715ba810c3de9cee33db1cefb3b268 (patch) | |
| tree | dc88437ce4f8f698198c43bb6b5c133fe8dcf253 /arch | |
| parent | 67abd34b9a36ae10f6fccfd9b7acd0da3099d3fe (diff) | |
| parent | be8b6fbc1274ead39cfa8cfddb7e866ec167074f (diff) | |
| download | linux-next-history-3bd1c133f7715ba810c3de9cee33db1cefb3b268.tar.gz | |
Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/microchip/sama7d65.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/configs/sama7_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/microchip/lan9691.dtsi | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/microchip/sama7d65.dtsi b/arch/arm/boot/dts/microchip/sama7d65.dtsi index 67253bbc08df5..ec200848c153f 100644 --- a/arch/arm/boot/dts/microchip/sama7d65.dtsi +++ b/arch/arm/boot/dts/microchip/sama7d65.dtsi @@ -1055,5 +1055,13 @@ #address-cells = <0>; interrupt-controller; }; + + i3c: i3c@e9000000 { + compatible = "microchip,sama7d65-i3c-hci"; + reg = <0xe9000000 0x300>; + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 105>, <&pmc PMC_TYPE_GCK 105>; + status = "disabled"; + }; }; }; diff --git a/arch/arm/configs/sama7_defconfig b/arch/arm/configs/sama7_defconfig index 47abc56c40f59..cc7f6daf9fc7a 100644 --- a/arch/arm/configs/sama7_defconfig +++ b/arch/arm/configs/sama7_defconfig @@ -117,6 +117,8 @@ CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_AT91=y +CONFIG_I3C=y +CONFIG_MIPI_I3C_HCI=y CONFIG_SPI=y CONFIG_SPI_ATMEL=y CONFIG_SPI_ATMEL_QUADSPI=y diff --git a/arch/arm64/boot/dts/microchip/lan9691.dtsi b/arch/arm64/boot/dts/microchip/lan9691.dtsi index 235e56bebbdbb..ed997d87dd09f 100644 --- a/arch/arm64/boot/dts/microchip/lan9691.dtsi +++ b/arch/arm64/boot/dts/microchip/lan9691.dtsi @@ -100,6 +100,11 @@ status = "disabled"; }; + otp: otp@e0021000 { + compatible = "microchip,lan9691-otpc"; + reg = <0xe0021000 0x1000>; + }; + flx0: flexcom@e0040000 { compatible = "microchip,lan9691-flexcom", "atmel,sama5d2-flexcom"; reg = <0xe0040000 0x100>; |