Skip to content

Commit 1156ebe

Browse files
committed
Merge tag 'ti-k3-config-for-v6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/defconfig
TI K3 defconfig updates for v6.15 - Enable Support for SPI NAND flashes on AM62Ax/J721s2 and other boards - HSR protocol support for AM65/AM64 ICSSG based multi-port ethernet - Greybus modules to support CC1352P7 chips on BeaglePlay * tag 'ti-k3-config-for-v6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: arm64: defconfig: Enable SPI NAND flashes arm64: defconfig: Enable HSR protocol driver arm64: defconfig: Enable gb_beagleplay arm64: defconfig: Enable TISCI Interrupt Router and Aggregator Link: https://lore.kernel.org/r/dec6ccc4-76df-47c3-8622-2c08035eff3e@ti.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 49d248f + 75a41c2 commit 1156ebe

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

arch/arm64/configs/defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ CONFIG_NET_CLS_FLOWER=m
177177
CONFIG_NET_CLS_ACT=y
178178
CONFIG_NET_ACT_GACT=m
179179
CONFIG_NET_ACT_MIRRED=m
180+
CONFIG_HSR=m
180181
CONFIG_NET_ACT_GATE=m
181182
CONFIG_QRTR_SMD=m
182183
CONFIG_QRTR_TUN=m
@@ -284,6 +285,7 @@ CONFIG_MTD_NAND_BRCMNAND=m
284285
CONFIG_MTD_NAND_FSL_IFC=y
285286
CONFIG_MTD_NAND_QCOM=y
286287
CONFIG_MTD_SPI_NOR=y
288+
CONFIG_MTD_SPI_NAND=m
287289
CONFIG_MTD_UBI=m
288290
CONFIG_MTD_HYPERBUS=m
289291
CONFIG_HBMC_AM654=m
@@ -1273,6 +1275,8 @@ CONFIG_VIRTIO_BALLOON=y
12731275
CONFIG_VIRTIO_MMIO=y
12741276
CONFIG_XEN_GNTDEV=y
12751277
CONFIG_XEN_GRANT_DEV_ALLOC=y
1278+
CONFIG_GREYBUS=m
1279+
CONFIG_GREYBUS_BEAGLEPLAY=m
12761280
CONFIG_STAGING=y
12771281
CONFIG_STAGING_MEDIA=y
12781282
CONFIG_VIDEO_MAX96712=m
@@ -1554,6 +1558,8 @@ CONFIG_PWM_VISCONTI=m
15541558
CONFIG_SL28CPLD_INTC=y
15551559
CONFIG_QCOM_PDC=y
15561560
CONFIG_QCOM_MPM=y
1561+
CONFIG_TI_SCI_INTR_IRQCHIP=y
1562+
CONFIG_TI_SCI_INTA_IRQCHIP=y
15571563
CONFIG_RESET_GPIO=m
15581564
CONFIG_RESET_IMX7=y
15591565
CONFIG_RESET_QCOM_AOSS=y

0 commit comments

Comments
 (0)