Skip to content

Commit 24a4351

Browse files
Linus Walleijarndb
authored andcommitted
ARM: config: Update Gemini defconfig
The Gemini defconfig needs to be updated due to DSA driver Kconfig changes in the v5.18 merge window: CONFIG_NET_DSA_REALTEK_SMI is now behind CONFIG_NET_DSA_REALTEK and the desired DSA switch need to be selected explicitly with CONFIG_NET_DSA_REALTEK_RTL8366RB. Take this opportunity to update some other minor config options: - CONFIG_MARVELL_PHY moved around because of Kconfig changes. - CONFIG_SENSORS_DRIVETEMP should be selected since is regulates the system critical alert temperature on some devices, which is nice if it is handled even if initramfs or root fails to mount. Fixes: 319a70a ("net: dsa: realtek-smi: move to subdirectory") Fixes: 765c39a ("net: dsa: realtek: convert subdrivers into modules") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com> Cc: Luiz Angelo Daros de Luca <luizluca@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 4f3d7e5 commit 24a4351

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

arch/arm/configs/gemini_defconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ CONFIG_ATA=y
4949
CONFIG_PATA_FTIDE010=y
5050
CONFIG_NETDEVICES=y
5151
CONFIG_TUN=y
52+
CONFIG_NET_DSA_REALTEK=y
5253
CONFIG_NET_DSA_REALTEK_SMI=y
54+
CONFIG_NET_DSA_REALTEK_RTL8366RB=y
5355
CONFIG_GEMINI_ETHERNET=y
56+
CONFIG_MARVELL_PHY=y
5457
CONFIG_MDIO_BITBANG=y
5558
CONFIG_MDIO_GPIO=y
56-
CONFIG_MARVELL_PHY=y
5759
CONFIG_INPUT_EVDEV=y
5860
CONFIG_KEYBOARD_GPIO=y
5961
# CONFIG_INPUT_MOUSE is not set
@@ -66,6 +68,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
6668
CONFIG_I2C_GPIO=y
6769
CONFIG_SPI=y
6870
CONFIG_SPI_GPIO=y
71+
CONFIG_SENSORS_DRIVETEMP=y
6972
CONFIG_SENSORS_GPIO_FAN=y
7073
CONFIG_SENSORS_LM75=y
7174
CONFIG_THERMAL=y

0 commit comments

Comments
 (0)