Skip to content

Commit f0cda04

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig
Renesas ARM defconfig updates for v6.4 - Enable support for the Dialog Semiconductor DA7213 Codec, and the Renesas RZ/V2M xHCI and USB3.1 DRD controllers in the arm64 defconfig, - Disable support for the obsolete R-Car H3 ES1.* (R8A77950) SoC in the arm64 defconfig, - Refresh shmobile_defconfig for v6.3-rc1, - Enable additional support for RZ/N1 platforms in multi_v7_defconfig. * tag 'renesas-arm-defconfig-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: arm64: defconfig: Enable RZ/V2M xHCI and USB3.1 DRD controller support ARM: multi_v7_defconfig: Enable additional support for RZ/N1 platforms ARM: shmobile: defconfig: Refresh for v6.3-rc1 arm64: defconfig: Disable R-Car H3 ES1.* arm64: defconfig: Enable DA7213 Codec Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 3dffd47 + 93582bd commit f0cda04

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ CONFIG_B53_SPI_DRIVER=m
251251
CONFIG_B53_MDIO_DRIVER=m
252252
CONFIG_B53_MMAP_DRIVER=m
253253
CONFIG_NET_DSA_BCM_SF2=m
254+
CONFIG_NET_DSA_RZN1_A5PSW=m
254255
CONFIG_SUN4I_EMAC=y
255256
CONFIG_SPI_AX88796C=m
256257
CONFIG_BCMGENET=m
@@ -474,6 +475,7 @@ CONFIG_PINCTRL_MSM8916=y
474475
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
475476
CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
476477
CONFIG_PINCTRL_RZA2=y
478+
CONFIG_PINCTRL_RZN1=y
477479
CONFIG_GPIO_ASPEED_SGPIO=y
478480
CONFIG_GPIO_DAVINCI=y
479481
CONFIG_GPIO_DWAPB=y
@@ -563,6 +565,7 @@ CONFIG_MESON_WATCHDOG=y
563565
CONFIG_DIGICOLOR_WATCHDOG=y
564566
CONFIG_RENESAS_WDT=m
565567
CONFIG_RENESAS_RZAWDT=m
568+
CONFIG_RENESAS_RZN1WDT=m
566569
CONFIG_STPMIC1_WATCHDOG=y
567570
CONFIG_PM8916_WATCHDOG=m
568571
CONFIG_BCM47XX_WDT=y
@@ -873,6 +876,7 @@ CONFIG_USB_ISP1301=y
873876
CONFIG_USB_MXS_PHY=y
874877
CONFIG_USB_GADGET=y
875878
CONFIG_USB_RENESAS_USBHS_UDC=m
879+
CONFIG_USB_RENESAS_USBF=m
876880
CONFIG_USB_ASPEED_VHUB=m
877881
CONFIG_USB_CONFIGFS=m
878882
CONFIG_USB_CONFIGFS_SERIAL=y
@@ -989,6 +993,7 @@ CONFIG_RTC_DRV_SH=m
989993
CONFIG_RTC_DRV_PL031=y
990994
CONFIG_RTC_DRV_AT91RM9200=m
991995
CONFIG_RTC_DRV_AT91SAM9=m
996+
CONFIG_RTC_DRV_RZN1=m
992997
CONFIG_RTC_DRV_VT8500=y
993998
CONFIG_RTC_DRV_SUNXI=y
994999
CONFIG_RTC_DRV_MV=y
@@ -1020,6 +1025,7 @@ CONFIG_UNIPHIER_MDMAC=y
10201025
CONFIG_XILINX_DMA=y
10211026
CONFIG_QCOM_BAM_DMA=y
10221027
CONFIG_DW_DMAC=y
1028+
CONFIG_RZN1_DMAMUX=m
10231029
CONFIG_RCAR_DMAC=y
10241030
CONFIG_RENESAS_USB_DMAC=m
10251031
CONFIG_VIRTIO_PCI=y

arch/arm/configs/shmobile_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ CONFIG_SERIAL_8250=y
7676
# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
7777
CONFIG_SERIAL_8250_CONSOLE=y
7878
# CONFIG_SERIAL_8250_PCI is not set
79+
# CONFIG_SERIAL_8250_PCI1XXXX is not set
7980
CONFIG_SERIAL_8250_DW=y
8081
CONFIG_SERIAL_8250_EM=y
8182
# CONFIG_SERIAL_8250_PERICOM is not set
@@ -168,6 +169,7 @@ CONFIG_USB_R8A66597_HCD=y
168169
CONFIG_USB_RENESAS_USBHS=y
169170
CONFIG_USB_GADGET=y
170171
CONFIG_USB_RENESAS_USBHS_UDC=y
172+
CONFIG_USB_RENESAS_USBF=y
171173
CONFIG_USB_ETH=y
172174
CONFIG_MMC=y
173175
CONFIG_MMC_SDHI=y

arch/arm64/configs/defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,7 @@ CONFIG_SND_SOC_TEGRA210_ADX=m
874874
CONFIG_SND_SOC_TEGRA210_MIXER=m
875875
CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD=m
876876
CONFIG_SND_SOC_AK4613=m
877+
CONFIG_SND_SOC_DA7213=m
877878
CONFIG_SND_SOC_ES7134=m
878879
CONFIG_SND_SOC_ES7241=m
879880
CONFIG_SND_SOC_GTM601=m
@@ -910,6 +911,7 @@ CONFIG_USB=y
910911
CONFIG_USB_OTG=y
911912
CONFIG_USB_XHCI_HCD=y
912913
CONFIG_USB_XHCI_PCI_RENESAS=m
914+
CONFIG_USB_XHCI_RZV2M=y
913915
CONFIG_USB_XHCI_TEGRA=y
914916
CONFIG_USB_BRCMSTB=m
915917
CONFIG_USB_EHCI_HCD=y
@@ -945,6 +947,7 @@ CONFIG_USB_ONBOARD_HUB=m
945947
CONFIG_NOP_USB_XCEIV=y
946948
CONFIG_USB_GADGET=y
947949
CONFIG_USB_RENESAS_USBHS_UDC=m
950+
CONFIG_USB_RZV2M_USB3DRD=y
948951
CONFIG_USB_RENESAS_USB3=m
949952
CONFIG_USB_TEGRA_XUDC=m
950953
CONFIG_USB_CONFIGFS=m
@@ -1219,7 +1222,6 @@ CONFIG_QCOM_APR=m
12191222
CONFIG_QCOM_ICC_BWMON=m
12201223
CONFIG_ARCH_R8A77995=y
12211224
CONFIG_ARCH_R8A77990=y
1222-
CONFIG_ARCH_R8A77950=y
12231225
CONFIG_ARCH_R8A77951=y
12241226
CONFIG_ARCH_R8A77965=y
12251227
CONFIG_ARCH_R8A77960=y

0 commit comments

Comments
 (0)