Unverified Commit c741fc95 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-defconfig-for-v6.20-tag1' of... 

Merge tag 'renesas-arm-defconfig-for-v6.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig

Renesas ARM defconfig updates for v6.20

  - Enable support for the Renesas RZ/G3E USB3 PHY and RZ/G3S PCIe
    drivers in the ARM64 defconfig,
  - Refresh the ARM SH-Mobile defconfig for v6.19-rc1.

* tag 'renesas-arm-defconfig-for-v6.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel

:
  ARM: shmobile: defconfig: Refresh for v6.19-rc1
  arm64: defconfig: Enable PCIe for the Renesas RZ/G3S SoC
  arm64: defconfig: Enable RZ/G3E USB3 PHY driver

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6d925df9 898a2319

arch/arm/configs/shmobile_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ CONFIG_RZ_DMAC=y 
CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=1

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_IIO=y

CONFIG_RZN1_ADC=y

CONFIG_AK8975=y

CONFIG_PWM=y

CONFIG_PWM_RENESAS_RCAR=y
@@ -218,7 +219,6 @@ CONFIG_NFS_V3_ACL=y 
CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_ROOT_NFS=y

# CONFIG_RPCSEC_GSS_KRB5 is not set

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DMA_CMA=y

arch/arm64/configs/defconfig

+2 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ CONFIG_PCIE_MEDIATEK_GEN3=m 
CONFIG_PCI_TEGRA=y

CONFIG_PCIE_RCAR_HOST=y

CONFIG_PCIE_RCAR_EP=y

CONFIG_PCIE_RENESAS_RZG3S_HOST=y

CONFIG_PCIE_ROCKCHIP_HOST=m

CONFIG_PCI_XGENE=y

CONFIG_PCI_IMX6_HOST=y
@@ -1694,6 +1695,7 @@ CONFIG_PHY_R8A779F0_ETHERNET_SERDES=y 
CONFIG_PHY_RCAR_GEN3_PCIE=y

CONFIG_PHY_RCAR_GEN3_USB2=y

CONFIG_PHY_RCAR_GEN3_USB3=m

CONFIG_PHY_RZ_G3E_USB3=m

CONFIG_PHY_ROCKCHIP_EMMC=y

CONFIG_PHY_ROCKCHIP_INNO_HDMI=m

CONFIG_PHY_ROCKCHIP_INNO_USB2=y