Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abdfd52a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC defconfig updates from Olof Johansson:
 "We keep this in a separate branch to avoid cross-branch conflicts, but
  most of the material here is fairly boring -- some new drivers turned
  on for hardware since they were merged, and some refreshed files due
  to time having moved a lot of entries around"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (47 commits)
  ARM: configs: multi_v5: Remove duplicate ASPEED options
  arm64: defconfig: Enable CONFIG_KEYBOARD_SNVS_PWRKEY as module
  ARM: imx_v6_v7_defconfig: Enable CONFIG_ARM_IMX_CPUFREQ_DT
  defconfig: arm64: enable i.MX8 SCU octop driver
  arm64: defconfig: Add i.MX SCU SoC info driver
  arm64: defconfig: Enable CONFIG_QORIQ_THERMAL
  ARM: imx_v6_v7_defconfig: Select CONFIG_NVMEM_SNVS_LPGPR
  arm64: defconfig: ARM_IMX_CPUFREQ_DT=m
  ARM: imx_v6_v7_defconfig: Add TPM PWM support by default
  ARM: imx_v6_v7_defconfig: Enable the OV2680 camera driver
  ARM: imx_v6_v7_defconfig: Enable CONFIG_THERMAL_STATISTICS
  arm64: defconfig: NVMEM_IMX_OCOTP=y for imx8m
  ARM: multi_v7_defconfig: enable STMFX pinctrl support
  arm64 defconfig: enable LVM support
  ARM: configs: multi_v5: Add more ASPEED devices
  arm64: defconfig: Add Tegra194 PCIe driver
  ARM: configs: aspeed: Add new drivers
  ARM: exynos_defconfig: Enable Panfrost and Lima drivers
  ARM: multi_v7_defconfig: Enable Panfrost and Lima drivers
  arm64 defconfig: enable Mellanox cards
  ...
parents af6af87d a151f275

arch/arm/configs/acs5k_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ CONFIG_INET=y 
CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

arch/arm/configs/acs5k_tiny_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ CONFIG_INET=y 
# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

arch/arm/configs/am200epdkit_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ CONFIG_BT_RFCOMM_TTY=y 
CONFIG_BT_BNEP=m

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_H4=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

arch/arm/configs/aspeed_g4_defconfig

+8 −3
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ CONFIG_VLAN_8021Q=y 
CONFIG_NET_NCSI=y

CONFIG_BPF_STREAM_PARSER=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set
@@ -78,8 +77,6 @@ CONFIG_MTD_UBI=y 
CONFIG_MTD_UBI_FASTMAP=y

CONFIG_MTD_UBI_BLOCK=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_ASPEED_LPC_CTRL=y

CONFIG_ASPEED_LPC_SNOOP=y

CONFIG_EEPROM_AT24=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y
@@ -169,6 +166,10 @@ CONFIG_SENSORS_UCD9200=y 
CONFIG_SENSORS_TMP421=y

CONFIG_SENSORS_W83773G=y

CONFIG_WATCHDOG_SYSFS=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_ASPEED=y

CONFIG_DRM=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -207,8 +208,12 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_PCF8523=y

CONFIG_RTC_DRV_RV8803=y

CONFIG_RTC_DRV_ASPEED=y

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_ASPEED_LPC_CTRL=y

CONFIG_ASPEED_LPC_SNOOP=y

CONFIG_ASPEED_P2A_CTRL=y

CONFIG_IIO=y

CONFIG_ASPEED_ADC=y

CONFIG_MAX1363=y

arch/arm/configs/aspeed_g5_defconfig

+12 −3
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ CONFIG_VLAN_8021Q=y 
CONFIG_NET_NCSI=y

CONFIG_BPF_STREAM_PARSER=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set
@@ -78,8 +77,6 @@ CONFIG_MTD_UBI=y 
CONFIG_MTD_UBI_FASTMAP=y

CONFIG_MTD_UBI_BLOCK=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_ASPEED_LPC_CTRL=y

CONFIG_ASPEED_LPC_SNOOP=y

CONFIG_EEPROM_AT24=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y
@@ -169,7 +166,12 @@ CONFIG_SENSORS_UCD9200=y 
CONFIG_SENSORS_TMP421=y

CONFIG_SENSORS_W83773G=y

CONFIG_WATCHDOG_SYSFS=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_ASPEED=y

CONFIG_DRM=y

CONFIG_DRM_ASPEED_GFX=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_DYNAMIC_MINORS=y
@@ -203,16 +205,23 @@ CONFIG_LEDS_TRIGGERS=y 
CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_EDAC=y

CONFIG_EDAC_ASPEED=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_PCF8523=y

CONFIG_RTC_DRV_RV8803=y

CONFIG_RTC_DRV_ASPEED=y

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_ASPEED_LPC_CTRL=y

CONFIG_ASPEED_LPC_SNOOP=y

CONFIG_ASPEED_P2A_CTRL=y

CONFIG_IIO=y

CONFIG_ASPEED_ADC=y

CONFIG_MAX1363=y

CONFIG_BMP280=y

CONFIG_RAS=y

CONFIG_FSI=y

CONFIG_FSI_MASTER_GPIO=y

CONFIG_FSI_MASTER_HUB=y