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.
Merge conflicts:
arch/arm/configs/exynos_defconfig: Add/remove conflict w/ Russell's tree
Remove CONFIG_ARCH_EXYNOS3=y
Keep CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
----------------------------------------------------------------
The following changes since commit 77e071a5638b7d1a6a63fde99f1d23608539ce49:
Merge tag 'armsoc-dt' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
tags/armsoc-defconfig
for you to fetch changes up to a151f27537250cf869c8d1c2549ccbb77dcbec2f:
Merge tag 'samsung-defconfig-5.3' of
https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/defconfig
----------------------------------------------------------------
Abel Vesa (1):
arm64: defconfig: Enable RTC_DRV_SNVS
Adam Ford (1):
ARM: imx_v6_v7_defconfig: Add GPIO_PCF857X
Amelie Delaunay (1):
ARM: multi_v7_defconfig: enable STMFX pinctrl support
Anson Huang (6):
arm64: defconfig: add support for i.MX system controller watchdog
ARM: imx_v6_v7_defconfig: Enable CONFIG_THERMAL_STATISTICS
ARM: imx_v6_v7_defconfig: Add TPM PWM support by default
arm64: defconfig: Enable CONFIG_QORIQ_THERMAL
arm64: defconfig: Add i.MX SCU SoC info driver
arm64: defconfig: Enable CONFIG_KEYBOARD_SNVS_PWRKEY as module
Biju Das (2):
ARM: shmobile: Remove GENERIC_PHY from shmobile_defconfig
arm64: defconfig: enable TYPEC_HD3SS3220 config option
Brian Masney (2):
ARM: qcom_defconfig: add display-related options
ARM: qcom_defconfig: add support for USB networking
Clément Péron (2):
arm64: defconfig: enable sunxi watchdog
arm64: defconfig: enable Allwinner DMA drivers
Fabio Estevam (3):
arm64: defconfig: Enable CONFIG_SPI_IMX
ARM: imx_v6_v7_defconfig: Enable the OV2680 camera driver
ARM: imx_v6_v7_defconfig: Select CONFIG_NVMEM_SNVS_LPGPR
Fabrizio Castro (1):
arm64: defconfig: Enable TDA19988
Joel Stanley (3):
ARM: configs: aspeed: Add new drivers
ARM: configs: multi_v5: Add more ASPEED devices
ARM: configs: multi_v5: Remove duplicate ASPEED options
Krzysztof Kozlowski (7):
ARM: exynos_defconfig: Trim and reorganize with savedefconfig
ARM: defconfig: samsung: Cleanup with savedefconfig
ARM: config: Remove left-over BACKLIGHT_LCD_SUPPORT
arm64: configs: Remove useless UEVENT_HELPER_PATH
ARM: configs: Remove useless UEVENT_HELPER_PATH
ARM: multi_v7_defconfig: Enable Panfrost and Lima drivers
ARM: exynos_defconfig: Enable Panfrost and Lima drivers
Leonard Crestez (6):
arm64: defconfig: Enable imx8mm clk/pinctrl
arm64: defconfig: Enable lpi2c for imx8qxp and sensors
arm64: defconfig: Enable ROHM_BD718XX PMIC for imx8mm-evk
arm64: defconfig: NVMEM_IMX_OCOTP=y for imx8m
arm64: defconfig: ARM_IMX_CPUFREQ_DT=m
ARM: imx_v6_v7_defconfig: Enable CONFIG_ARM_IMX_CPUFREQ_DT
Marcin Juszkiewicz (3):
arm64 defconfig: enable MPT3 SAS and BNX2X drivers
arm64 defconfig: enable Mellanox cards
arm64 defconfig: enable LVM support
Neil Armstrong (2):
arm64: defconfig: enable Lima driver
ARM: multi_v7_defconfig: enable Lima driver
Nicolin Chen (1):
arm64: defconfig: Add HWMON INA3221 support
Olof Johansson (8):
Merge tag 'qcom-defconfig-for-5.3' of git://git.kernel.org/.../qcom/linux
into arm/defconfig
Merge tag 'renesas-arm-defconfig-for-v5.3' of
https://git.kernel.org/.../horms/renesas into arm/defconfig
Merge tag 'renesas-arm64-defconfig-for-v5.3' of
https://git.kernel.org/.../horms/renesas into arm/defconfig
Merge tag 'tegra-for-5.3-arm64-defconfig' of
git://git.kernel.org/.../tegra/linux into arm/defconfig
Merge tag 'aspeed-5.3-defconfig' of git://git.kernel.org/.../joel/aspeed
into arm/defconfig
Merge tag 'sunxi-config64-for-5.3-201906210813' of
https://git.kernel.org/.../sunxi/linux into arm/defconfig
Merge tag 'imx-defconfig-5.3' of git://git.kernel.org/.../shawnguo/linux
into arm/defconfig
Merge tag 'samsung-defconfig-5.3' of
https://git.kernel.org/.../krzk/linux into arm/defconfig
Peng Fan (1):
defconfig: arm64: enable i.MX8 SCU octop driver
Tomeu Vizoso (2):
ARM: multi_v7_defconfig: add Panfrost driver
arm64: defconfig: add Panfrost driver
Uwe Kleine-König (1):
ARM: imx_v6_v7_defconfig: Enable SIOX bus
Vidya Sagar (1):
arm64: defconfig: Add Tegra194 PCIe driver
Yangtao Li (1):
arm64: defconfig: add allwinner sid support
arch/arm/configs/acs5k_defconfig | 1 -
arch/arm/configs/acs5k_tiny_defconfig | 1 -
arch/arm/configs/am200epdkit_defconfig | 1 -
arch/arm/configs/aspeed_g4_defconfig | 11 +++--
arch/arm/configs/aspeed_g5_defconfig | 15 ++++--
arch/arm/configs/at91_dt_defconfig | 1 -
arch/arm/configs/axm55xx_defconfig | 1 -
arch/arm/configs/cm_x2xx_defconfig | 2 -
arch/arm/configs/cm_x300_defconfig | 2 -
arch/arm/configs/cns3420vb_defconfig | 1 -
arch/arm/configs/colibri_pxa270_defconfig | 2 -
arch/arm/configs/colibri_pxa300_defconfig | 2 -
arch/arm/configs/collie_defconfig | 1 -
arch/arm/configs/corgi_defconfig | 2 -
arch/arm/configs/dove_defconfig | 1 -
arch/arm/configs/em_x270_defconfig | 2 -
arch/arm/configs/ep93xx_defconfig | 1 -
arch/arm/configs/eseries_pxa_defconfig | 2 -
arch/arm/configs/exynos_defconfig | 66 +++++++++++---------------
arch/arm/configs/ezx_defconfig | 2 -
arch/arm/configs/gemini_defconfig | 1 -
arch/arm/configs/h3600_defconfig | 1 -
arch/arm/configs/h5000_defconfig | 1 -
arch/arm/configs/imote2_defconfig | 2 -
arch/arm/configs/imx_v4_v5_defconfig | 1 -
arch/arm/configs/imx_v6_v7_defconfig | 9 ++++
arch/arm/configs/integrator_defconfig | 1 -
arch/arm/configs/iop13xx_defconfig | 1 -
arch/arm/configs/iop32x_defconfig | 1 -
arch/arm/configs/iop33x_defconfig | 1 -
arch/arm/configs/ixp4xx_defconfig | 1 -
arch/arm/configs/jornada720_defconfig | 2 -
arch/arm/configs/keystone_defconfig | 1 -
arch/arm/configs/ks8695_defconfig | 1 -
arch/arm/configs/lpc18xx_defconfig | 1 -
arch/arm/configs/lpc32xx_defconfig | 2 -
arch/arm/configs/magician_defconfig | 2 -
arch/arm/configs/mini2440_defconfig | 45 +++++++-----------
arch/arm/configs/mmp2_defconfig | 1 -
arch/arm/configs/moxart_defconfig | 1 -
arch/arm/configs/multi_v5_defconfig | 11 +++--
arch/arm/configs/multi_v7_defconfig | 4 +-
arch/arm/configs/mv78xx0_defconfig | 1 -
arch/arm/configs/mvebu_v5_defconfig | 1 -
arch/arm/configs/mvebu_v7_defconfig | 1 -
arch/arm/configs/mxs_defconfig | 1 -
arch/arm/configs/nhk8815_defconfig | 2 -
arch/arm/configs/nuc910_defconfig | 1 -
arch/arm/configs/nuc950_defconfig | 1 -
arch/arm/configs/nuc960_defconfig | 1 -
arch/arm/configs/omap1_defconfig | 2 -
arch/arm/configs/orion5x_defconfig | 1 -
arch/arm/configs/palmz72_defconfig | 2 -
arch/arm/configs/pcm027_defconfig | 1 -
arch/arm/configs/prima2_defconfig | 1 -
arch/arm/configs/pxa168_defconfig | 1 -
arch/arm/configs/pxa3xx_defconfig | 2 -
arch/arm/configs/pxa910_defconfig | 1 -
arch/arm/configs/pxa_defconfig | 2 -
arch/arm/configs/qcom_defconfig | 7 ++-
arch/arm/configs/realview_defconfig | 2 -
arch/arm/configs/s3c2410_defconfig | 25 ++++------
arch/arm/configs/s3c6400_defconfig | 13 ++---
arch/arm/configs/s5pv210_defconfig | 1 -
arch/arm/configs/sama5_defconfig | 2 -
arch/arm/configs/shmobile_defconfig | 1 -
arch/arm/configs/socfpga_defconfig | 1 -
arch/arm/configs/spear13xx_defconfig | 1 -
arch/arm/configs/spear3xx_defconfig | 2 -
arch/arm/configs/spear6xx_defconfig | 1 -
arch/arm/configs/spitz_defconfig | 2 -
arch/arm/configs/tango4_defconfig | 1 -
arch/arm/configs/tct_hammer_defconfig | 1 -
arch/arm/configs/trizeps4_defconfig | 1 -
arch/arm/configs/u300_defconfig | 2 -
arch/arm/configs/u8500_defconfig | 1 -
arch/arm/configs/versatile_defconfig | 1 -
arch/arm/configs/vexpress_defconfig | 2 -
arch/arm/configs/viper_defconfig | 2 -
arch/arm/configs/xcep_defconfig | 1 -
arch/arm/configs/zeus_defconfig | 2 -
arch/arm/configs/zx_defconfig | 1 -
arch/arm64/configs/defconfig | 44 ++++++++++++++++-
83 files changed, 149 insertions(+), 198 deletions(-)
