Currently merge_config.sh will unconditionally warn if a fragment overrides
any already set symbol. This is generally desirable but is inconvenient in
cases where we want to create a fragment which disables unwanted options in
the base configuration, for example when attempting to produce a smaller
version of another configuration.

Add an option -Q which will suppress these warnings.
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230203-arm64-defconfigs-v1-1-cd0694a05f13@kernel.orgSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Merge tag 'qcom-arm64-defconfig-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig

More ARM64 defconfig updates for v6.3

Here are two more defconfig updates for 6.3, enabling the SM8450 Display
clock controller driver, as well as the SDAM driver, a driver exposing
SRAM on newer Qualcomm PMICs to other devices.

* tag 'qcom-arm64-defconfig-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: defconfig: enable Qualcomm SDAM nvmem driver
  arm64: defconfig: enable SM8450 DISPCC clock driver
  arm64: defconfig: enable the clock driver for Qualcomm SA8775P platforms
  arm64: defconfig: enable Visionox VTDR6130 DSI Panel driver
  arm64: defconfig: enable SM8550 DISPCC clock driver
  arm64: defconfig: enable Qualcomm PCIe modem drivers
  arm64: defconfig: Enable SC8280XP Display Clock Controller
  arm64: defconfig: Enable GCC, TCSRCC, pinctrl and interconnect for SM8550
  arm64: defconfig: enable crypto userspace API
  arm64: defconfig: build SDM_LPASSCC_845 as a module
  arm64: defconfig: enable camera on Thundercomm RB5 platform
  arm64: defconfig: build PINCTRL_SM8250_LPASS_LPI as module
  arm64: defconfig: Enable Qualcomm EUD

Link: https://lore.kernel.org/r/20230210181516.2021902-1-andersson@kernel.orgSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Some Kconfig options have moved around, so adapt the defconfig files
accordingly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Some Kconfig options has moved around after a 'make savedefconfig' run,
so move them to their new location to make it easier to see what other
options got removed.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

The SDAM nvmem driver can be used to access the Shared Direct Access
Memory Module registers in some Qualcomm PMICs.

These registers can specifically be used to store a time offset on
platforms where the PMIC RTC time registers are read-only in order to
allow the RTC time to be updated.
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230202155448.6715-19-johan+linaro@kernel.org

Build the Qualcomm SM8450 Display Clock Controller driver as a module
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230127-topic-sm8450-upstream-defconfig-v1-1-93cf603db08b@linaro.org

ARM systems are often memory constrained and more often than not
use slow single-channel storage such as flash memory or MMC/SD-cards.
For any interactive systems (such as mobile phones, tablets,
chromebooks...) the BFQ I/O scheduler will be desireable.

Make sure the BFQ I/O scheduler is available on these systems.

Loongarch, MIPS, m68k, UM and S390 has also enabled BFQ in their
defconfigs, cf commit b495dfed
"um: Cleanup CONFIG_IOSCHED_CFQ" where the motivation is that
it replaces the former CFQ scheduler.

Cc: Paolo Valente <paolo.valente@linaro.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230203140404.1125850-1-linus.walleij@linaro.orgSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Enable the STMicroelectronics NVMEM drivers used on
STM32 MPU, STM32MP15x and STM32MP13x, to access OTPs.
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
Link: https://lore.kernel.org/r/20230202130040.25233-1-alexandre.torgue@foss.st.comSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Merge tag 'v6.2-next-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into soc/defconfig

Enable config options needed to boot mt8192 based Chromebooks

* tag 'v6.2-next-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm64: defconfig: Enable DMA_RESTRICTED_POOL
  arm64: defconfig: Enable missing configs for mt8192-asurada

Link: https://lore.kernel.org/r/2330b914-8a8e-8bf3-e98e-88d713c5224d@gmail.comSigned-off-by: Arnd Bergmann <arnd@arndb.de>

This defconfig aims to offer a reasonable set of defaults for all
systems running on a Nuvoton WPCM450 chip.
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20230129041547.942335-1-j.neuschaefer@gmx.netSigned-off-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20230201051534.1005847-1-joel@jms.id.auSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Enable support for restricted DMA pools which provide a level of DMA
memory protection on systems with limited hardware protection
capabilities, such as those lacking an IOMMU.

For instance, mt8192-asurada-spherion makes use of this to provide a
restricted DMA region for WiFi since its MT7921E WiFi card is connected
through PCIe, and the MT8192 SoC doesn't have an IOMMU context for the
PCIe controller.
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://lore.kernel.org/r/20230130200820.82084-2-nfraprado@collabora.comSigned-off-by: Matthias Brugger <matthias.bgg@gmail.com>

Enable missing configs in the arm64 defconfig to get all devices probing
on mt8192-asurada based machines.

The devices enabled are: MediaTek Bluetooth USB controller, MediaTek
PCIe Gen3 MAC controller, MT7921E wireless adapter, Elan I2C Trackpad,
MediaTek SPI NOR flash controller, Mediatek SPMI Controller, ChromeOS EC
regulators, MT6315 PMIC, MediaTek Video Codec, MT8192 sound cards,
ChromeOS EC rpmsg communication, all MT8192 clocks.

REGULATOR_CROS_EC is enabled as builtin since it powers the MMC
controller for the SD card, making it required for booting on some
setups.

The MT8192 clocks are enabled as builtin for now since their Kconfigs
are bool, and will be changed to modules after those Kconfigs are
reworked.

Restricted DMA pool support is also required to get working WiFi, but
it is enabled in a separate commit since it alters behavior of other
platforms and devices.

By enabling the support for all of this platform's devices on the
defconfig we make it effortless to test the relevant hardware both by
developers as well as CI systems like KernelCI.
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://lore.kernel.org/r/20230130200820.82084-1-nfraprado@collabora.comSigned-off-by: Matthias Brugger <matthias.bgg@gmail.com>

Merge tag 'imx-defconfig-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig

i.MX defconfig change for 6.3:

- Drop PROVE_LOCKING option from imx_v6_v7_defconfig.
- Enable i.MX ICC and DEVFREQ driver as they are required by i.MX8MP
  boot.

* tag 'imx-defconfig-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Don't enable PROVE_LOCKING
  arm64: defconfig: select i.MX ICC and DEVFREQ

Link: https://lore.kernel.org/r/20230130023947.11780-6-shawnguo@kernel.orgSigned-off-by: Arnd Bergmann <arnd@arndb.de>

This pull request contains Broadcom ARM SoCs defconfig updates for 6.3,
please pull the following:

- Stefan enables the necessary configuration options to make use of the
  framebuffer on Raspberry Pi devices

* tag 'arm-soc/for-6.3/defconfig' of https://github.com/Broadcom/stblinux:
  ARM: bcm2835_defconfig: Switch to SimpleDRM
  ARM: bcm2835_defconfig: Enable the framebuffer

Link: https://lore.kernel.org/r/20230128193823.1628716-1-f.fainelli@gmail.comSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Merge tag 'sunxi-config-for-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/defconfig

- Enable Allwinner D1 platform and drivers

* tag 'sunxi-config-for-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  riscv: defconfig: Enable the Allwinner D1 platform and drivers

Link: https://lore.kernel.org/r/Y9Ra7dxkfMI9Xp3F@jernej-laptopSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Now that several D1-based boards are supported, enable the platform in
our defconfig. Build in the drivers which are necessary to boot, such as
the pinctrl, MMC, RTC (which provides critical clocks), SPI (for flash),
and watchdog (which may be left enabled by the bootloader). Other common
onboard peripherals are enabled as modules.
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Reviewed-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Heiko Stuebner <heiko.stuebner@vrull.eu>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Link: https://lore.kernel.org/r/20230126045738.47903-12-samuel@sholland.orgSigned-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>

For some reason that is unclear to me the i.MX defconfig for v6 and v7
boards enables PROVE_LOCKING.  Since the defconfigs are generally
intended to be more production style configurations this doesn't seem
particularly intentional so drop this from the defconfig.
Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

In order for HPE platforms to be supported by linux on GXP it is
necessary for there to be fan and spi driver support. There fan driver
can support up to 16 fans that are driven by pwm through the CPLD. The
SPI driver supports access to the core flash and bios part. The SPI
driver spi-gxp was added previously to linux.
Signed-off-by: Nick Hawkins <nick.hawkins@hpe.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230113160651.51201-3-nick.hawkins@hpe.comSigned-off-by: Arnd Bergmann <arnd@arndb.de>

The only missing configuration option preventing us from using
multi_v7_defconfig with the Raspberry Pi 4 is ARM_LPAE. It's needed as
the PCIe controller found on the SoC depends on 64bit addressing, yet
can't be included as not all v7 boards support LPAE.

Introduce multi_v7_lpae_defconfig, built off multi_v7_defconfig, which will
avoid us having to duplicate and maintain multiple similar configurations.

Needless to say the Raspberry Pi 4 is not the only platform that can
benefit from this new configuration.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20230124110213.3221264-11-alexander.stein@ew.tq-group.comSigned-off-by: Arnd Bergmann <arnd@arndb.de>

So far this function was only used locally in powerpc, some other
architectures might benefit from it. Move it into
scripts/Makefile.defconf.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20230124110213.3221264-10-alexander.stein@ew.tq-group.comSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Enable drivers used on TQMLS102xA + MBLS1021A.
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20230124110213.3221264-9-alexander.stein@ew.tq-group.comSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Merge tag 'renesas-arm-defconfig-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig

Renesas ARM defconfig updates for v6.3

  - Enable support for the Renesas RZ/G2L MIPI DSI, CSI-2, and Camera
    Receiving Unit drivers in the arm64 defconfig,
  - Refresh shmobile_defconfig for v6.1-rc5.

* tag 'renesas-arm-defconfig-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  arm64: defconfig: Enable RZ/G2L MIPI CSI-2 and CRU support
  ARM: shmobile: defconfig: Refresh for v6.1-rc5
  arm64: defconfig: Enable Renesas RZ/G2L MIPI DSI driver

Link: https://lore.kernel.org/r/cover.1673702289.git.geert+renesas@glider.beSigned-off-by: Arnd Bergmann <arnd@arndb.de>

A GPIO based I2C bus is used by at least some Atmel reference boards,
including the AT91SAM9G20-EK which is in CI, enable the driver as a
module to improve test coverage and help users of systems that happen to
use it.
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230109-arm-multi-v5-i2c-gpio-v1-1-78e191358548@kernel.orgSigned-off-by: Arnd Bergmann <arnd@arndb.de>

The wm896x series of audio CODECs is used on a number of Freescale
reference designs, enable the drivers in multi_v7_defconfig to improve
testing coverage of those systems and their derivatives.
Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20230106-arm-wm896x-v1-1-441c564a9cd1@kernel.orgSigned-off-by: Arnd Bergmann <arnd@arndb.de>

fbdev is consider deprecated, so switch to DRM_SIMPLEDRM which works
as a drop-in replacement for FB_SIMPLE.
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/20230113205842.17051-2-stefan.wahren@i2se.comSigned-off-by: Florian Fainelli <f.fainelli@gmail.com>

Booting Linux on a Raspberry Pi based on bcm2835_defconfig there is
no display activity.

Enable CONFIG_FB which is nowadays required for CONFIG_FB_SIMPLE
and CONFIG_FRAMEBUFFER_CONSOLE.

Fixes: f611b1e7 ("drm: Avoid circular dependencies for CONFIG_FB")
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/20230113205842.17051-1-stefan.wahren@i2se.comSigned-off-by: Florian Fainelli <f.fainelli@gmail.com>

Enable the GCC clock driver on SA8775P platforms. It needs to be built-in
for console to work.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230109174511.1740856-4-brgl@bgdev.pl

Build the Visionox VTDR6130 DSI Panel driver as module
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230110-topic-sm8550-disp-defconfig-v3-2-11b558f7ff5d@linaro.org

Build the Qualcomm SM8550 Display Clock Controller driver as a module
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230110-topic-sm8550-disp-defconfig-v3-1-11b558f7ff5d@linaro.org

Enable the MHI PCI controller driver and the MHI NET and WWAN drivers
for Qualcomm based PCIe modems such as the ones found on the SC8280XP
Compute Reference Design (CRD) and Lenovo Thinkpad X13s.
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230115174450.11041-1-johan+linaro@kernel.org

The Display Clock Controller provides clocks and power-domains for
the display subsystem, enable this to enable display on the SC8280XP.

Now that power-domains can probe defer past late_initcall() this should
be possible to leave as module.
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230111035906.2975494-5-quic_bjorande@quicinc.com

Add the SM8550 GCC, TCSRCC, interconnect and pinctrl drivers as built-in.
All of these are necessary for the Qualcomm SM8550 platform to boot
to shell.
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230111080254.1181325-1-abel.vesa@linaro.org

Enable CONFIG_CRYPTO_USER so that libkcapi can be used. This was tested
using kcapi-rng on a Qualcomm SA8540p automotive development board.
Signed-off-by: Brian Masney <bmasney@redhat.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221214174607.2948497-1-bmasney@redhat.com

Enable the low-power clock controller driver used on Qualcomm SDM845
platform (Thundercomm RB3 board).
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221210194500.464556-3-dmitry.baryshkov@linaro.org

Enable VIDEO_IMX412 and SM_CAMCC_825 to enable camera on Thundercomm RB5
platform.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221210194500.464556-2-dmitry.baryshkov@linaro.org

Enable the driver used to drive sound-related pins on Qualcomm SM8250
platform (Thundercomm RB5 board).
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221210194500.464556-1-dmitry.baryshkov@linaro.org

Increase build and test coverage by enabling support for the Renesas
RZ/G2L MIPI CSI-2 Receiver and the RZ/G2L Camera Receiving Unit, as used
on the RZ/G2L SMARC EVK development board.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/32098bf6a5e78a4bcc6398ccb5db0b01f1afc9b9.1672747428.git.geert+renesas@glider.be

Refresh the defconfig for Renesas ARM systems:
  - Disable CONFIG_DRM_RCAR_USE_MIPI_DSI (defaults to yes since commit
    a830a156 ("drm: rcar-du: Fix Kconfig dependency between
    RCAR_DU and RCAR_MIPI_DSI"), but only used on R-Car V3U).
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/4f7757bd700edff487df387ca40ffb1524d688a4.1672744302.git.geert+renesas@glider.be

i.MX ICC and DEVFREQ driver is required for i.MX8MP normal boot,
because the BLK CTRL power domain driver requires QoS configuraton.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>