Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "The defconfig changes are split out from the rest again. This time we
  have a number of changes for NXP i.MX and Renesas, including a cleanup
  of old options.

  Some smaller changes are for Socionext Uniphier, Allwinner, Qualcomm,
  Rockchip, Renesas, AT91, Hisilicon, and STM32. All of these just
  enable platform specific device drivers"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
  arm64: defconfig: Enable SERIAL_8250_OMAP
  arm64: defconfig: Enable TI_SCI related configs
  ARM: imx_v6_v7_defconfig: Select CONFIG_TMPFS_POSIX_ACL
  ARM: imx_v4_v5_defconfig: Remove unneeded options
  ARM: imx_v4_v5_defconfig: Re-sync defconfig
  ARM: mxs_defconfig: Remove unneeded options
  ARM: mxs_defconfig: Re-sync defconfig
  ARM: imx_v6_v7_defconfig: Remove unneeded options
  ARM: imx_v6_v7_defconfig: Re-sync defconfig
  ARM: imx_v6_v7_defconfig: select CONFIG_ARM_CPUIDLE by default
  ARM: imx_v6_v7_defconfig: Make usbnet drivers builtin for boot
  ARM: imx_v6_v7_defconfig: add CONFIG_FW_LOADER_USER_HELPER
  ARM: imx_v6_v7_defconfig: Select CONFIG_SENSORS_MC13783_ADC
  ARM: multi_v7_defconfig: enable CONFIG_MMC_UNIPHIER
  arm64: defconfig: enable CONFIG_MMC_UNIPHIER
  ARM: multi_v7_defconfig: Enable USB phys for UniPhier SoCs
  arm64: defconfig: Enable USB phys for UniPhier SoCs
  arm64: defconfig: enable Rockchip Innosilicon hdmiphy
  arm64: defconfig: Enable PCIEPORTBUS
  arm64: defconfig: enable HiSilicon HNS3 driver
  ...
Linus Torvalds 6 years ago
parent
93335e5911 e8c3f6322c
commit
53b7a3b7ec
9 changed files with 79 additions and 45 deletions
Split View Show Diff Stats
  1. 1 1
      arch/arm/configs/bcm2835_defconfig
  2. 8 10
      arch/arm/configs/imx_v4_v5_defconfig
  3. 23 18
      arch/arm/configs/imx_v6_v7_defconfig
  4. 13 0
      arch/arm/configs/multi_v7_defconfig
  5. 8 11
      arch/arm/configs/mxs_defconfig
  6. 1 0
      arch/arm/configs/qcom_defconfig
  7. 2 0
      arch/arm/configs/sama5_defconfig
  8. 3 5
      arch/arm/configs/shmobile_defconfig
  9. 20 0
      arch/arm64/configs/defconfig

+ 1 - 1
arch/arm/configs/bcm2835_defconfig
View File 

@@ -128,7 +128,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=y
 
 CONFIG_DMADEVICES=y
 
 CONFIG_DMA_BCM2835=y
 
 CONFIG_STAGING=y
 
-CONFIG_BCM2835_VCHIQ=m
 
+CONFIG_SND_BCM2835=m
 
 CONFIG_MAILBOX=y
 
 CONFIG_BCM2835_MBOX=y
 
 # CONFIG_IOMMU_SUPPORT is not set

+ 8 - 10
arch/arm/configs/imx_v4_v5_defconfig
View File 

@@ -3,6 +3,7 @@ CONFIG_SYSVIPC=y
 
 CONFIG_POSIX_MQUEUE=y
 
 CONFIG_NO_HZ=y
 
 CONFIG_HIGH_RES_TIMERS=y
 
+CONFIG_PREEMPT=y
 
 CONFIG_LOG_BUF_SHIFT=14
 
 CONFIG_CGROUPS=y
 
 CONFIG_BLK_DEV_INITRD=y
 
@@ -10,13 +11,6 @@ CONFIG_EXPERT=y
 
 # CONFIG_COMPAT_BRK is not set
 
 CONFIG_SLAB=y
 
 CONFIG_PROFILING=y
 
-CONFIG_OPROFILE=y
 
-CONFIG_KPROBES=y
 
-CONFIG_MODULES=y
 
-CONFIG_MODULE_UNLOAD=y
 
-# CONFIG_BLK_DEV_BSG is not set
 
-# CONFIG_IOSCHED_DEADLINE is not set
 
-# CONFIG_IOSCHED_CFQ is not set
 
 CONFIG_ARCH_MULTI_V4T=y
 
 CONFIG_ARCH_MULTI_V5=y
 
 # CONFIG_ARCH_MULTI_V7 is not set
 
@@ -29,11 +23,17 @@ CONFIG_MACH_PCA100=y
 
 CONFIG_MACH_IMX27_DT=y
 
 CONFIG_SOC_IMX1=y
 
 CONFIG_SOC_IMX25=y
 
-CONFIG_PREEMPT=y
 
 CONFIG_AEABI=y
 
 CONFIG_ZBOOT_ROM_TEXT=0x0
 
 CONFIG_ZBOOT_ROM_BSS=0x0
 
 CONFIG_PM_DEBUG=y
 
+CONFIG_OPROFILE=y
 
+CONFIG_KPROBES=y
 
+CONFIG_MODULES=y
 
+CONFIG_MODULE_UNLOAD=y
 
+# CONFIG_BLK_DEV_BSG is not set
 
+# CONFIG_IOSCHED_DEADLINE is not set
 
+# CONFIG_IOSCHED_CFQ is not set
 
 CONFIG_NET=y
 
 CONFIG_PACKET=y
 
 CONFIG_UNIX=y
 
@@ -141,11 +141,9 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_USB_CHIPIDEA=y
 
 CONFIG_USB_CHIPIDEA_UDC=y
 
 CONFIG_USB_CHIPIDEA_HOST=y
 
-CONFIG_USB_CHIPIDEA_ULPI=y
 
 CONFIG_NOP_USB_XCEIV=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_ETH=m
 
-CONFIG_USB_ULPI_BUS=y
 
 CONFIG_MMC=y
 
 CONFIG_MMC_SDHCI=y
 
 CONFIG_MMC_SDHCI_PLTFM=y

+ 23 - 18
arch/arm/configs/imx_v6_v7_defconfig
View File 

@@ -2,6 +2,7 @@ CONFIG_KERNEL_LZO=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_NO_HZ=y
 
 CONFIG_HIGH_RES_TIMERS=y
 
+CONFIG_PREEMPT_VOLUNTARY=y
 
 CONFIG_IKCONFIG=y
 
 CONFIG_IKCONFIG_PROC=y
 
 CONFIG_LOG_BUF_SHIFT=18
 
@@ -12,11 +13,6 @@ CONFIG_EXPERT=y
 
 CONFIG_PERF_EVENTS=y
 
 # CONFIG_SLUB_DEBUG is not set
 
 # CONFIG_COMPAT_BRK is not set
 
-CONFIG_MODULES=y
 
-CONFIG_MODULE_UNLOAD=y
 
-CONFIG_MODVERSIONS=y
 
-CONFIG_MODULE_SRCVERSION_ALL=y
 
-# CONFIG_BLK_DEV_BSG is not set
 
 CONFIG_ARCH_MULTI_V6=y
 
 CONFIG_ARCH_MXC=y
 
 CONFIG_MACH_MX31LILLY=y
 
@@ -48,7 +44,6 @@ CONFIG_PCI_MSI=y
 
 CONFIG_PCI_IMX6=y
 
 CONFIG_SMP=y
 
 CONFIG_ARM_PSCI=y
 
-CONFIG_PREEMPT_VOLUNTARY=y
 
 CONFIG_HIGHMEM=y
 
 CONFIG_FORCE_MAX_ZONEORDER=14
 
 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
 
@@ -62,11 +57,17 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 
 CONFIG_CPUFREQ_DT=y
 
 CONFIG_ARM_IMX6Q_CPUFREQ=y
 
 CONFIG_CPU_IDLE=y
 
+CONFIG_ARM_CPUIDLE=y
 
 CONFIG_VFP=y
 
 CONFIG_NEON=y
 
-CONFIG_BINFMT_MISC=m
 
 CONFIG_PM_DEBUG=y
 
 CONFIG_PM_TEST_SUSPEND=y
 
+CONFIG_MODULES=y
 
+CONFIG_MODULE_UNLOAD=y
 
+CONFIG_MODVERSIONS=y
 
+CONFIG_MODULE_SRCVERSION_ALL=y
 
+# CONFIG_BLK_DEV_BSG is not set
 
+CONFIG_BINFMT_MISC=m
 
 CONFIG_NET=y
 
 CONFIG_PACKET=y
 
 CONFIG_UNIX=y
 
@@ -90,6 +91,8 @@ CONFIG_RFKILL_INPUT=y
 
 CONFIG_DEVTMPFS=y
 
 CONFIG_DEVTMPFS_MOUNT=y
 
 # CONFIG_STANDALONE is not set
 
+CONFIG_FW_LOADER_USER_HELPER=y
 
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 
 CONFIG_CMA_SIZE_MBYTES=64
 
 CONFIG_IMX_WEIM=y
 
 CONFIG_CONNECTOR=y
 
@@ -149,9 +152,12 @@ CONFIG_MICREL_PHY=y
 
 CONFIG_SMSC_PHY=y
 
 CONFIG_USB_PEGASUS=m
 
 CONFIG_USB_RTL8150=m
 
-CONFIG_USB_RTL8152=m
 
+CONFIG_USB_RTL8152=y
 
+CONFIG_USB_LAN78XX=y
 
 CONFIG_USB_USBNET=y
 
 CONFIG_USB_NET_CDC_EEM=m
 
+CONFIG_USB_NET_SMSC95XX=y
 
+CONFIG_USB_NET_MCS7830=y
 
 CONFIG_BRCMFMAC=m
 
 CONFIG_MWIFIEX=m
 
 CONFIG_MWIFIEX_SDIO=m
 
@@ -211,6 +217,7 @@ CONFIG_POWER_RESET=y
 
 CONFIG_POWER_RESET_SYSCON=y
 
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 
 CONFIG_POWER_SUPPLY=y
 
+CONFIG_SENSORS_MC13783_ADC=y
 
 CONFIG_SENSORS_GPIO_FAN=y
 
 CONFIG_SENSORS_IIO_HWMON=y
 
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 
@@ -302,7 +309,6 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_USB_CHIPIDEA=y
 
 CONFIG_USB_CHIPIDEA_UDC=y
 
 CONFIG_USB_CHIPIDEA_HOST=y
 
-CONFIG_USB_CHIPIDEA_ULPI=y
 
 CONFIG_USB_SERIAL=m
 
 CONFIG_USB_SERIAL_GENERIC=y
 
 CONFIG_USB_SERIAL_FTDI_SIO=m
 
@@ -339,7 +345,6 @@ CONFIG_USB_GADGETFS=m
 
 CONFIG_USB_FUNCTIONFS=m
 
 CONFIG_USB_MASS_STORAGE=m
 
 CONFIG_USB_G_SERIAL=m
 
-CONFIG_USB_ULPI_BUS=y
 
 CONFIG_MMC=y
 
 CONFIG_MMC_SDHCI=y
 
 CONFIG_MMC_SDHCI_PLTFM=y
 
@@ -409,6 +414,7 @@ CONFIG_ZISOFS=y
 
 CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=y
 
+CONFIG_TMPFS_POSIX_ACL=y
 
 CONFIG_JFFS2_FS=y
 
 CONFIG_UBIFS_FS=y
 
 CONFIG_NFS_FS=y
 
@@ -421,14 +427,6 @@ CONFIG_NLS_ASCII=y
 
 CONFIG_NLS_ISO8859_1=y
 
 CONFIG_NLS_ISO8859_15=m
 
 CONFIG_NLS_UTF8=y
 
-CONFIG_PRINTK_TIME=y
 
-CONFIG_DEBUG_FS=y
 
-CONFIG_MAGIC_SYSRQ=y
 
-# CONFIG_SCHED_DEBUG is not set
 
-CONFIG_PROVE_LOCKING=y
 
-# CONFIG_DEBUG_BUGVERBOSE is not set
 
-# CONFIG_FTRACE is not set
 
-# CONFIG_ARM_UNWIND is not set
 
 CONFIG_SECURITYFS=y
 
 CONFIG_CRYPTO_DEV_FSL_CAAM=y
 
 CONFIG_CRYPTO_DEV_SAHARA=y
 
@@ -439,3 +437,10 @@ CONFIG_LIBCRC32C=m
 
 CONFIG_FONTS=y
 
 CONFIG_FONT_8x8=y
 
 CONFIG_FONT_8x16=y
 
+CONFIG_PRINTK_TIME=y
 
+CONFIG_MAGIC_SYSRQ=y
 
+# CONFIG_SCHED_DEBUG is not set
 
+CONFIG_PROVE_LOCKING=y
 
+# CONFIG_DEBUG_BUGVERBOSE is not set
 
+# CONFIG_FTRACE is not set
 
+# CONFIG_ARM_UNWIND is not set

+ 13 - 0
arch/arm/configs/multi_v7_defconfig
View File 

@@ -79,6 +79,7 @@ CONFIG_ARCH_R7S72100=y
 
 CONFIG_ARCH_R8A73A4=y
 
 CONFIG_ARCH_R8A7740=y
 
 CONFIG_ARCH_R8A7743=y
 
+CONFIG_ARCH_R8A7744=y
 
 CONFIG_ARCH_R8A7745=y
 
 CONFIG_ARCH_R8A77470=y
 
 CONFIG_ARCH_R8A7778=y
 
@@ -282,6 +283,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
 
 CONFIG_MOUSE_CYAPA=m
 
 CONFIG_MOUSE_ELAN_I2C=y
 
 CONFIG_INPUT_TOUCHSCREEN=y
 
+CONFIG_TOUCHSCREEN_ADC=m
 
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 
 CONFIG_TOUCHSCREEN_MMS114=m
 
 CONFIG_TOUCHSCREEN_WM97XX=m
 
@@ -391,6 +393,7 @@ CONFIG_SPI_S3C64XX=m
 
 CONFIG_SPI_SH_MSIOF=m
 
 CONFIG_SPI_SH_HSPI=y
 
 CONFIG_SPI_SIRF=y
 
+CONFIG_SPI_STM32=m
 
 CONFIG_SPI_SUN4I=y
 
 CONFIG_SPI_SUN6I=y
 
 CONFIG_SPI_TEGRA114=y
 
@@ -584,6 +587,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 
 CONFIG_VIDEO_STI_BDISP=m
 
 CONFIG_VIDEO_STI_HVA=m
 
 CONFIG_VIDEO_STI_DELTA=m
 
+CONFIG_VIDEO_RENESAS_FDP1=m
 
 CONFIG_VIDEO_RENESAS_JPU=m
 
 CONFIG_VIDEO_RENESAS_VSP1=m
 
 CONFIG_V4L_TEST_DRIVERS=y
 
@@ -614,6 +618,8 @@ CONFIG_DRM_RCAR_LVDS=y
 
 CONFIG_DRM_SUN4I=m
 
 CONFIG_DRM_FSL_DCU=m
 
 CONFIG_DRM_TEGRA=y
 
+CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
 
 CONFIG_DRM_PANEL_SIMPLE=y
 
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
 
@@ -625,6 +631,8 @@ CONFIG_DRM_SII9234=m
 
 CONFIG_DRM_I2C_ADV7511=m
 
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 
 CONFIG_DRM_STI=m
 
+CONFIG_DRM_STM=m
 
+CONFIG_DRM_STM_DSI=m
 
 CONFIG_DRM_VC4=m
 
 CONFIG_DRM_ETNAVIV=m
 
 CONFIG_DRM_MXSFB=m
 
@@ -636,6 +644,7 @@ CONFIG_FB_SIMPLE=y
 
 CONFIG_LCD_PLATFORM=m
 
 CONFIG_BACKLIGHT_PWM=y
 
 CONFIG_BACKLIGHT_AS3711=y
 
+CONFIG_BACKLIGHT_GPIO=y
 
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 
 CONFIG_SOUND=m
 
@@ -650,6 +659,7 @@ CONFIG_SND_SOC=m
 
 CONFIG_SND_ATMEL_SOC=m
 
 CONFIG_SND_ATMEL_SOC_WM8904=m
 
 CONFIG_SND_ATMEL_SOC_PDMIC=m
 
+CONFIG_SND_ATMEL_SOC_I2S=m
 
 CONFIG_SND_BCM2835_SOC_I2S=m
 
 CONFIG_SND_SOC_FSL_SAI=m
 
 CONFIG_SND_SOC_ROCKCHIP=m
 
@@ -771,6 +781,7 @@ CONFIG_MMC_ATMELMCI=y
 
 CONFIG_MMC_SDHCI_MSM=y
 
 CONFIG_MMC_MVSDIO=y
 
 CONFIG_MMC_SDHI=y
 
+CONFIG_MMC_UNIPHIER=y
 
 CONFIG_MMC_DW=y
 
 CONFIG_MMC_DW_EXYNOS=y
 
 CONFIG_MMC_DW_ROCKCHIP=y
 
@@ -943,6 +954,8 @@ CONFIG_PHY_STIH407_USB=y
 
 CONFIG_PHY_STM32_USBPHYC=y
 
 CONFIG_PHY_TEGRA_XUSB=y
 
 CONFIG_PHY_DM816X_USB=m
 
+CONFIG_PHY_UNIPHIER_USB3=y
 
+CONFIG_PHY_UNIPHIER_USB2=y
 
 CONFIG_OMAP_USB2=y
 
 CONFIG_TI_PIPE3=y
 
 CONFIG_TWL4030_USB=m

+ 8 - 11
arch/arm/configs/mxs_defconfig
View File 

@@ -1,6 +1,7 @@
 
 CONFIG_SYSVIPC=y
 
 CONFIG_NO_HZ=y
 
 CONFIG_HIGH_RES_TIMERS=y
 
+CONFIG_PREEMPT_VOLUNTARY=y
 
 CONFIG_TASKSTATS=y
 
 CONFIG_TASK_DELAY_ACCT=y
 
 CONFIG_TASK_XACCT=y
 
@@ -15,6 +16,9 @@ CONFIG_CGROUPS=y
 
 CONFIG_BLK_DEV_INITRD=y
 
 CONFIG_PERF_EVENTS=y
 
 # CONFIG_COMPAT_BRK is not set
 
+# CONFIG_ARCH_MULTI_V7 is not set
 
+CONFIG_ARCH_MXS=y
 
+CONFIG_AEABI=y
 
 CONFIG_MODULES=y
 
 CONFIG_MODULE_FORCE_LOAD=y
 
 CONFIG_MODULE_UNLOAD=y
 
@@ -23,11 +27,6 @@ CONFIG_MODVERSIONS=y
 
 CONFIG_BLK_DEV_INTEGRITY=y
 
 # CONFIG_IOSCHED_DEADLINE is not set
 
 # CONFIG_IOSCHED_CFQ is not set
 
-# CONFIG_ARCH_MULTI_V7 is not set
 
-CONFIG_ARCH_MXS=y
 
-# CONFIG_ARM_THUMB is not set
 
-CONFIG_PREEMPT_VOLUNTARY=y
 
-CONFIG_AEABI=y
 
 CONFIG_NET=y
 
 CONFIG_PACKET=y
 
 CONFIG_UNIX=y
 
@@ -80,7 +79,6 @@ CONFIG_SERIAL_AMBA_PL011=y
 
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 
 CONFIG_SERIAL_MXS_AUART=y
 
 # CONFIG_HW_RANDOM is not set
 
-CONFIG_I2C=y
 
 # CONFIG_I2C_COMPAT is not set
 
 CONFIG_I2C_CHARDEV=y
 
 CONFIG_I2C_MXS=y
 
@@ -102,7 +100,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 
 CONFIG_LCD_CLASS_DEVICE=y
 
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 
 CONFIG_BACKLIGHT_PWM=y
 
-CONFIG_FRAMEBUFFER_CONSOLE=y
 
 CONFIG_LOGO=y
 
 CONFIG_SOUND=y
 
 CONFIG_SND=y
 
@@ -163,6 +160,10 @@ CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_850=y
 
 CONFIG_NLS_ISO8859_1=y
 
 CONFIG_NLS_ISO8859_15=y
 
+CONFIG_CRYPTO_DEV_MXS_DCP=y
 
+CONFIG_CRC_ITU_T=m
 
+CONFIG_CRC7=m
 
+CONFIG_FONTS=y
 
 CONFIG_PRINTK_TIME=y
 
 CONFIG_DEBUG_INFO=y
 
 CONFIG_FRAME_WARN=2048
 
@@ -174,7 +175,3 @@ CONFIG_PROVE_LOCKING=y
 
 CONFIG_BLK_DEV_IO_TRACE=y
 
 CONFIG_STRICT_DEVMEM=y
 
 CONFIG_DEBUG_USER=y
 
-CONFIG_CRYPTO_DEV_MXS_DCP=y
 
-CONFIG_CRC_ITU_T=m
 
-CONFIG_CRC7=m
 
-CONFIG_FONTS=y

+ 1 - 0
arch/arm/configs/qcom_defconfig
View File 

@@ -207,6 +207,7 @@ CONFIG_MSM_MMCC_8974=y
 
 CONFIG_MSM_IOMMU=y
 
 CONFIG_HWSPINLOCK=y
 
 CONFIG_HWSPINLOCK_QCOM=y
 
+CONFIG_MAILBOX=y
 
 CONFIG_REMOTEPROC=y
 
 CONFIG_QCOM_ADSP_PIL=y
 
 CONFIG_QCOM_Q6V5_PIL=y

+ 2 - 0
arch/arm/configs/sama5_defconfig
View File 

@@ -116,6 +116,7 @@ CONFIG_KEYBOARD_QT1070=y
 
 CONFIG_KEYBOARD_GPIO=y
 
 # CONFIG_INPUT_MOUSE is not set
 
 CONFIG_INPUT_TOUCHSCREEN=y
 
+CONFIG_TOUCHSCREEN_ADC=y
 
 CONFIG_TOUCHSCREEN_ATMEL_MXT=y
 
 # CONFIG_SERIO is not set
 
 CONFIG_LEGACY_PTY_COUNT=4
 
@@ -167,6 +168,7 @@ CONFIG_SND_ATMEL_SOC_WM8904=y
 
 # CONFIG_HID_GENERIC is not set
 
 CONFIG_SND_ATMEL_SOC_PDMIC=y
 
 CONFIG_SND_ATMEL_SOC_TSE850_PCM5142=m
 
+CONFIG_SND_ATMEL_SOC_I2S=y
 
 CONFIG_USB=y
 
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
 CONFIG_USB_EHCI_HCD=y

+ 3 - 5
arch/arm/configs/shmobile_defconfig
View File 

@@ -13,6 +13,7 @@ CONFIG_ARCH_R7S72100=y
 
 CONFIG_ARCH_R8A73A4=y
 
 CONFIG_ARCH_R8A7740=y
 
 CONFIG_ARCH_R8A7743=y
 
+CONFIG_ARCH_R8A7744=y
 
 CONFIG_ARCH_R8A7745=y
 
 CONFIG_ARCH_R8A77470=y
 
 CONFIG_ARCH_R8A7778=y
 
@@ -32,10 +33,8 @@ CONFIG_PCI_RCAR_GEN2=y
 
 CONFIG_PCIE_RCAR=y
 
 CONFIG_SMP=y
 
 CONFIG_SCHED_MC=y
 
-CONFIG_HAVE_ARM_ARCH_TIMER=y
 
 CONFIG_NR_CPUS=8
 
 CONFIG_HIGHMEM=y
 
-CONFIG_CMA=y
 
 CONFIG_ZBOOT_ROM_TEXT=0x0
 
 CONFIG_ZBOOT_ROM_BSS=0x0
 
 CONFIG_ARM_APPENDED_DTB=y
 
@@ -50,6 +49,7 @@ CONFIG_CPUFREQ_DT=y
 
 CONFIG_VFP=y
 
 CONFIG_NEON=y
 
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 
+CONFIG_CMA=y
 
 CONFIG_NET=y
 
 CONFIG_PACKET=y
 
 CONFIG_UNIX=y
 
@@ -129,10 +129,9 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
 
 CONFIG_MEDIA_CONTROLLER=y
 
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 
 CONFIG_V4L_PLATFORM_DRIVERS=y
 
-CONFIG_SOC_CAMERA=y
 
-CONFIG_SOC_CAMERA_PLATFORM=y
 
 CONFIG_VIDEO_RCAR_VIN=y
 
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 
+CONFIG_VIDEO_RENESAS_FDP1=y
 
 CONFIG_VIDEO_RENESAS_JPU=y
 
 CONFIG_VIDEO_RENESAS_VSP1=y
 
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 
@@ -209,7 +208,6 @@ CONFIG_ROOT_NFS=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_ISO8859_1=y
 
 CONFIG_PRINTK_TIME=y
 
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
 
 # CONFIG_ENABLE_MUST_CHECK is not set
 
 CONFIG_DEBUG_KERNEL=y
 
 # CONFIG_ARM_UNWIND is not set

+ 20 - 0
arch/arm64/configs/defconfig
View File 

@@ -50,6 +50,8 @@ CONFIG_ARCH_ROCKCHIP=y
 
 CONFIG_ARCH_SEATTLE=y
 
 CONFIG_ARCH_SYNQUACER=y
 
 CONFIG_ARCH_RENESAS=y
 
+CONFIG_ARCH_R8A774A1=y
 
+CONFIG_ARCH_R8A774C0=y
 
 CONFIG_ARCH_R8A7795=y
 
 CONFIG_ARCH_R8A7796=y
 
 CONFIG_ARCH_R8A77965=y
 
@@ -68,6 +70,7 @@ CONFIG_ARCH_XGENE=y
 
 CONFIG_ARCH_ZX=y
 
 CONFIG_ARCH_ZYNQMP=y
 
 CONFIG_PCI=y
 
+CONFIG_PCIEPORTBUS=y
 
 CONFIG_PCI_IOV=y
 
 CONFIG_HOTPLUG_PCI=y
 
 CONFIG_HOTPLUG_PCI_ACPI=y
 
@@ -115,6 +118,7 @@ CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
 
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 
 CONFIG_ARM_SCPI_CPUFREQ=y
 
 CONFIG_ARM_TEGRA186_CPUFREQ=y
 
+CONFIG_TI_SCI_PROTOCOL=y
 
 CONFIG_NET=y
 
 CONFIG_PACKET=y
 
 CONFIG_UNIX=y
 
@@ -150,6 +154,9 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 
 CONFIG_VLAN_8021Q=m
 
 CONFIG_VLAN_8021Q_GVRP=y
 
 CONFIG_VLAN_8021Q_MVRP=y
 
+CONFIG_QRTR=m
 
+CONFIG_QRTR_SMD=m
 
+CONFIG_QRTR_TUN=m
 
 CONFIG_BPF_JIT=y
 
 CONFIG_BT=m
 
 CONFIG_BT_HIDP=m
 
@@ -222,6 +229,9 @@ CONFIG_THUNDER_NIC_PF=y
 
 CONFIG_HIX5HD2_GMAC=y
 
 CONFIG_HNS_DSAF=y
 
 CONFIG_HNS_ENET=y
 
+CONFIG_HNS3=y
 
+CONFIG_HNS3_HCLGE=y
 
+CONFIG_HNS3_ENET=y
 
 CONFIG_E1000E=y
 
 CONFIG_IGB=y
 
 CONFIG_IGBVF=y
 
@@ -279,6 +289,7 @@ CONFIG_SERIAL_8250_EXTENDED=y
 
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 
 CONFIG_SERIAL_8250_BCM2835AUX=y
 
 CONFIG_SERIAL_8250_DW=y
 
+CONFIG_SERIAL_8250_OMAP=y
 
 CONFIG_SERIAL_8250_MT6577=y
 
 CONFIG_SERIAL_8250_UNIPHIER=y
 
 CONFIG_SERIAL_OF_PLATFORM=y
 
@@ -434,6 +445,7 @@ CONFIG_DRM_EXYNOS_DSI=y
 
 CONFIG_DRM_EXYNOS_HDMI=y
 
 CONFIG_DRM_EXYNOS_MIC=y
 
 CONFIG_DRM_ROCKCHIP=m
 
+CONFIG_DRM_SUN4I=m
 
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 
 CONFIG_ROCKCHIP_CDN_DP=y
 
 CONFIG_ROCKCHIP_DW_HDMI=y
 
@@ -520,6 +532,7 @@ CONFIG_MMC_MESON_GX=y
 
 CONFIG_MMC_SDHCI_MSM=y
 
 CONFIG_MMC_SPI=y
 
 CONFIG_MMC_SDHI=y
 
+CONFIG_MMC_UNIPHIER=y
 
 CONFIG_MMC_DW=y
 
 CONFIG_MMC_DW_EXYNOS=y
 
 CONFIG_MMC_DW_HI3798CV200=y
 
@@ -577,6 +590,7 @@ CONFIG_COMMON_CLK_CS2000_CP=y
 
 CONFIG_COMMON_CLK_S2MPS11=y
 
 CONFIG_CLK_QORIQ=y
 
 CONFIG_COMMON_CLK_PWM=y
 
+CONFIG_TI_SCI_CLK=y
 
 CONFIG_COMMON_CLK_QCOM=y
 
 CONFIG_QCOM_CLK_SMD_RPM=y
 
 CONFIG_IPQ_GCC_8074=y
 
@@ -588,6 +602,7 @@ CONFIG_HWSPINLOCK_QCOM=y
 
 CONFIG_ARM_MHU=y
 
 CONFIG_PLATFORM_MHU=y
 
 CONFIG_BCM2835_MBOX=y
 
+CONFIG_TI_MESSAGE_MANAGER=y
 
 CONFIG_QCOM_APCS_IPC=y
 
 CONFIG_ROCKCHIP_IOMMU=y
 
 CONFIG_TEGRA_IOMMU_SMMU=y
 
@@ -608,6 +623,7 @@ CONFIG_ARCH_TEGRA_186_SOC=y
 
 CONFIG_ARCH_TEGRA_194_SOC=y
 
 CONFIG_ARCH_K3_AM6_SOC=y
 
 CONFIG_SOC_TI=y
 
+CONFIG_TI_SCI_PM_DOMAINS=y
 
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 
 CONFIG_EXTCON_USB_GPIO=y
 
 CONFIG_EXTCON_USBC_CROS_EC=y
 
@@ -627,6 +643,7 @@ CONFIG_PWM_RCAR=m
 
 CONFIG_PWM_ROCKCHIP=y
 
 CONFIG_PWM_SAMSUNG=y
 
 CONFIG_PWM_TEGRA=m
 
+CONFIG_RESET_TI_SCI=y
 
 CONFIG_PHY_XGENE=y
 
 CONFIG_PHY_SUN4I_USB=y
 
 CONFIG_PHY_HI6220_USB=y
 
@@ -638,10 +655,13 @@ CONFIG_PHY_QCOM_USB_HS=y
 
 CONFIG_PHY_RCAR_GEN3_USB2=y
 
 CONFIG_PHY_RCAR_GEN3_USB3=m
 
 CONFIG_PHY_ROCKCHIP_EMMC=y
 
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 
 CONFIG_PHY_ROCKCHIP_PCIE=m
 
 CONFIG_PHY_ROCKCHIP_TYPEC=y
 
 CONFIG_PHY_TEGRA_XUSB=y
 
+CONFIG_PHY_UNIPHIER_USB3=y
 
+CONFIG_PHY_UNIPHIER_USB2=y
 
 CONFIG_HISI_PMU=y
 
 CONFIG_QCOM_L2_PMU=y
 
 CONFIG_QCOM_L3_PMU=y