diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-07-08 17:51:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-07-08 17:51:22 +0200 |
| commit | f2745d399ab0f03871674a119945897ff2fddf88 (patch) | |
| tree | 6336990804a9a41b652cbe96bbb5a0693f1a63b3 /arch | |
| parent | f2661062f16b2de5d7b6a5c42a9a5c96326b8454 (diff) | |
| parent | 4b45a978b25da1d4de051ed8e91e669e3701d780 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 57a9abe78ee4..66d779547f0f 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -233,6 +233,8 @@ CONFIG_PCIE_HISI_STB=y CONFIG_PCIE_ARMADA_8K=y CONFIG_PCIE_TEGRA194_HOST=m CONFIG_PCIE_QCOM=y +CONFIG_PCIE_RCAR_GEN4_HOST=m +CONFIG_PCIE_RCAR_GEN4_EP=m CONFIG_PCIE_ROCKCHIP_DW_HOST=y CONFIG_PCIE_VISCONTI_HOST=y CONFIG_PCIE_LAYERSCAPE_GEN4=y @@ -375,6 +377,7 @@ CONFIG_AQUANTIA_PHY=y CONFIG_BCM54140_PHY=m CONFIG_MARVELL_PHY=m CONFIG_MARVELL_10G_PHY=y +CONFIG_MARVELL_88Q2XXX_PHY=y CONFIG_MICREL_PHY=y CONFIG_MICROSEMI_PHY=y CONFIG_AT803X_PHY=y @@ -1215,6 +1218,7 @@ CONFIG_QCOM_BAM_DMA=y CONFIG_QCOM_GPI_DMA=m CONFIG_QCOM_HIDMA_MGMT=y CONFIG_QCOM_HIDMA=y +CONFIG_DW_EDMA=m CONFIG_RCAR_DMAC=y CONFIG_RENESAS_USB_DMAC=m CONFIG_RZ_DMAC=y |