Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soc: aspeed: Improve kconfig

Reword the kconfig text to be consistent and reflect that most drivers
are available for all supported ASPEED chips (2400, 2500 and 2600).

Rearrange the symbols the SoC drivers depend on so the menu doesn't
appear unless you are building for ASPEED for compile testing.

The SYSCON_MFD and REGMAP options are usually selected by drivers that
need them, so do this.

Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Link: https://lore.kernel.org/r/20200916125731.784527-1-joel@jms.id.au
Signed-off-by: Joel Stanley <joel@jms.id.au>

+21 -17
+1 -1
drivers/soc/Makefile
··· 4 4 # 5 5 6 6 obj-$(CONFIG_ARCH_ACTIONS) += actions/ 7 - obj-$(CONFIG_SOC_ASPEED) += aspeed/ 7 + obj-y += aspeed/ 8 8 obj-$(CONFIG_ARCH_AT91) += atmel/ 9 9 obj-y += bcm/ 10 10 obj-$(CONFIG_ARCH_DOVE) += dove/
+20 -16
drivers/soc/aspeed/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - menu "Aspeed SoC drivers" 3 2 4 - config SOC_ASPEED 5 - def_bool y 6 - depends on ARCH_ASPEED || COMPILE_TEST 3 + if ARCH_ASPEED || COMPILE_TEST 4 + 5 + menu "ASPEED SoC drivers" 7 6 8 7 config ASPEED_LPC_CTRL 9 - depends on SOC_ASPEED && REGMAP && MFD_SYSCON 10 - tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control" 8 + tristate "ASPEED LPC firmware cycle control" 9 + select REGMAP 10 + select MFD_SYSCON 11 11 help 12 - Control Aspeed ast2400/2500 HOST LPC to BMC mappings through 13 - ioctl()s, the driver also provides a read/write interface to a BMC ram 14 - region where the host LPC read/write region can be buffered. 12 + Control LPC firmware cycle mappings through ioctl()s. The driver 13 + also provides a read/write interface to a BMC ram region where the 14 + host LPC read/write region can be buffered. 15 15 16 16 config ASPEED_LPC_SNOOP 17 - tristate "Aspeed ast2500 HOST LPC snoop support" 18 - depends on SOC_ASPEED && REGMAP && MFD_SYSCON 17 + tristate "ASPEED LPC snoop support" 18 + select REGMAP 19 + select MFD_SYSCON 19 20 help 20 21 Provides a driver to control the LPC snoop interface which 21 22 allows the BMC to listen on and save the data written by 22 23 the host to an arbitrary LPC I/O port. 23 24 24 25 config ASPEED_P2A_CTRL 25 - depends on SOC_ASPEED && REGMAP && MFD_SYSCON 26 - tristate "Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC bridge control" 26 + tristate "ASPEED P2A (VGA MMIO to BMC) bridge control" 27 + select REGMAP 28 + select MFD_SYSCON 27 29 help 28 - Control Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC mappings through 29 - ioctl()s, the driver also provides an interface for userspace mappings to 30 - a pre-defined region. 30 + Control ASPEED P2A VGA MMIO to BMC mappings through ioctl()s. The 31 + driver also provides an interface for userspace mappings to a 32 + pre-defined region. 31 33 32 34 endmenu 35 + 36 + endif