aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/shmobile_defconfig
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2022-08-22 11:51:49 +0200
committerGeert Uytterhoeven <geert+renesas@glider.be>2022-08-29 09:08:36 +0200
commit8b99550ba41fc141a7a839a6100415a70cc123cb (patch)
tree53d8f1c5b18878f213eacea1a166738141c4e86c /arch/arm/configs/shmobile_defconfig
parentLinux 6.0-rc1 (diff)
downloadlinux-dev-8b99550ba41fc141a7a839a6100415a70cc123cb.tar.xz
linux-dev-8b99550ba41fc141a7a839a6100415a70cc123cb.zip
ARM: shmobile: defconfig: Refresh for v6.0-rc1
Refresh the defconfig for Renesas ARM systems: - Enable RZ/N1 A5PSW Ethernet switch support incl. dependencies (RZN1D-DB), - Move CONFIG_CAN_RCAR=y (moved in commit d7786af59860a113 ("net: Kconfig: move the CAN device menu to the "Device Drivers" section")), - Enable RZ/N1 Gigabit Ethernet MAC support (RZN1D-DB), - Enable RZ/N1 Pin control support (RZN1D-DB), - Enable RZ/N1 DMA support incl. dependencies (RZN1D-DB). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/428755447c1abbc8f1f08a63e83353d23ab22dd6.1661154821.git.geert+renesas@glider.be
Diffstat (limited to 'arch/arm/configs/shmobile_defconfig')
-rw-r--r--arch/arm/configs/shmobile_defconfig8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index a29bebb3742e..ebdac79c10f5 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -32,8 +32,8 @@ CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
+CONFIG_NET_DSA=y
CONFIG_CAN=y
-CONFIG_CAN_RCAR=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_RCAR_GEN2=y
@@ -52,11 +52,14 @@ CONFIG_BLK_DEV_SD=y
CONFIG_ATA=y
CONFIG_SATA_RCAR=y
CONFIG_NETDEVICES=y
+CONFIG_NET_DSA_RZN1_A5PSW=y
CONFIG_SH_ETH=y
CONFIG_RAVB=y
CONFIG_SMSC911X=y
+CONFIG_STMMAC_ETH=y
CONFIG_MICREL_PHY=y
CONFIG_SMSC_PHY=y
+CONFIG_CAN_RCAR=y
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
@@ -91,6 +94,7 @@ CONFIG_SPI_SH_MSIOF=y
CONFIG_SPI_SH_HSPI=y
CONFIG_PINCTRL_RZA1=y
CONFIG_PINCTRL_RZA2=y
+CONFIG_PINCTRL_RZN1=y
CONFIG_GPIO_EM=y
CONFIG_GPIO_RCAR=y
CONFIG_GPIO_PCA953X=y
@@ -180,6 +184,8 @@ CONFIG_RTC_DRV_DA9063=y
CONFIG_RTC_DRV_SH=y
CONFIG_RTC_DRV_RZN1=y
CONFIG_DMADEVICES=y
+CONFIG_DW_DMAC=y
+CONFIG_RZN1_DMAMUX=y
CONFIG_RCAR_DMAC=y
CONFIG_RENESAS_USB_DMAC=y
CONFIG_STAGING=y