The defconfig has drifted over time, as Kconfig entries have changed order
or default values. Several maintainers ended up running 'savedefconfig'
themselves which caused a cascade of conflicts. Let's do it once and
for all in our tree before -rc2 instead.
Signed-off-by: Olof Johansson <olof@lixom.net>
* Enable in shmobile and multi_v7 defconfigs to give wider test coverage:
- Recently mainlined support for RZ/G1C (r8a77470) SoC
- Renesas Watchdog (RENESAS_WDT) which is used on
R-Car Gen2 and RZ/G1 platforms.
* Disable in shmobile and multi_v7 defconfigs to avoid unecessary bloat:
FB_SH_MOBILE_MERAM the last user of which was removed in v4.1 by
a521422ea4 ("ARM: shmobile: mackerel: Remove Legacy C board
code").
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE4nzZofWswv9L/nKF189kaWo3T74FAlr9SFwACgkQ189kaWo3
T752yg/+Jr9NOkyaSCT2m6XE/x87KsJZW1l8abBORQe+ATwQ+54ab6UMp8r1SzWi
hXPB0MyZhzTfPkWaAzg19mJqJ90TJXmvXDsV0YsIXxi6cp8Kudwie7ZzJEmMIWd5
c/sKZcvjCiSubc+NSFGlsW23ID0ChpD4/+3YSfRJaG2ZfaBjqjW7rln1S1+DuCwR
Jl0k4DvwVDtOb3p7auMLe/aE+AMS1tIXy+gCcdqZG03p2Hx29xz6qwElxmAAEJs3
rmi3V/RESrUnzMvko+u+bGRd1ytC8+6Vpj28pIqR8B2mg+fXxsZfl0cUF70OiI7Z
7Sb7UUPJCwqTATgz3HCqccIGK+KBt0lCQds8ogdfm3ixeYQzUKRnGUPLO0kevwD3
DahWscolbuDhTN2TwvjyMctSfk0QbuNTYpbzQNQLReMV+MBIjD+kKujBeJfDlZf7
xxNSPz/Z0r4IvnfuAX+6NcWKd2NVWyoztqyDEuqWFo3UqUciy+7Ol/Y/vozM1SwN
yNbQd9khzE1LEgm87nJFH6gsMpBJnAC4f329lDBgvDb/pPoxQ/NkvaQ/FuSzkCKV
Sr8ZUFBck/H+SYIdqPcM3TSRm7WCgDxOPB8bV2USfVFQ1c9v/R7cW0bpIo6uKytM
nGwqShWNWROhjIateQRNdowck2XpaSPi0lbesFzL8zrpBne10vg=
=q3Ut
-----END PGP SIGNATURE-----
Merge tag 'renesas-defconfig-for-v4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Renesas ARM Based SoC Defconfig Updates for v4.18
* Enable in shmobile and multi_v7 defconfigs to give wider test coverage:
- Recently mainlined support for RZ/G1C (r8a77470) SoC
- Renesas Watchdog (RENESAS_WDT) which is used on
R-Car Gen2 and RZ/G1 platforms.
* Disable in shmobile and multi_v7 defconfigs to avoid unecessary bloat:
FB_SH_MOBILE_MERAM the last user of which was removed in v4.1 by
a521422ea4 ("ARM: shmobile: mackerel: Remove Legacy C board
code").
* tag 'renesas-defconfig-for-v4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: multi_v7_defconfig: Enable RENESAS_WDT
ARM: shmobile: defconfig: Enable RENESAS_WDT_GEN
ARM: multi_v7_defconfig: Disable CONFIG_FB_SH_MOBILE_MERAM
ARM: shmobile: defconfig: Disable CONFIG_FB_SH_MOBILE_MERAM
ARM: multi_v7_defconfig: Enable r8a77470 SoC
ARM: shmobile: defconfig: Enable r8a77470 SoC
Signed-off-by: Olof Johansson <olof@lixom.net>
- Enable i.MX6SLL SoC support.
- Build in GPIO_MAX732X support as the GPIO expanders are used on
i.MX6 SabreAuto boards.
- Enable driver for RN5T618 PMIC and Marvell MWIFIEX support which
are found on i.MX6/7 Colibri boards.
- Build in OCOTP NVMEM driver for Vybrid (vf610) SoCs.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJbAYtyAAoJEFBXWFqHsHzOuJQH/2IdC1KHoeE1BB6LwVzShqLY
lCrg9MVcO87nkxbtBJk/drLIr8H/qfsZpnrHusY0VxfMFOF2C3j1dhWOMSIiakNh
bLlKxBGq7hANkIQ8k4KaLpK7XR3BPFUn/dkEBKKzNvs4i6JtcQ+fiVW/G5ytqcf9
5/p1uRYGPZ6KUSAaV2socchgymzyVNR8kWo6tBOlX91JyN5QsvwrKihMuu3JpBIp
9dsd9ylWHY2ELZeJ1fSBY/T+zePFpQAnHrzjvOhJQvPcvUNRMiDQnCA3Q5Dn2Mmy
c6FcCX5XY10g1F/xourkQzZN3V58l4oCjRQWij4VfEHwb6pRBXl+edth3StLNes=
=GSKa
-----END PGP SIGNATURE-----
Merge tag 'imx-defconfig-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig
i.MX defconfig update for 4.18:
- Enable i.MX6SLL SoC support.
- Build in GPIO_MAX732X support as the GPIO expanders are used on
i.MX6 SabreAuto boards.
- Enable driver for RN5T618 PMIC and Marvell MWIFIEX support which
are found on i.MX6/7 Colibri boards.
- Build in OCOTP NVMEM driver for Vybrid (vf610) SoCs.
* tag 'imx-defconfig-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: Select CONFIG_GPIO_MAX732X by default
ARM: imx_v6_v7_defconfig: enable imx6sll by default
ARM: imx_v6_v7_defconfig: enable Vybrid OCOTP driver
ARM: imx_v6_v7_defconfig: add mwifiex driver
ARM: imx_v6_v7_defconfig: add RN5T618 PMIC family support
Signed-off-by: Olof Johansson <olof@lixom.net>
R-Car Gen2 and RZ/G1 platforms come with a watchdog IP, therefore enable
its driver by default. It is enabled as a module to avoid increasing
the kernel image size.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
R-Car Gen2 and RZ/G1 platforms come with a watchdog IP, therefore enable
its driver by default.
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
4.18, please pull the following:
- Stefan provides a set of updates targeting the Raspberry Pi 3 B+
platform: LAN7515 USB Ethernet driver, Cypress CYW43455 Bluetooth and
he also enables the VCHIQ driver to help with continous testing on
kernelci.org.
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJa9crtAAoJEIfQlpxEBwcEMsYP/3a2D9QFd00TvZKO4I4SRaBp
mi7HmKDxp+JZkW6eYQT4vn4L+xyK3pG49hGS80FIhonGs6mGTk+hyw6b/fEhPKnW
mOkqufOsINhEbhwI/aVpKGFTokVrWyPHvZDYM0E6kwAs1YFxMlv/xnnydlyUyRfO
a30H4+dnPUVgcCkF8kQj0//pNxgd1ht7guzG8f7QqcmYy2pqQk+G61t3mC2z3Ok9
cE4ycUFG+D8gAUt3eXpF575ENIPGm6TWJeQ06iUSjlclOjkzke9zrr0CIZDGJHsO
jnTS8LXWiRLP+r1/iRvy+ED6aFhBZ05Fz9RLo8OS5JusVBN2jsYsLtSZ1TpLeOHY
HTmEj3cDlfhNpAajRD6M5pZzihUJEKKDFT/SpE9OebMq/Nt0MP4jjN5GSICDLoXy
d33vPrwu0UMvhFYaDCWhfKFTwZLgMUi4vbh67aoZgh59rIQBeEpOqXqQG0FTwDDX
Z6KHAY1Q3WaiX8k/lBlOvhzkP8wpTk4fa9ts+4ojYsPF46aruTT6YjVas+xM670r
Mye3QJj1ljjQjXMogRdgOvlwI3AHpz4ovjecCdc83mIHkhodFsruMdKdxsVRftt1
FA7jFANDvNtWeeqt9Gjc63qt1hGjWcbXEIYkZ0Iod2him36JGTPycrj4oaNzdC33
V0mSI+4v62EDSsCNM0Sn
=IODO
-----END PGP SIGNATURE-----
Merge tag 'arm-soc/for-4.18/defconfig' of https://github.com/Broadcom/stblinux into next/defconfig
This pull request contains Broadcom ARM-based SoCs defconfig changes for
4.18, please pull the following:
- Stefan provides a set of updates targeting the Raspberry Pi 3 B+
platform: LAN7515 USB Ethernet driver, Cypress CYW43455 Bluetooth and
he also enables the VCHIQ driver to help with continous testing on
kernelci.org.
* tag 'arm-soc/for-4.18/defconfig' of https://github.com/Broadcom/stblinux:
ARM: multi_v7_defconfig: Enable LAN and BT for RPi 3 B+
ARM: bcm2835_defconfig: Enable VCHIQ driver
ARM: bcm2835_defconfig: Enable LAN78XX driver
Signed-off-by: Olof Johansson <olof@lixom.net>
This patch adds STM32F7 I2C support to multi_v7_defconfig and
enable the STM32 USB PHY Controller (USBPHYC) driver, implemented on
STM32MP1 SoC.
Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
This enables the Amlogic Meson PWM controller. It is used for a dimmable
LED on some devices. Additionally some devices use it to generate the
32.768 kHz (low power oscillator) clock.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Some boards come with a PMIC (system power controller, for example Ricoh
RN5T618) which is connected through I2C.
Enable the Meson I2C driver so the devices on the I2C bus can be
registered during boot.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
This updates the Gemini defconfig with a config that will bring
up most of the recently merged and updated devices to some
functional level:
- We enable high resolution timers (the right thing to do)
- Enable CMA for the framebuffer, and the new TVE200
framebuffer driver and the Ilitek ILI9322 driver for
graphics on the D-Link DIR-685. HIGHMEM support comes in
as part of this.
- Enable networking and the new Cortina Gemini ethernet
driver.
- Enable MDIO over GPIO and the Realtek PHY devices used on
several of these systems.
- Enable I2C over GPIO and SPI over GPIO which is used on
several of these devices.
- Enable the Thermal framework, GPIO fan control and LM75 sensor
adding cooling on the D-Link DNS-313 with no userspace
involved even if only the kernel is working, rock solid
thermal for this platform.
- Enable JEDEC flash probing to support the Eon flash chip in
D-Link DNS-313.
- Enable LED disk triggers for the NAS type devices.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
The Raspberry Pi 3 B+ has a Microchip LAN7515 (connect via USB) and
a Cypress CYW43455 (connect via UART). This patch enables the necessary
drivers.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
In order to gain more test coverage (e.g. Kernel CI) enable
the VCHIQ driver.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
This patch enables the necessary driver for Raspberry Pi 3 B+,
which has a LAN7515 chip.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
Enable the remoteproc framework and the da8xx remoteproc driver by
default in the davinci defconfig.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
The last Renesas ARM platform using this driver was removed in commit
a521422ea4 ("ARM: shmobile: mackerel: Remove Legacy C board
code").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
The last Renesas ARM platform using this driver was removed in commit
a521422ea4 ("ARM: shmobile: mackerel: Remove Legacy C board
code").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Add a module with Samsung S6E63J0X03 DSI panel driver to enable support
for display panel on Exynos3250-based Samsung Rinato board.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Add Samsung S6E63J0X03 DSI panel driver to enable support for display
panel on Exynos3250-based Samsung Rinato board.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Enable Marvell mwifiex driver which is required to drive the
Wi2Wi WM828CC6 wireless module found on Colibri iMX6ULL.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This allows to successfully boot Colibri iMX7 which is using
the Ricoh RN5T567 PMIC.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Remove QSPI Sector 4K size force which is causing QSPI boot
problems with the JFFS2 root filesystem.
Fixes the following error:
"Magic bitmask 0x1985 not found at ..."
Cc: stable@vger.kernel.org
Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Enable FlexCAN support as module by default. FlexCAN can be found
on various NXP designs such as the i.MX and Vybrid SoC family.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This allows to successfully boot Colibri iMX7 which is using
the Ricoh RN5T567 PMIC.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Add GPMI NAND controller support as required by some NXP i.MX6/7
based boards.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Enable on-chip OTP NVMEM support for NXP i.MX and VF610 SoCs.
Since OTP values might be required by drivers required during
boot, make sure the driver is built-in (e.g. i.MX thermal
driver).
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
PMIC often require the I2C bus, and the PMIC regulators might be
necessary to power on eMMC/SD-card or other supplies required
for successful boot. Make sure I2C driver for i.MX devices is
built-in.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This series enables more devices working on droid4 to make it easier
for people and distros to use out of the box.
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlqz3MERHHRvbnlAYXRv
bWlkZS5jb20ACgkQG9Q+yVyrpXNBZhAA5E4KkoNvZSlKv2oLoUQ0CuOA/F9WIKJ3
bRcCNuLZSRSrrI7V739B69cR7e2HbSz4u4REYMdNwWI79IJBdlStqoy4UX2PMV0N
jshHWR7GqOBWn3JLhCWXKmeo3ezq9LQiiIR7YfawD1evy+2CzgvjuEmJOk+FTGEF
+K6A+fI/J5aTt/UcSXBgmhgjWjEoJp0NeDK1aSKB1GLid7owj5xjHqqbbkL2yin4
Sn3Vs5diQbgAoypTxOlpObMSjv293gmlS/EmB2CPKdav0M178UxMd6O9zfbQV4Bc
2iqxcIGUt558V9xAyGhv46Z6u4BlfzxaUVf4QksBM++Up9vwFYMkArUm0PUW30Wg
x0VZkdqZ5Tc1IFjZ9cgrfOGLeyWvqqd5LX5enpUJVlUbjJv+pWzU9/mhGZxnCaxv
Q8IUGgYRKwSsz2s95thACPmVa3vY9hOxcJe2KrlMzB8tDekerMFVL70W0WO2gnuH
xYptRrwpioRbAny74vIssWnl4UaaJAKkrVRMeSbLyZ+J88JReHMuWyHPEfIVrIGw
D4jWWWGHKd4gQ/h/dCmj2TU0Q2IHb8sUyx08GCngpsQT+jRHGW2ldDcsle9PYvwy
aiXcQwWy+9J7hJvk1q/gWMJtS04EanvfIP7OsPMNzrxOhSD25zKZFh4voYQVU2TQ
q6hx/TW16MI=
=sOYq
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v4.17/defconfig-pt2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Pull "Second set of defconfig changes for omap variants for v4.17" from Tony Lindgren:
This series enables more devices working on droid4 to make it easier
for people and distros to use out of the box.
* tag 'omap-for-v4.17/defconfig-pt2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: multi_v7_defconfig: Enable CPCAP related options mostly as loadable modules
ARM: omap2plus_defconfig: Add UINPUT
ARM: omap2plus_defconfig: Enable MDM6600 USB PHY
ARM: omap2plus_defconfig: Add AUDIO_GRAPH_CARD
ARM: omap2plus_defconfig: Enable PWM_VIBRA
DRM driver rather than the old fbdev driver.
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJasF+5AAoJEEEQszewGV1zJgkQAJTBwdiHz27RVKEONPkPcnFd
v95Molxg55Zyj38jJiLx4TVbNuIdshafh8GD584Au4Pc7mkqLoYnqPKJXRMAshPG
k77UJgJkbUYhY1/WrxIi9WmuPr7UEaKz1xCl37cKU9tu7tNMm5K89xAsj9Kk9/D+
PgAMza/G4h13UiEN/HWa4uwzjuy+HQWPji2kNJm8k3Vt/fd7eFfUK8POBJPLXP9z
FCg5CncgRfbpExM1wt305yBX5RxNJsL86wV/BiOGPeaJ1zvx6jOQsCjp527SehMi
w6icPRAb4pRibDmtMXudLxh/YiZd3RsrIktC8HHdg48cdEf8x8/30POM5sy5sIqs
uQABdCIRQQI2tLF2ljIt5LKFmVykC/JTYWF0t+0faV6GICL2NuXiiRY8jINgK+rD
dRoNtqz+0LH0p0Kkb3diyP8kt0p8O9iso0SlliKkrfvGW8Kcy8rok/qB0CbQnE2u
nNycoarV48P+IH7Q1AMEca6SI5/rs3j0v0v1/oc6UoPmx6VGcNwUbfI/ylpo0ckC
MMEborBmQBKnm9BosTRgweDuLMuz94nZti82KgoNvoqPyukcmoYFYqqfuak6aaVi
EAE3MFNl+pte1rUx/YBO4ks9LgoxMOezY1VNZYE7hM6OqOB8U1RlHB2vjQN7mFpK
KupmpNphbEi010ls2v8C
=Yh10
-----END PGP SIGNATURE-----
Merge tag 'armsoc-versatile-drm-defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc
Pull "defconfig changes for Versatile DRM" from Linus Walleij:
This augments the RealView and Versatile defconfig to use the PL111
DRM driver rather than the old fbdev driver.
* tag 'armsoc-versatile-drm-defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: defconfig: Configure Versatile boards to use PL111 DRM
ARM: defconfig: Update Versatile defconfig
ARM: defconfig: Switch RealView boards to use P111 DRM
ARM: defconfig: Update RealView defconfig
We need to enable MMC_SDHCI option in both omap2plus_defconfig and
multi_v7_defconfig so systems are able to mount root when the dts files
get updated for sdhci.
Then let's update omap2plus_defconfig so we can patch it easier. And as
Arnd noticed earlier, just running make savedefconfig will accidentally
drop few Kconfig options. This is happening because some options are no
longer available as loadable modules like LIRC. Or new dependencies have
been added such as SND_OSSEMUL for selecting SOUND_OSS_CORE.
So we first move the unchanged options around to their make savedefconfig
suggested place, then update the options to prevent make savedefconfig
dropping some options accidentally, and then finally drop the unused
options.
And after that we enable options DRM_OMAP and 8250_OMAP. These both have
been around for years now. And we do have 8250_OMAP warn about console
being redirected with SERIAL_8250_OMAP_TTYO_FIXUP option that is enabled
by default. Some users may need to update their inittab to use ttyS*
instead of ttyO* though. If this turns out to be a problem, we may want
to introduce a separate compatible for 8250-omap. But I think we're good
to go with the SERIAL_8250_OMAP_TTYO_FIXUP warning now. Let's not update
multi_v7_defconfig yet though and first see how 8250_OMAP change plays
out.
We also enable few new options for PM on am335x and am437x, and CEC in
omap2plus_defconfig. Naturally similar options can be later on added to
multi_v7_defconfig, but in this series we only enable OTG, MUSB and the
related PHYs in multi_v7_defconfig to make it more usable for distros.
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlqr41kRHHRvbnlAYXRv
bWlkZS5jb20ACgkQG9Q+yVyrpXNxjQ/+MgYwuKg0LqS08IAWjhvX/IMusflvEeDg
GT7hnBSV/8O9yqSwwqKYAKimxIZQxrYfEd6Bhv7RZqRfP91VruM+WRAi1ka1aglB
uVRmoIlGV8hcvys84y0S3xyNUlX5GKit3EYtYjP/qZfJceonZyf89U2GD6tGIrb4
uSsGhnqGjJ9cektWHG8SHrBfoxSGDmjWjdzcar6B4/oybwnvdCcjqlbu1+qfmvRC
GICglk9ud2EeisCzSk7bvQIjVHsgziL9czoeyb37I0IeKfG+7RS5mUjdCM35KF5f
OYgWkE1aqimhWG7ktZgI3VQQ89yNT3d1erhO8ZEsHTCS47vHJ4oYi6JXY+20Fp+0
UQKhKNWmv7GHkH60Sgd85dK3p7NuuBEzTcNJjMbJLzyPYWnphk64W6wylwiwTSW0
JWue4rax4t9akfaFfctF7k9F5Cskxj++t7aIg2xJutzEnuXR8L/p+u3dmEKEq9Jl
0dfhrwM+ceznXNACgVsZK4QUnHQCp/WPIWZc7YEWrCjfgNU/Q4j3n4DyPhZ2gEXS
h8l1ESLjUDoPy5GoX6Mfx06G2ImSOLdvFArWmVfi/uhPsaozi3cmrBEvCIRFRDg7
8vWB1r+aK928mL6zUmmpCv5YoZl7f7Fxnu4vBDbGn3FDKLWUaVXesdU9GmTc0jq3
KT55Il7PVxo=
=JiEi
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v4.17/defconfig-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Pull "Defconfig updates for omap variants for v4.17 merge window"
from Tony Lindgren:
We need to enable MMC_SDHCI option in both omap2plus_defconfig and
multi_v7_defconfig so systems are able to mount root when the dts files
get updated for sdhci.
Then let's update omap2plus_defconfig so we can patch it easier. And as
Arnd noticed earlier, just running make savedefconfig will accidentally
drop few Kconfig options. This is happening because some options are no
longer available as loadable modules like LIRC. Or new dependencies have
been added such as SND_OSSEMUL for selecting SOUND_OSS_CORE.
So we first move the unchanged options around to their make savedefconfig
suggested place, then update the options to prevent make savedefconfig
dropping some options accidentally, and then finally drop the unused
options.
And after that we enable options DRM_OMAP and 8250_OMAP. These both have
been around for years now. And we do have 8250_OMAP warn about console
being redirected with SERIAL_8250_OMAP_TTYO_FIXUP option that is enabled
by default. Some users may need to update their inittab to use ttyS*
instead of ttyO* though. If this turns out to be a problem, we may want
to introduce a separate compatible for 8250-omap. But I think we're good
to go with the SERIAL_8250_OMAP_TTYO_FIXUP warning now. Let's not update
multi_v7_defconfig yet though and first see how 8250_OMAP change plays
out.
We also enable few new options for PM on am335x and am437x, and CEC in
omap2plus_defconfig. Naturally similar options can be later on added to
multi_v7_defconfig, but in this series we only enable OTG, MUSB and the
related PHYs in multi_v7_defconfig to make it more usable for distros.
* tag 'omap-for-v4.17/defconfig-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: multi_v7_defconfig: Enable USB gadget configfs as loadable module
ARM: multi_v7_defconfig: Enable various USB PHYs found on omap variants
ARM: multi_v7_defconfig: Enable OTG and MUSB as loadable modules
ARM: omap2plus_defconfig: Enable 8250_OMAP
ARM: omap2plus_defconfig: Switch to use omapdrm by default
ARM: omap2plus_defconfig: Enable CEC
ARM: omap2plus_defconfig: Enable am335x and am437x PM options
ARM: omap2plus_defconfig: Drop unneeded options
ARM: omap2plus_defconfig: Add SND_OSSEMUL
ARM: omap2plus_defconfig: Update LIRC options
ARM: omap2plus_defconfig: Select MFD_TI_LMU
ARM: omap2plus_defconfig: Add SERIAL_DEV for bluetooth
ARM: omap2plus_defconfig: Update for moved options
ARM: omap2plus_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
ARM: multi_v7_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Updates to shmobile defconfig:
* Redresh defconfig to ease future maintenence overhead
* Disable CONFIG_EMBEDDED
Geert Uytterhoeven says "CONFIG_EXPERT exposes too many config options
that do not matter for development. E.g. it prohibits using the default
values for the various SH_SCI options. However, CONFIG_EMBEDDED selects
CONFIG_EXPERT, so it cannot be disabled.
Hence disable CONFIG_EMBEDDED, and compensate for the loss of
CONFIG_DEBUG_KERNEL by enabling the latter.
Actual impact, all harmless:
- CONFIG_NAMESPACES=y (plus a few related CONFIG_*_NS options),
- CONFIG_SYSCTL_SYSCALL=n,
- CONFIG_SERIAL_SH_SCI_NR_UARTS changed from 20 to 18,
- Some HID support became enabled,
- CONFIG_DEBUG_MEMORY_INIT=y,"
* Enable RZA1 pin controller
This allows the Genmai board with RZ/A1 (r7s72100) SoC to once
again boot using the shmobile defconfig.
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE4nzZofWswv9L/nKF189kaWo3T74FAlqrxKEACgkQ189kaWo3
T74k2hAAijFk6suGGzLl+03XL/iT/C95iOFgkzJlbQB1OiU4WFlfrOfq2CXEZwIw
ccAKiVDhaw2WEFDRrAlLDx95yP7vrzQnCDPLE8CM/ulWLFTbNgdfwNska0blE+++
kE/o6ljyutc5TScDZU/aKJoA/VJ48ud/N7nf2X4Lnkp+ClaFq/DOiI/fo78yKm56
XlMN6V7p2vUUna6yvFJQMgX27rDFDGSujZnZX3XKLEPlLLCQS0gFzSKmX5matyL9
j3QtCgFqENSWsOxjpWCfyTyaa5Ovs65LeYR352itKWIfqemRmcNkyhoVcQmkhz57
T41ZXULCYs7R5gCY3gywBhIZ7hwhFJq/RnAnHBDZJ9i3QdtRlVLNzgvqTGpQ7SWR
j9j8n+Nnopj4mdqaM3ri80NDMiVjfQnzAbAN5UXbYgTAlKbsBSQkX9hBhl5Vst4B
uvNe4dNWodVS3wCBea9cw7aRbkBnZ3fElbkNX0KaRMtLinjNj0dXkTIcLTJz1P6g
baGeC+gZnk20OqMEM0CHn/FjWFofJ7QcBmmTyhf+IBb6nScR8Fjku8AKeFM6zsls
Zz3Xzfc8DJ08RGLHCuu9hwB1WREPIcE8rXrpuFj/LBCHtbb7T/dCGoqiJN6oy+Ti
LOoT7E2eTgVJSI3p+LYhigSDiGN3eczlbxIdMqdXOv/piPyqI+k=
=+vqH
-----END PGP SIGNATURE-----
Merge tag 'renesas-defconfig-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM Based SoC Defconfig Updates for v4.17" from Simon Horman:
Updates to shmobile defconfig:
* Redresh defconfig to ease future maintenence overhead
* Disable CONFIG_EMBEDDED
Geert Uytterhoeven says "CONFIG_EXPERT exposes too many config options
that do not matter for development. E.g. it prohibits using the default
values for the various SH_SCI options. However, CONFIG_EMBEDDED selects
CONFIG_EXPERT, so it cannot be disabled.
Hence disable CONFIG_EMBEDDED, and compensate for the loss of
CONFIG_DEBUG_KERNEL by enabling the latter.
Actual impact, all harmless:
- CONFIG_NAMESPACES=y (plus a few related CONFIG_*_NS options),
- CONFIG_SYSCTL_SYSCALL=n,
- CONFIG_SERIAL_SH_SCI_NR_UARTS changed from 20 to 18,
- Some HID support became enabled,
- CONFIG_DEBUG_MEMORY_INIT=y,"
* Enable RZA1 pin controller
This allows the Genmai board with RZ/A1 (r7s72100) SoC to once
again boot using the shmobile defconfig.
* tag 'renesas-defconfig-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: defconfig: Disable CONFIG_EMBEDDED
ARM: shmobile: defconfig: Refresh
ARM: shmobile: Enable RZA1 pin controller
Re-sync the defconfig by doing:
make savedefconfig
cp defconfig arch/arm/configs/mxs_defconfig
So keep it in sync to help further changes in defconfig.
The explanation for removing the Kconfig symbols:
CONFIG_FHANDLE=y: verified that it is still selected
selected
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y: does not exist anymore
CONFIG_NVMEM=y: verified that it is still selected
CONFIG_LOCKUP_DETECTOR=y: need to select CONFIG_SOFTLOCKUP_DETECTOR now
CONFIG_TIMER_STATS=y: does not exist anymore
Boot tested on a imx28evk.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
fsl-asoc-card machine driver also supports sgtl5000, so use it favor
of the imx-sgtl5000 machine driver, which will be probably be removed
in the future.
Tested on a imx25-pdk board.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Re-sync the defconfig by doing:
make savedefconfig
cp defconfig arch/arm/configs/imx_v4_v5_defconfig
So keep it in sync to help further changes in defconfig.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
We need the CPCAP MFD and regulator built-in for UART console to work,
the rest can be loadable modules. Note that users probably want to also
enable serial 8250_OMAP that is not yet enabled by default.
Signed-off-by: Tony Lindgren <tony@atomide.com>
The DRM driver is now finalized for the Versatile board family,
so switch the defconfig to use this driver instead of the old
fbdev driver.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Olof Johansson