diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-09-02 13:06:16 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-09-02 13:06:16 +0300 |
| commit | 853ca4bb741cbd8c55e0183255fa90ab34f85d15 (patch) | |
| tree | 079a25a30b5c3a6237189c934669d5ba4e71c23a /arch/arm/configs/shmobile_defconfig | |
| parent | 853ff6c3215070c38cfe2b1bedee3ccb21e29b52 (diff) | |
| parent | eb970f3eb909a8da5f7bc1c2f83a1eac4adac838 (diff) | |
| download | linux-853ca4bb741cbd8c55e0183255fa90ab34f85d15.tar.xz | |
Merge tag 'renesas-arm-defconfig-for-v6.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/defconfig
Renesas ARM defconfig updates for v6.1
- Refresh shmobile_defconfig for v6.0-rc1,
- Enable additional support for Renesas platforms in the arm64
defconfig.
* tag 'renesas-arm-defconfig-for-v6.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
arm64: defconfig: Enable additional support for Renesas platforms
ARM: shmobile: defconfig: Refresh for v6.0-rc1
Link: https://lore.kernel.org/r/cover.1662111126.git.geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/shmobile_defconfig')
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 2dd0ae5aa98d..452aef74cc5c 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -32,6 +32,7 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y +CONFIG_NET_DSA=y CONFIG_CAN=y CONFIG_PCI=y CONFIG_PCI_MSI=y @@ -51,9 +52,11 @@ 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 @@ -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 |