diff options
author | Olof Johansson <olof@lixom.net> | 2018-06-11 19:39:23 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-06-11 19:39:23 -0400 |
commit | 958da6e3ff446fe558bdf0fd06fb2713539ebeef (patch) | |
tree | 271eab1abfa5ad47749403b43265ceb2100cb12d | |
parent | 30a04c1e32cad5723cb67926ce2926b85670cd4b (diff) | |
parent | ab4494668cc6b1116fe2151f1d774c5e7831cc38 (diff) |
Merge branch 'next/defconfig' into next/soc
Merging in defconfig updates. It's useful to keep them separate during
development but little point in merging them upstream on their own.
* next/defconfig: (40 commits)
arm64: defconfig: Enable PCIe on msm8996 and db820c
arm64: defconfig: Enable HISILICON_LPC
arm64: defconfig: enable drivers for Poplar support
arm64: defconfig: Enable UFS on msm8996
arm64: defconfig: enable the Armada thermal driver
ARM: multi_v7_defconfig: Enable RENESAS_WDT
ARM: shmobile: defconfig: Enable RENESAS_WDT_GEN
arm64: defconfig: enable R8A77990 SoC
ARM: multi_v7_defconfig: Add STM32F7 I2C & STM32 USBPHYC support
arm64: defconfig: Increase CMA size for VC4
arm64: defconfig: enable rockchip efuse
ARM: imx_v6_v7_defconfig: Select CONFIG_GPIO_MAX732X by default
ARM: imx_v6_v7_defconfig: enable imx6sll by default
arm64: defconfig: Enable CONFIG_SND_AUDIO_GRAPH_CARD
arm64: defconfig: makes SND_SIMPLE_CARD to module
ARM: multi_v7_defconfig: enable the Meson PWM controller
arm: multi_v7_defconfig: enable the Amlogic Meson I2C driver
arm64: defconfig: enable CONFIG_SPI_ARMADA_3700
arm64: defconfig: Enable CONFIG_PINCTRL_MT7622 by default
arm64: defconfig: Enable bluetooth USB support
...
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/exynos_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 9 | ||||
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 12 | ||||
-rw-r--r-- | arch/arm/configs/shmobile_defconfig | 3 | ||||
-rw-r--r-- | arch/arm64/configs/defconfig | 43 |
7 files changed, 70 insertions, 4 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 8682b15336b9..e4d188f0a4b4 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig | |||
@@ -64,6 +64,7 @@ CONFIG_BLK_DEV_SD=y | |||
64 | CONFIG_SCSI_CONSTANTS=y | 64 | CONFIG_SCSI_CONSTANTS=y |
65 | CONFIG_SCSI_SCAN_ASYNC=y | 65 | CONFIG_SCSI_SCAN_ASYNC=y |
66 | CONFIG_NETDEVICES=y | 66 | CONFIG_NETDEVICES=y |
67 | CONFIG_USB_LAN78XX=y | ||
67 | CONFIG_USB_USBNET=y | 68 | CONFIG_USB_USBNET=y |
68 | CONFIG_USB_NET_SMSC95XX=y | 69 | CONFIG_USB_NET_SMSC95XX=y |
69 | CONFIG_BRCMFMAC=m | 70 | CONFIG_BRCMFMAC=m |
@@ -127,6 +128,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=y | |||
127 | CONFIG_DMADEVICES=y | 128 | CONFIG_DMADEVICES=y |
128 | CONFIG_DMA_BCM2835=y | 129 | CONFIG_DMA_BCM2835=y |
129 | CONFIG_STAGING=y | 130 | CONFIG_STAGING=y |
131 | CONFIG_BCM2835_VCHIQ=m | ||
130 | CONFIG_MAILBOX=y | 132 | CONFIG_MAILBOX=y |
131 | CONFIG_BCM2835_MBOX=y | 133 | CONFIG_BCM2835_MBOX=y |
132 | # CONFIG_IOMMU_SUPPORT is not set | 134 | # CONFIG_IOMMU_SUPPORT is not set |
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index c302a04e8cbc..21b2d7791df4 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig | |||
@@ -56,7 +56,7 @@ CONFIG_IP_PNP_DHCP=y | |||
56 | CONFIG_NETFILTER=y | 56 | CONFIG_NETFILTER=y |
57 | CONFIG_DEVTMPFS=y | 57 | CONFIG_DEVTMPFS=y |
58 | CONFIG_DEVTMPFS_MOUNT=y | 58 | CONFIG_DEVTMPFS_MOUNT=y |
59 | # CONFIG_FW_LOADER is not set | 59 | CONFIG_FW_LOADER=m |
60 | CONFIG_DMA_CMA=y | 60 | CONFIG_DMA_CMA=y |
61 | CONFIG_DA8XX_MSTPRI=y | 61 | CONFIG_DA8XX_MSTPRI=y |
62 | CONFIG_MTD=m | 62 | CONFIG_MTD=m |
@@ -212,6 +212,8 @@ CONFIG_RTC_CLASS=y | |||
212 | CONFIG_RTC_DRV_OMAP=m | 212 | CONFIG_RTC_DRV_OMAP=m |
213 | CONFIG_DMADEVICES=y | 213 | CONFIG_DMADEVICES=y |
214 | CONFIG_TI_EDMA=y | 214 | CONFIG_TI_EDMA=y |
215 | CONFIG_REMOTEPROC=m | ||
216 | CONFIG_DA8XX_REMOTEPROC=m | ||
215 | CONFIG_MEMORY=y | 217 | CONFIG_MEMORY=y |
216 | CONFIG_TI_AEMIF=m | 218 | CONFIG_TI_AEMIF=m |
217 | CONFIG_DA8XX_DDRCTL=y | 219 | CONFIG_DA8XX_DDRCTL=y |
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index 629189c62fd1..85b2369d6b20 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig | |||
@@ -208,6 +208,7 @@ CONFIG_DRM_EXYNOS_DSI=y | |||
208 | CONFIG_DRM_EXYNOS_HDMI=y | 208 | CONFIG_DRM_EXYNOS_HDMI=y |
209 | CONFIG_DRM_PANEL_SIMPLE=y | 209 | CONFIG_DRM_PANEL_SIMPLE=y |
210 | CONFIG_DRM_PANEL_SAMSUNG_LD9040=y | 210 | CONFIG_DRM_PANEL_SAMSUNG_LD9040=y |
211 | CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=y | ||
211 | CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y | 212 | CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y |
212 | CONFIG_DRM_NXP_PTN3460=y | 213 | CONFIG_DRM_NXP_PTN3460=y |
213 | CONFIG_DRM_PARADE_PS8622=y | 214 | CONFIG_DRM_PARADE_PS8622=y |
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 3a308437b088..f70507ab91ee 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -38,6 +38,7 @@ CONFIG_SOC_IMX51=y | |||
38 | CONFIG_SOC_IMX53=y | 38 | CONFIG_SOC_IMX53=y |
39 | CONFIG_SOC_IMX6Q=y | 39 | CONFIG_SOC_IMX6Q=y |
40 | CONFIG_SOC_IMX6SL=y | 40 | CONFIG_SOC_IMX6SL=y |
41 | CONFIG_SOC_IMX6SLL=y | ||
41 | CONFIG_SOC_IMX6SX=y | 42 | CONFIG_SOC_IMX6SX=y |
42 | CONFIG_SOC_IMX6UL=y | 43 | CONFIG_SOC_IMX6UL=y |
43 | CONFIG_SOC_IMX7D=y | 44 | CONFIG_SOC_IMX7D=y |
@@ -153,6 +154,9 @@ CONFIG_USB_RTL8152=m | |||
153 | CONFIG_USB_USBNET=y | 154 | CONFIG_USB_USBNET=y |
154 | CONFIG_USB_NET_CDC_EEM=m | 155 | CONFIG_USB_NET_CDC_EEM=m |
155 | CONFIG_BRCMFMAC=m | 156 | CONFIG_BRCMFMAC=m |
157 | CONFIG_MWIFIEX=m | ||
158 | CONFIG_MWIFIEX_SDIO=m | ||
159 | CONFIG_MWIFIEX_PCIE=m | ||
156 | CONFIG_WL12XX=m | 160 | CONFIG_WL12XX=m |
157 | CONFIG_WL18XX=m | 161 | CONFIG_WL18XX=m |
158 | CONFIG_WLCORE_SDIO=m | 162 | CONFIG_WLCORE_SDIO=m |
@@ -199,6 +203,7 @@ CONFIG_SPI_GPIO=y | |||
199 | CONFIG_SPI_IMX=y | 203 | CONFIG_SPI_IMX=y |
200 | CONFIG_SPI_FSL_DSPI=y | 204 | CONFIG_SPI_FSL_DSPI=y |
201 | CONFIG_GPIO_SYSFS=y | 205 | CONFIG_GPIO_SYSFS=y |
206 | CONFIG_GPIO_MAX732X=y | ||
202 | CONFIG_GPIO_MC9S08DZ60=y | 207 | CONFIG_GPIO_MC9S08DZ60=y |
203 | CONFIG_GPIO_PCA953X=y | 208 | CONFIG_GPIO_PCA953X=y |
204 | CONFIG_GPIO_STMPE=y | 209 | CONFIG_GPIO_STMPE=y |
@@ -214,11 +219,13 @@ CONFIG_CPU_THERMAL=y | |||
214 | CONFIG_IMX_THERMAL=y | 219 | CONFIG_IMX_THERMAL=y |
215 | CONFIG_WATCHDOG=y | 220 | CONFIG_WATCHDOG=y |
216 | CONFIG_DA9062_WATCHDOG=y | 221 | CONFIG_DA9062_WATCHDOG=y |
222 | CONFIG_RN5T618_WATCHDOG=y | ||
217 | CONFIG_IMX2_WDT=y | 223 | CONFIG_IMX2_WDT=y |
218 | CONFIG_MFD_DA9052_I2C=y | 224 | CONFIG_MFD_DA9052_I2C=y |
219 | CONFIG_MFD_DA9062=y | 225 | CONFIG_MFD_DA9062=y |
220 | CONFIG_MFD_MC13XXX_SPI=y | 226 | CONFIG_MFD_MC13XXX_SPI=y |
221 | CONFIG_MFD_MC13XXX_I2C=y | 227 | CONFIG_MFD_MC13XXX_I2C=y |
228 | CONFIG_MFD_RN5T618=y | ||
222 | CONFIG_MFD_STMPE=y | 229 | CONFIG_MFD_STMPE=y |
223 | CONFIG_REGULATOR=y | 230 | CONFIG_REGULATOR=y |
224 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 231 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
@@ -229,6 +236,7 @@ CONFIG_REGULATOR_GPIO=y | |||
229 | CONFIG_REGULATOR_MC13783=y | 236 | CONFIG_REGULATOR_MC13783=y |
230 | CONFIG_REGULATOR_MC13892=y | 237 | CONFIG_REGULATOR_MC13892=y |
231 | CONFIG_REGULATOR_PFUZE100=y | 238 | CONFIG_REGULATOR_PFUZE100=y |
239 | CONFIG_REGULATOR_RN5T618=y | ||
232 | CONFIG_RC_CORE=y | 240 | CONFIG_RC_CORE=y |
233 | CONFIG_RC_DEVICES=y | 241 | CONFIG_RC_DEVICES=y |
234 | CONFIG_IR_GPIO_CIR=y | 242 | CONFIG_IR_GPIO_CIR=y |
@@ -374,6 +382,7 @@ CONFIG_PWM=y | |||
374 | CONFIG_PWM_FSL_FTM=y | 382 | CONFIG_PWM_FSL_FTM=y |
375 | CONFIG_PWM_IMX=y | 383 | CONFIG_PWM_IMX=y |
376 | CONFIG_NVMEM_IMX_OCOTP=y | 384 | CONFIG_NVMEM_IMX_OCOTP=y |
385 | CONFIG_NVMEM_VF610_OCOTP=y | ||
377 | CONFIG_TEE=y | 386 | CONFIG_TEE=y |
378 | CONFIG_OPTEE=y | 387 | CONFIG_OPTEE=y |
379 | CONFIG_MUX_MMIO=y | 388 | CONFIG_MUX_MMIO=y |
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index e6b3c96d4c09..7e1c543162c3 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
@@ -90,6 +90,7 @@ CONFIG_ARCH_R8A73A4=y | |||
90 | CONFIG_ARCH_R8A7740=y | 90 | CONFIG_ARCH_R8A7740=y |
91 | CONFIG_ARCH_R8A7743=y | 91 | CONFIG_ARCH_R8A7743=y |
92 | CONFIG_ARCH_R8A7745=y | 92 | CONFIG_ARCH_R8A7745=y |
93 | CONFIG_ARCH_R8A77470=y | ||
93 | CONFIG_ARCH_R8A7778=y | 94 | CONFIG_ARCH_R8A7778=y |
94 | CONFIG_ARCH_R8A7779=y | 95 | CONFIG_ARCH_R8A7779=y |
95 | CONFIG_ARCH_R8A7790=y | 96 | CONFIG_ARCH_R8A7790=y |
@@ -187,6 +188,8 @@ CONFIG_B53_MMAP_DRIVER=m | |||
187 | CONFIG_B53_SRAB_DRIVER=m | 188 | CONFIG_B53_SRAB_DRIVER=m |
188 | CONFIG_CAN_SUN4I=y | 189 | CONFIG_CAN_SUN4I=y |
189 | CONFIG_BT=m | 190 | CONFIG_BT=m |
191 | CONFIG_BT_HCIUART=m | ||
192 | CONFIG_BT_HCIUART_BCM=y | ||
190 | CONFIG_BT_MRVL=m | 193 | CONFIG_BT_MRVL=m |
191 | CONFIG_BT_MRVL_SDIO=m | 194 | CONFIG_BT_MRVL_SDIO=m |
192 | CONFIG_CFG80211=m | 195 | CONFIG_CFG80211=m |
@@ -280,6 +283,7 @@ CONFIG_FIXED_PHY=y | |||
280 | CONFIG_ROCKCHIP_PHY=y | 283 | CONFIG_ROCKCHIP_PHY=y |
281 | CONFIG_USB_PEGASUS=y | 284 | CONFIG_USB_PEGASUS=y |
282 | CONFIG_USB_RTL8152=m | 285 | CONFIG_USB_RTL8152=m |
286 | CONFIG_USB_LAN78XX=m | ||
283 | CONFIG_USB_USBNET=y | 287 | CONFIG_USB_USBNET=y |
284 | CONFIG_USB_NET_SMSC75XX=y | 288 | CONFIG_USB_NET_SMSC75XX=y |
285 | CONFIG_USB_NET_SMSC95XX=y | 289 | CONFIG_USB_NET_SMSC95XX=y |
@@ -360,10 +364,12 @@ CONFIG_SERIAL_ST_ASC=y | |||
360 | CONFIG_SERIAL_ST_ASC_CONSOLE=y | 364 | CONFIG_SERIAL_ST_ASC_CONSOLE=y |
361 | CONFIG_SERIAL_STM32=y | 365 | CONFIG_SERIAL_STM32=y |
362 | CONFIG_SERIAL_STM32_CONSOLE=y | 366 | CONFIG_SERIAL_STM32_CONSOLE=y |
367 | CONFIG_SERIAL_DEV_BUS=y | ||
363 | CONFIG_HVC_DRIVER=y | 368 | CONFIG_HVC_DRIVER=y |
364 | CONFIG_VIRTIO_CONSOLE=y | 369 | CONFIG_VIRTIO_CONSOLE=y |
365 | CONFIG_I2C_CHARDEV=y | 370 | CONFIG_I2C_CHARDEV=y |
366 | CONFIG_I2C_DAVINCI=y | 371 | CONFIG_I2C_DAVINCI=y |
372 | CONFIG_I2C_MESON=y | ||
367 | CONFIG_I2C_MUX=y | 373 | CONFIG_I2C_MUX=y |
368 | CONFIG_I2C_ARB_GPIO_CHALLENGE=m | 374 | CONFIG_I2C_ARB_GPIO_CHALLENGE=m |
369 | CONFIG_I2C_MUX_PCA954x=y | 375 | CONFIG_I2C_MUX_PCA954x=y |
@@ -385,6 +391,7 @@ CONFIG_I2C_S3C2410=y | |||
385 | CONFIG_I2C_SH_MOBILE=y | 391 | CONFIG_I2C_SH_MOBILE=y |
386 | CONFIG_I2C_SIRF=y | 392 | CONFIG_I2C_SIRF=y |
387 | CONFIG_I2C_ST=y | 393 | CONFIG_I2C_ST=y |
394 | CONFIG_I2C_STM32F7=y | ||
388 | CONFIG_I2C_SUN6I_P2WI=y | 395 | CONFIG_I2C_SUN6I_P2WI=y |
389 | CONFIG_I2C_TEGRA=y | 396 | CONFIG_I2C_TEGRA=y |
390 | CONFIG_I2C_UNIPHIER=y | 397 | CONFIG_I2C_UNIPHIER=y |
@@ -497,6 +504,7 @@ CONFIG_TEGRA_WATCHDOG=m | |||
497 | CONFIG_MESON_WATCHDOG=y | 504 | CONFIG_MESON_WATCHDOG=y |
498 | CONFIG_DW_WATCHDOG=y | 505 | CONFIG_DW_WATCHDOG=y |
499 | CONFIG_DIGICOLOR_WATCHDOG=y | 506 | CONFIG_DIGICOLOR_WATCHDOG=y |
507 | CONFIG_RENESAS_WDT=m | ||
500 | CONFIG_BCM2835_WDT=y | 508 | CONFIG_BCM2835_WDT=y |
501 | CONFIG_BCM47XX_WDT=y | 509 | CONFIG_BCM47XX_WDT=y |
502 | CONFIG_BCM7038_WDT=m | 510 | CONFIG_BCM7038_WDT=m |
@@ -638,6 +646,7 @@ CONFIG_DRM_SUN4I=m | |||
638 | CONFIG_DRM_FSL_DCU=m | 646 | CONFIG_DRM_FSL_DCU=m |
639 | CONFIG_DRM_TEGRA=y | 647 | CONFIG_DRM_TEGRA=y |
640 | CONFIG_DRM_PANEL_SAMSUNG_LD9040=m | 648 | CONFIG_DRM_PANEL_SAMSUNG_LD9040=m |
649 | CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m | ||
641 | CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m | 650 | CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m |
642 | CONFIG_DRM_PANEL_SIMPLE=y | 651 | CONFIG_DRM_PANEL_SIMPLE=y |
643 | CONFIG_DRM_SII9234=m | 652 | CONFIG_DRM_SII9234=m |
@@ -650,7 +659,6 @@ CONFIG_FB_EFI=y | |||
650 | CONFIG_FB_WM8505=y | 659 | CONFIG_FB_WM8505=y |
651 | CONFIG_FB_SH_MOBILE_LCDC=y | 660 | CONFIG_FB_SH_MOBILE_LCDC=y |
652 | CONFIG_FB_SIMPLE=y | 661 | CONFIG_FB_SIMPLE=y |
653 | CONFIG_FB_SH_MOBILE_MERAM=y | ||
654 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 662 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
655 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 663 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
656 | CONFIG_LCD_PLATFORM=m | 664 | CONFIG_LCD_PLATFORM=m |
@@ -947,6 +955,7 @@ CONFIG_PWM_ATMEL=m | |||
947 | CONFIG_PWM_ATMEL_HLCDC_PWM=m | 955 | CONFIG_PWM_ATMEL_HLCDC_PWM=m |
948 | CONFIG_PWM_ATMEL_TCB=m | 956 | CONFIG_PWM_ATMEL_TCB=m |
949 | CONFIG_PWM_FSL_FTM=m | 957 | CONFIG_PWM_FSL_FTM=m |
958 | CONFIG_PWM_MESON=m | ||
950 | CONFIG_PWM_RCAR=m | 959 | CONFIG_PWM_RCAR=m |
951 | CONFIG_PWM_RENESAS_TPU=y | 960 | CONFIG_PWM_RENESAS_TPU=y |
952 | CONFIG_PWM_ROCKCHIP=m | 961 | CONFIG_PWM_ROCKCHIP=m |
@@ -972,6 +981,7 @@ CONFIG_PHY_QCOM_APQ8064_SATA=m | |||
972 | CONFIG_PHY_MIPHY28LP=y | 981 | CONFIG_PHY_MIPHY28LP=y |
973 | CONFIG_PHY_RCAR_GEN2=m | 982 | CONFIG_PHY_RCAR_GEN2=m |
974 | CONFIG_PHY_STIH407_USB=y | 983 | CONFIG_PHY_STIH407_USB=y |
984 | CONFIG_PHY_STM32_USBPHYC=y | ||
975 | CONFIG_PHY_SUN4I_USB=y | 985 | CONFIG_PHY_SUN4I_USB=y |
976 | CONFIG_PHY_SUN9I_USB=y | 986 | CONFIG_PHY_SUN9I_USB=y |
977 | CONFIG_PHY_SAMSUNG_USB2=m | 987 | CONFIG_PHY_SAMSUNG_USB2=m |
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index a701601fbd76..b49887e86a3d 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig | |||
@@ -14,6 +14,7 @@ CONFIG_ARCH_R8A73A4=y | |||
14 | CONFIG_ARCH_R8A7740=y | 14 | CONFIG_ARCH_R8A7740=y |
15 | CONFIG_ARCH_R8A7743=y | 15 | CONFIG_ARCH_R8A7743=y |
16 | CONFIG_ARCH_R8A7745=y | 16 | CONFIG_ARCH_R8A7745=y |
17 | CONFIG_ARCH_R8A77470=y | ||
17 | CONFIG_ARCH_R8A7778=y | 18 | CONFIG_ARCH_R8A7778=y |
18 | CONFIG_ARCH_R8A7779=y | 19 | CONFIG_ARCH_R8A7779=y |
19 | CONFIG_ARCH_R8A7790=y | 20 | CONFIG_ARCH_R8A7790=y |
@@ -127,6 +128,7 @@ CONFIG_CPU_THERMAL=y | |||
127 | CONFIG_RCAR_THERMAL=y | 128 | CONFIG_RCAR_THERMAL=y |
128 | CONFIG_WATCHDOG=y | 129 | CONFIG_WATCHDOG=y |
129 | CONFIG_DA9063_WATCHDOG=y | 130 | CONFIG_DA9063_WATCHDOG=y |
131 | CONFIG_RENESAS_WDT=y | ||
130 | CONFIG_MFD_AS3711=y | 132 | CONFIG_MFD_AS3711=y |
131 | CONFIG_MFD_DA9063=y | 133 | CONFIG_MFD_DA9063=y |
132 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 134 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
@@ -156,7 +158,6 @@ CONFIG_DRM_DUMB_VGA_DAC=y | |||
156 | CONFIG_DRM_I2C_ADV7511=y | 158 | CONFIG_DRM_I2C_ADV7511=y |
157 | CONFIG_DRM_I2C_ADV7511_AUDIO=y | 159 | CONFIG_DRM_I2C_ADV7511_AUDIO=y |
158 | CONFIG_FB_SH_MOBILE_LCDC=y | 160 | CONFIG_FB_SH_MOBILE_LCDC=y |
159 | CONFIG_FB_SH_MOBILE_MERAM=y | ||
160 | # CONFIG_LCD_CLASS_DEVICE is not set | 161 | # CONFIG_LCD_CLASS_DEVICE is not set |
161 | # CONFIG_BACKLIGHT_GENERIC is not set | 162 | # CONFIG_BACKLIGHT_GENERIC is not set |
162 | CONFIG_BACKLIGHT_PWM=y | 163 | CONFIG_BACKLIGHT_PWM=y |
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ecf613761e78..b209f9511ad0 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig | |||
@@ -53,6 +53,7 @@ CONFIG_ARCH_R8A7796=y | |||
53 | CONFIG_ARCH_R8A77965=y | 53 | CONFIG_ARCH_R8A77965=y |
54 | CONFIG_ARCH_R8A77970=y | 54 | CONFIG_ARCH_R8A77970=y |
55 | CONFIG_ARCH_R8A77980=y | 55 | CONFIG_ARCH_R8A77980=y |
56 | CONFIG_ARCH_R8A77990=y | ||
56 | CONFIG_ARCH_R8A77995=y | 57 | CONFIG_ARCH_R8A77995=y |
57 | CONFIG_ARCH_STRATIX10=y | 58 | CONFIG_ARCH_STRATIX10=y |
58 | CONFIG_ARCH_TEGRA=y | 59 | CONFIG_ARCH_TEGRA=y |
@@ -75,6 +76,7 @@ CONFIG_PCI_HISI=y | |||
75 | CONFIG_PCIE_QCOM=y | 76 | CONFIG_PCIE_QCOM=y |
76 | CONFIG_PCIE_KIRIN=y | 77 | CONFIG_PCIE_KIRIN=y |
77 | CONFIG_PCIE_ARMADA_8K=y | 78 | CONFIG_PCIE_ARMADA_8K=y |
79 | CONFIG_PCIE_HISI_STB=y | ||
78 | CONFIG_PCI_AARDVARK=y | 80 | CONFIG_PCI_AARDVARK=y |
79 | CONFIG_PCI_TEGRA=y | 81 | CONFIG_PCI_TEGRA=y |
80 | CONFIG_PCIE_RCAR=y | 82 | CONFIG_PCIE_RCAR=y |
@@ -157,8 +159,10 @@ CONFIG_BT_HIDP=m | |||
157 | # CONFIG_BT_LE is not set | 159 | # CONFIG_BT_LE is not set |
158 | CONFIG_BT_LEDS=y | 160 | CONFIG_BT_LEDS=y |
159 | # CONFIG_BT_DEBUGFS is not set | 161 | # CONFIG_BT_DEBUGFS is not set |
162 | CONFIG_BT_HCIBTUSB=m | ||
160 | CONFIG_BT_HCIUART=m | 163 | CONFIG_BT_HCIUART=m |
161 | CONFIG_BT_HCIUART_LL=y | 164 | CONFIG_BT_HCIUART_LL=y |
165 | CONFIG_BT_HCIUART_BCM=y | ||
162 | CONFIG_CFG80211=m | 166 | CONFIG_CFG80211=m |
163 | CONFIG_MAC80211=m | 167 | CONFIG_MAC80211=m |
164 | CONFIG_MAC80211_LEDS=y | 168 | CONFIG_MAC80211_LEDS=y |
@@ -169,6 +173,9 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
169 | CONFIG_DEVTMPFS=y | 173 | CONFIG_DEVTMPFS=y |
170 | CONFIG_DEVTMPFS_MOUNT=y | 174 | CONFIG_DEVTMPFS_MOUNT=y |
171 | CONFIG_DMA_CMA=y | 175 | CONFIG_DMA_CMA=y |
176 | CONFIG_CMA_SIZE_MBYTES=32 | ||
177 | CONFIG_HISILICON_LPC=y | ||
178 | CONFIG_SIMPLE_PM_BUS=y | ||
172 | CONFIG_MTD=y | 179 | CONFIG_MTD=y |
173 | CONFIG_MTD_BLOCK=y | 180 | CONFIG_MTD_BLOCK=y |
174 | CONFIG_MTD_M25P80=y | 181 | CONFIG_MTD_M25P80=y |
@@ -187,6 +194,9 @@ CONFIG_BLK_DEV_SD=y | |||
187 | CONFIG_SCSI_SAS_ATA=y | 194 | CONFIG_SCSI_SAS_ATA=y |
188 | CONFIG_SCSI_HISI_SAS=y | 195 | CONFIG_SCSI_HISI_SAS=y |
189 | CONFIG_SCSI_HISI_SAS_PCI=y | 196 | CONFIG_SCSI_HISI_SAS_PCI=y |
197 | CONFIG_SCSI_UFSHCD=m | ||
198 | CONFIG_SCSI_UFSHCD_PLATFORM=m | ||
199 | CONFIG_SCSI_UFS_QCOM=m | ||
190 | CONFIG_ATA=y | 200 | CONFIG_ATA=y |
191 | CONFIG_SATA_AHCI=y | 201 | CONFIG_SATA_AHCI=y |
192 | CONFIG_SATA_AHCI_PLATFORM=y | 202 | CONFIG_SATA_AHCI_PLATFORM=y |
@@ -206,8 +216,10 @@ CONFIG_VETH=m | |||
206 | CONFIG_VIRTIO_NET=y | 216 | CONFIG_VIRTIO_NET=y |
207 | CONFIG_AMD_XGBE=y | 217 | CONFIG_AMD_XGBE=y |
208 | CONFIG_NET_XGENE=y | 218 | CONFIG_NET_XGENE=y |
219 | CONFIG_ATL1C=m | ||
209 | CONFIG_MACB=y | 220 | CONFIG_MACB=y |
210 | CONFIG_THUNDER_NIC_PF=y | 221 | CONFIG_THUNDER_NIC_PF=y |
222 | CONFIG_HIX5HD2_GMAC=y | ||
211 | CONFIG_HNS_DSAF=y | 223 | CONFIG_HNS_DSAF=y |
212 | CONFIG_HNS_ENET=y | 224 | CONFIG_HNS_ENET=y |
213 | CONFIG_E1000E=y | 225 | CONFIG_E1000E=y |
@@ -239,6 +251,7 @@ CONFIG_ROCKCHIP_PHY=y | |||
239 | CONFIG_USB_PEGASUS=m | 251 | CONFIG_USB_PEGASUS=m |
240 | CONFIG_USB_RTL8150=m | 252 | CONFIG_USB_RTL8150=m |
241 | CONFIG_USB_RTL8152=m | 253 | CONFIG_USB_RTL8152=m |
254 | CONFIG_USB_LAN78XX=m | ||
242 | CONFIG_USB_USBNET=m | 255 | CONFIG_USB_USBNET=m |
243 | CONFIG_USB_NET_DM9601=m | 256 | CONFIG_USB_NET_DM9601=m |
244 | CONFIG_USB_NET_SR9800=m | 257 | CONFIG_USB_NET_SR9800=m |
@@ -246,13 +259,19 @@ CONFIG_USB_NET_SMSC75XX=m | |||
246 | CONFIG_USB_NET_SMSC95XX=m | 259 | CONFIG_USB_NET_SMSC95XX=m |
247 | CONFIG_USB_NET_PLUSB=m | 260 | CONFIG_USB_NET_PLUSB=m |
248 | CONFIG_USB_NET_MCS7830=m | 261 | CONFIG_USB_NET_MCS7830=m |
262 | CONFIG_ATH10K=m | ||
263 | CONFIG_ATH10K_PCI=m | ||
249 | CONFIG_BRCMFMAC=m | 264 | CONFIG_BRCMFMAC=m |
265 | CONFIG_MWIFIEX=m | ||
266 | CONFIG_MWIFIEX_PCIE=m | ||
250 | CONFIG_WL18XX=m | 267 | CONFIG_WL18XX=m |
251 | CONFIG_WLCORE_SDIO=m | 268 | CONFIG_WLCORE_SDIO=m |
252 | CONFIG_INPUT_EVDEV=y | 269 | CONFIG_INPUT_EVDEV=y |
253 | CONFIG_KEYBOARD_ADC=m | 270 | CONFIG_KEYBOARD_ADC=m |
254 | CONFIG_KEYBOARD_CROS_EC=y | 271 | CONFIG_KEYBOARD_CROS_EC=y |
255 | CONFIG_KEYBOARD_GPIO=y | 272 | CONFIG_KEYBOARD_GPIO=y |
273 | CONFIG_INPUT_TOUCHSCREEN=y | ||
274 | CONFIG_TOUCHSCREEN_ATMEL_MXT=m | ||
256 | CONFIG_INPUT_MISC=y | 275 | CONFIG_INPUT_MISC=y |
257 | CONFIG_INPUT_PM8941_PWRKEY=y | 276 | CONFIG_INPUT_PM8941_PWRKEY=y |
258 | CONFIG_INPUT_HISI_POWERKEY=y | 277 | CONFIG_INPUT_HISI_POWERKEY=y |
@@ -286,6 +305,7 @@ CONFIG_SERIAL_MVEBU_UART=y | |||
286 | CONFIG_SERIAL_DEV_BUS=y | 305 | CONFIG_SERIAL_DEV_BUS=y |
287 | CONFIG_SERIAL_DEV_CTRL_TTYPORT=y | 306 | CONFIG_SERIAL_DEV_CTRL_TTYPORT=y |
288 | CONFIG_VIRTIO_CONSOLE=y | 307 | CONFIG_VIRTIO_CONSOLE=y |
308 | CONFIG_I2C_HID=m | ||
289 | CONFIG_I2C_CHARDEV=y | 309 | CONFIG_I2C_CHARDEV=y |
290 | CONFIG_I2C_MUX=y | 310 | CONFIG_I2C_MUX=y |
291 | CONFIG_I2C_MUX_PCA954x=y | 311 | CONFIG_I2C_MUX_PCA954x=y |
@@ -303,6 +323,7 @@ CONFIG_I2C_UNIPHIER_F=y | |||
303 | CONFIG_I2C_RCAR=y | 323 | CONFIG_I2C_RCAR=y |
304 | CONFIG_I2C_CROS_EC_TUNNEL=y | 324 | CONFIG_I2C_CROS_EC_TUNNEL=y |
305 | CONFIG_SPI=y | 325 | CONFIG_SPI=y |
326 | CONFIG_SPI_ARMADA_3700=y | ||
306 | CONFIG_SPI_MESON_SPICC=m | 327 | CONFIG_SPI_MESON_SPICC=m |
307 | CONFIG_SPI_MESON_SPIFC=m | 328 | CONFIG_SPI_MESON_SPIFC=m |
308 | CONFIG_SPI_BCM2835=m | 329 | CONFIG_SPI_BCM2835=m |
@@ -320,6 +341,7 @@ CONFIG_PINCTRL_MAX77620=y | |||
320 | CONFIG_PINCTRL_MSM8916=y | 341 | CONFIG_PINCTRL_MSM8916=y |
321 | CONFIG_PINCTRL_MSM8994=y | 342 | CONFIG_PINCTRL_MSM8994=y |
322 | CONFIG_PINCTRL_MSM8996=y | 343 | CONFIG_PINCTRL_MSM8996=y |
344 | CONFIG_PINCTRL_MT7622=y | ||
323 | CONFIG_PINCTRL_QDF2XXX=y | 345 | CONFIG_PINCTRL_QDF2XXX=y |
324 | CONFIG_PINCTRL_QCOM_SPMI_PMIC=y | 346 | CONFIG_PINCTRL_QCOM_SPMI_PMIC=y |
325 | CONFIG_GPIO_DWAPB=y | 347 | CONFIG_GPIO_DWAPB=y |
@@ -332,6 +354,8 @@ CONFIG_GPIO_XGENE_SB=y | |||
332 | CONFIG_GPIO_PCA953X=y | 354 | CONFIG_GPIO_PCA953X=y |
333 | CONFIG_GPIO_PCA953X_IRQ=y | 355 | CONFIG_GPIO_PCA953X_IRQ=y |
334 | CONFIG_GPIO_MAX77620=y | 356 | CONFIG_GPIO_MAX77620=y |
357 | CONFIG_POWER_AVS=y | ||
358 | CONFIG_ROCKCHIP_IODOMAIN=y | ||
335 | CONFIG_POWER_RESET_MSM=y | 359 | CONFIG_POWER_RESET_MSM=y |
336 | CONFIG_POWER_RESET_XGENE=y | 360 | CONFIG_POWER_RESET_XGENE=y |
337 | CONFIG_POWER_RESET_SYSCON=y | 361 | CONFIG_POWER_RESET_SYSCON=y |
@@ -343,6 +367,7 @@ CONFIG_SENSORS_INA2XX=m | |||
343 | CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y | 367 | CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y |
344 | CONFIG_CPU_THERMAL=y | 368 | CONFIG_CPU_THERMAL=y |
345 | CONFIG_THERMAL_EMULATION=y | 369 | CONFIG_THERMAL_EMULATION=y |
370 | CONFIG_ARMADA_THERMAL=y | ||
346 | CONFIG_BRCMSTB_THERMAL=m | 371 | CONFIG_BRCMSTB_THERMAL=m |
347 | CONFIG_EXYNOS_THERMAL=y | 372 | CONFIG_EXYNOS_THERMAL=y |
348 | CONFIG_RCAR_GEN3_THERMAL=y | 373 | CONFIG_RCAR_GEN3_THERMAL=y |
@@ -361,6 +386,7 @@ CONFIG_MFD_AXP20X_RSB=y | |||
361 | CONFIG_MFD_CROS_EC=y | 386 | CONFIG_MFD_CROS_EC=y |
362 | CONFIG_MFD_CROS_EC_I2C=y | 387 | CONFIG_MFD_CROS_EC_I2C=y |
363 | CONFIG_MFD_CROS_EC_SPI=y | 388 | CONFIG_MFD_CROS_EC_SPI=y |
389 | CONFIG_MFD_CROS_EC_CHARDEV=m | ||
364 | CONFIG_MFD_EXYNOS_LPASS=m | 390 | CONFIG_MFD_EXYNOS_LPASS=m |
365 | CONFIG_MFD_HI6421_PMIC=y | 391 | CONFIG_MFD_HI6421_PMIC=y |
366 | CONFIG_MFD_HI655X_PMIC=y | 392 | CONFIG_MFD_HI655X_PMIC=y |
@@ -439,7 +465,8 @@ CONFIG_SND_BCM2835_SOC_I2S=m | |||
439 | CONFIG_SND_SOC_SAMSUNG=y | 465 | CONFIG_SND_SOC_SAMSUNG=y |
440 | CONFIG_SND_SOC_RCAR=m | 466 | CONFIG_SND_SOC_RCAR=m |
441 | CONFIG_SND_SOC_AK4613=m | 467 | CONFIG_SND_SOC_AK4613=m |
442 | CONFIG_SND_SIMPLE_CARD=y | 468 | CONFIG_SND_SIMPLE_CARD=m |
469 | CONFIG_SND_AUDIO_GRAPH_CARD=m | ||
443 | CONFIG_USB=y | 470 | CONFIG_USB=y |
444 | CONFIG_USB_OTG=y | 471 | CONFIG_USB_OTG=y |
445 | CONFIG_USB_XHCI_HCD=y | 472 | CONFIG_USB_XHCI_HCD=y |
@@ -485,6 +512,7 @@ CONFIG_MMC_SPI=y | |||
485 | CONFIG_MMC_SDHI=y | 512 | CONFIG_MMC_SDHI=y |
486 | CONFIG_MMC_DW=y | 513 | CONFIG_MMC_DW=y |
487 | CONFIG_MMC_DW_EXYNOS=y | 514 | CONFIG_MMC_DW_EXYNOS=y |
515 | CONFIG_MMC_DW_HI3798CV200=y | ||
488 | CONFIG_MMC_DW_K3=y | 516 | CONFIG_MMC_DW_K3=y |
489 | CONFIG_MMC_DW_ROCKCHIP=y | 517 | CONFIG_MMC_DW_ROCKCHIP=y |
490 | CONFIG_MMC_SUNXI=y | 518 | CONFIG_MMC_SUNXI=y |
@@ -514,6 +542,7 @@ CONFIG_RTC_DRV_SUN6I=y | |||
514 | CONFIG_RTC_DRV_ARMADA38X=y | 542 | CONFIG_RTC_DRV_ARMADA38X=y |
515 | CONFIG_RTC_DRV_TEGRA=y | 543 | CONFIG_RTC_DRV_TEGRA=y |
516 | CONFIG_RTC_DRV_XGENE=y | 544 | CONFIG_RTC_DRV_XGENE=y |
545 | CONFIG_RTC_DRV_CROS_EC=y | ||
517 | CONFIG_DMADEVICES=y | 546 | CONFIG_DMADEVICES=y |
518 | CONFIG_DMA_BCM2835=m | 547 | CONFIG_DMA_BCM2835=m |
519 | CONFIG_K3_DMA=y | 548 | CONFIG_K3_DMA=y |
@@ -556,6 +585,7 @@ CONFIG_TEGRA_IOMMU_SMMU=y | |||
556 | CONFIG_ARM_SMMU=y | 585 | CONFIG_ARM_SMMU=y |
557 | CONFIG_ARM_SMMU_V3=y | 586 | CONFIG_ARM_SMMU_V3=y |
558 | CONFIG_QCOM_IOMMU=y | 587 | CONFIG_QCOM_IOMMU=y |
588 | CONFIG_RPMSG_QCOM_GLINK_RPM=y | ||
559 | CONFIG_RPMSG_QCOM_SMD=y | 589 | CONFIG_RPMSG_QCOM_SMD=y |
560 | CONFIG_RASPBERRYPI_POWER=y | 590 | CONFIG_RASPBERRYPI_POWER=y |
561 | CONFIG_QCOM_SMEM=y | 591 | CONFIG_QCOM_SMEM=y |
@@ -567,12 +597,18 @@ CONFIG_ARCH_TEGRA_132_SOC=y | |||
567 | CONFIG_ARCH_TEGRA_210_SOC=y | 597 | CONFIG_ARCH_TEGRA_210_SOC=y |
568 | CONFIG_ARCH_TEGRA_186_SOC=y | 598 | CONFIG_ARCH_TEGRA_186_SOC=y |
569 | CONFIG_ARCH_TEGRA_194_SOC=y | 599 | CONFIG_ARCH_TEGRA_194_SOC=y |
600 | CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y | ||
570 | CONFIG_EXTCON_USB_GPIO=y | 601 | CONFIG_EXTCON_USB_GPIO=y |
602 | CONFIG_EXTCON_USBC_CROS_EC=y | ||
571 | CONFIG_MEMORY=y | 603 | CONFIG_MEMORY=y |
572 | CONFIG_TEGRA_MC=y | 604 | CONFIG_TEGRA_MC=y |
573 | CONFIG_IIO=y | 605 | CONFIG_IIO=y |
574 | CONFIG_EXYNOS_ADC=y | 606 | CONFIG_EXYNOS_ADC=y |
575 | CONFIG_ROCKCHIP_SARADC=m | 607 | CONFIG_ROCKCHIP_SARADC=m |
608 | CONFIG_IIO_CROS_EC_SENSORS_CORE=m | ||
609 | CONFIG_IIO_CROS_EC_SENSORS=m | ||
610 | CONFIG_IIO_CROS_EC_LIGHT_PROX=m | ||
611 | CONFIG_IIO_CROS_EC_BARO=m | ||
576 | CONFIG_PWM=y | 612 | CONFIG_PWM=y |
577 | CONFIG_PWM_BCM2835=m | 613 | CONFIG_PWM_BCM2835=m |
578 | CONFIG_PWM_CROS_EC=m | 614 | CONFIG_PWM_CROS_EC=m |
@@ -581,21 +617,26 @@ CONFIG_PWM_RCAR=m | |||
581 | CONFIG_PWM_ROCKCHIP=y | 617 | CONFIG_PWM_ROCKCHIP=y |
582 | CONFIG_PWM_SAMSUNG=y | 618 | CONFIG_PWM_SAMSUNG=y |
583 | CONFIG_PWM_TEGRA=m | 619 | CONFIG_PWM_TEGRA=m |
620 | CONFIG_PHY_HISTB_COMBPHY=y | ||
621 | CONFIG_PHY_HISI_INNO_USB2=y | ||
584 | CONFIG_PHY_RCAR_GEN3_USB2=y | 622 | CONFIG_PHY_RCAR_GEN3_USB2=y |
585 | CONFIG_PHY_RCAR_GEN3_USB3=m | 623 | CONFIG_PHY_RCAR_GEN3_USB3=m |
586 | CONFIG_PHY_HI6220_USB=y | 624 | CONFIG_PHY_HI6220_USB=y |
587 | CONFIG_PHY_QCOM_USB_HS=y | 625 | CONFIG_PHY_QCOM_USB_HS=y |
588 | CONFIG_PHY_SUN4I_USB=y | 626 | CONFIG_PHY_SUN4I_USB=y |
589 | CONFIG_PHY_MVEBU_CP110_COMPHY=y | 627 | CONFIG_PHY_MVEBU_CP110_COMPHY=y |
628 | CONFIG_PHY_QCOM_QMP=m | ||
590 | CONFIG_PHY_ROCKCHIP_INNO_USB2=y | 629 | CONFIG_PHY_ROCKCHIP_INNO_USB2=y |
591 | CONFIG_PHY_ROCKCHIP_EMMC=y | 630 | CONFIG_PHY_ROCKCHIP_EMMC=y |
592 | CONFIG_PHY_ROCKCHIP_PCIE=m | 631 | CONFIG_PHY_ROCKCHIP_PCIE=m |
632 | CONFIG_PHY_ROCKCHIP_TYPEC=y | ||
593 | CONFIG_PHY_XGENE=y | 633 | CONFIG_PHY_XGENE=y |
594 | CONFIG_PHY_TEGRA_XUSB=y | 634 | CONFIG_PHY_TEGRA_XUSB=y |
595 | CONFIG_QCOM_L2_PMU=y | 635 | CONFIG_QCOM_L2_PMU=y |
596 | CONFIG_QCOM_L3_PMU=y | 636 | CONFIG_QCOM_L3_PMU=y |
597 | CONFIG_MESON_EFUSE=m | 637 | CONFIG_MESON_EFUSE=m |
598 | CONFIG_QCOM_QFPROM=y | 638 | CONFIG_QCOM_QFPROM=y |
639 | CONFIG_ROCKCHIP_EFUSE=y | ||
599 | CONFIG_UNIPHIER_EFUSE=y | 640 | CONFIG_UNIPHIER_EFUSE=y |
600 | CONFIG_TEE=y | 641 | CONFIG_TEE=y |
601 | CONFIG_OPTEE=y | 642 | CONFIG_OPTEE=y |