Skip to content

Commit c741fc9

Browse files
committed
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: Arnd Bergmann <arnd@arndb.de>
2 parents 6d925df + 898a231 commit c741fc9

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ CONFIG_RZ_DMAC=y
202202
CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=1
203203
# CONFIG_IOMMU_SUPPORT is not set
204204
CONFIG_IIO=y
205+
CONFIG_RZN1_ADC=y
205206
CONFIG_AK8975=y
206207
CONFIG_PWM=y
207208
CONFIG_PWM_RENESAS_RCAR=y
@@ -218,7 +219,6 @@ CONFIG_NFS_V3_ACL=y
218219
CONFIG_NFS_V4=y
219220
CONFIG_NFS_V4_1=y
220221
CONFIG_ROOT_NFS=y
221-
# CONFIG_RPCSEC_GSS_KRB5 is not set
222222
CONFIG_NLS_CODEPAGE_437=y
223223
CONFIG_NLS_ISO8859_1=y
224224
CONFIG_DMA_CMA=y

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ CONFIG_PCIE_MEDIATEK_GEN3=m
231231
CONFIG_PCI_TEGRA=y
232232
CONFIG_PCIE_RCAR_HOST=y
233233
CONFIG_PCIE_RCAR_EP=y
234+
CONFIG_PCIE_RENESAS_RZG3S_HOST=y
234235
CONFIG_PCIE_ROCKCHIP_HOST=m
235236
CONFIG_PCI_XGENE=y
236237
CONFIG_PCI_IMX6_HOST=y
@@ -1694,6 +1695,7 @@ CONFIG_PHY_R8A779F0_ETHERNET_SERDES=y
16941695
CONFIG_PHY_RCAR_GEN3_PCIE=y
16951696
CONFIG_PHY_RCAR_GEN3_USB2=y
16961697
CONFIG_PHY_RCAR_GEN3_USB3=m
1698+
CONFIG_PHY_RZ_G3E_USB3=m
16971699
CONFIG_PHY_ROCKCHIP_EMMC=y
16981700
CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
16991701
CONFIG_PHY_ROCKCHIP_INNO_USB2=y

0 commit comments

Comments
 (0)