Commit 853ca4bb authored by Arnd Bergmann's avatar Arnd Bergmann

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

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.beSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 853ff6c3 eb970f3e
...@@ -32,6 +32,7 @@ CONFIG_UNIX=y ...@@ -32,6 +32,7 @@ CONFIG_UNIX=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
CONFIG_NET_DSA=y
CONFIG_CAN=y CONFIG_CAN=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_MSI=y CONFIG_PCI_MSI=y
...@@ -51,9 +52,11 @@ CONFIG_BLK_DEV_SD=y ...@@ -51,9 +52,11 @@ CONFIG_BLK_DEV_SD=y
CONFIG_ATA=y CONFIG_ATA=y
CONFIG_SATA_RCAR=y CONFIG_SATA_RCAR=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_NET_DSA_RZN1_A5PSW=y
CONFIG_SH_ETH=y CONFIG_SH_ETH=y
CONFIG_RAVB=y CONFIG_RAVB=y
CONFIG_SMSC911X=y CONFIG_SMSC911X=y
CONFIG_STMMAC_ETH=y
CONFIG_MICREL_PHY=y CONFIG_MICREL_PHY=y
CONFIG_SMSC_PHY=y CONFIG_SMSC_PHY=y
CONFIG_CAN_RCAR=y CONFIG_CAN_RCAR=y
...@@ -91,6 +94,7 @@ CONFIG_SPI_SH_MSIOF=y ...@@ -91,6 +94,7 @@ CONFIG_SPI_SH_MSIOF=y
CONFIG_SPI_SH_HSPI=y CONFIG_SPI_SH_HSPI=y
CONFIG_PINCTRL_RZA1=y CONFIG_PINCTRL_RZA1=y
CONFIG_PINCTRL_RZA2=y CONFIG_PINCTRL_RZA2=y
CONFIG_PINCTRL_RZN1=y
CONFIG_GPIO_EM=y CONFIG_GPIO_EM=y
CONFIG_GPIO_RCAR=y CONFIG_GPIO_RCAR=y
CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X=y
...@@ -180,6 +184,8 @@ CONFIG_RTC_DRV_DA9063=y ...@@ -180,6 +184,8 @@ CONFIG_RTC_DRV_DA9063=y
CONFIG_RTC_DRV_SH=y CONFIG_RTC_DRV_SH=y
CONFIG_RTC_DRV_RZN1=y CONFIG_RTC_DRV_RZN1=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_DW_DMAC=y
CONFIG_RZN1_DMAMUX=y
CONFIG_RCAR_DMAC=y CONFIG_RCAR_DMAC=y
CONFIG_RENESAS_USB_DMAC=y CONFIG_RENESAS_USB_DMAC=y
CONFIG_STAGING=y CONFIG_STAGING=y
......
...@@ -473,6 +473,7 @@ CONFIG_I2C_QCOM_GENI=m ...@@ -473,6 +473,7 @@ CONFIG_I2C_QCOM_GENI=m
CONFIG_I2C_QUP=y CONFIG_I2C_QUP=y
CONFIG_I2C_RIIC=y CONFIG_I2C_RIIC=y
CONFIG_I2C_RK3X=y CONFIG_I2C_RK3X=y
CONFIG_I2C_RZV2M=m
CONFIG_I2C_S3C2410=y CONFIG_I2C_S3C2410=y
CONFIG_I2C_SH_MOBILE=y CONFIG_I2C_SH_MOBILE=y
CONFIG_I2C_TEGRA=y CONFIG_I2C_TEGRA=y
...@@ -938,6 +939,7 @@ CONFIG_SCSI_UFSHCD=y ...@@ -938,6 +939,7 @@ CONFIG_SCSI_UFSHCD=y
CONFIG_SCSI_UFSHCD_PLATFORM=y CONFIG_SCSI_UFSHCD_PLATFORM=y
CONFIG_SCSI_UFS_QCOM=m CONFIG_SCSI_UFS_QCOM=m
CONFIG_SCSI_UFS_HISI=y CONFIG_SCSI_UFS_HISI=y
CONFIG_SCSI_UFS_RENESAS=m
CONFIG_SCSI_UFS_EXYNOS=y CONFIG_SCSI_UFS_EXYNOS=y
CONFIG_NEW_LEDS=y CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment