Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit f2745d3

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v6.11-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig
Renesas ARM defconfig updates for v6.11 - Enable support for Renesas R-Car Gen4 PCIe controllers and Marvell 88Q2XXX 100/1000BASE-T1 Automotive Ethernet PHYs in the ARM64 defconfig. * tag 'renesas-arm-defconfig-for-v6.11-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: arm64: defconfig: Enable Marvell 88Q2XXX PHY support arm64: defconfig: Enable Renesas R-Car Gen4 PCIe controller Link: https://lore.kernel.org/r/cover.1718355311.git.geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f266106 + 4b45a97 commit f2745d3

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ CONFIG_PCIE_HISI_STB=y
233233
CONFIG_PCIE_ARMADA_8K=y
234234
CONFIG_PCIE_TEGRA194_HOST=m
235235
CONFIG_PCIE_QCOM=y
236+
CONFIG_PCIE_RCAR_GEN4_HOST=m
237+
CONFIG_PCIE_RCAR_GEN4_EP=m
236238
CONFIG_PCIE_ROCKCHIP_DW_HOST=y
237239
CONFIG_PCIE_VISCONTI_HOST=y
238240
CONFIG_PCIE_LAYERSCAPE_GEN4=y
@@ -375,6 +377,7 @@ CONFIG_AQUANTIA_PHY=y
375377
CONFIG_BCM54140_PHY=m
376378
CONFIG_MARVELL_PHY=m
377379
CONFIG_MARVELL_10G_PHY=y
380+
CONFIG_MARVELL_88Q2XXX_PHY=y
378381
CONFIG_MICREL_PHY=y
379382
CONFIG_MICROSEMI_PHY=y
380383
CONFIG_AT803X_PHY=y
@@ -1215,6 +1218,7 @@ CONFIG_QCOM_BAM_DMA=y
12151218
CONFIG_QCOM_GPI_DMA=m
12161219
CONFIG_QCOM_HIDMA_MGMT=y
12171220
CONFIG_QCOM_HIDMA=y
1221+
CONFIG_DW_EDMA=m
12181222
CONFIG_RCAR_DMAC=y
12191223
CONFIG_RENESAS_USB_DMAC=m
12201224
CONFIG_RZ_DMAC=y

0 commit comments

Comments
 (0)