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>

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 36452bed86efb38e7286f3392a6a6dbf7d964631..8fa43a2d17e79a2ed5d624c91fbcc40ba7030fba 100644 (file)
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -4,7 +4,7 @@
 #
 
 obj-$(CONFIG_ARCH_ACTIONS)     += actions/
-obj-$(CONFIG_SOC_ASPEED)       += aspeed/
+obj-y                          += aspeed/
 obj-$(CONFIG_ARCH_AT91)                += atmel/
 obj-y                          += bcm/
 obj-$(CONFIG_ARCH_DOVE)                += dove/

diff --git a/drivers/soc/aspeed/Kconfig b/drivers/soc/aspeed/Kconfig
index c95fa30f1a765e51d4fa21863b83c7cbd2fc329e..9ce252445605ab57357e381819e9c3fdc9065b55 100644 (file)
--- a/drivers/soc/aspeed/Kconfig
+++ b/drivers/soc/aspeed/Kconfig
@@ -1,32 +1,36 @@
 # SPDX-License-Identifier: GPL-2.0-only
-menu "Aspeed SoC drivers"
 
-config SOC_ASPEED
-       def_bool y
-       depends on ARCH_ASPEED || COMPILE_TEST
+if ARCH_ASPEED || COMPILE_TEST
+
+menu "ASPEED SoC drivers"
 
 config ASPEED_LPC_CTRL
-       depends on SOC_ASPEED && REGMAP && MFD_SYSCON
-       tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control"
+       tristate "ASPEED LPC firmware cycle control"
+       select REGMAP
+       select MFD_SYSCON
        help
-         Control Aspeed ast2400/2500 HOST LPC to BMC mappings through
-         ioctl()s, the driver also provides a read/write interface to a BMC ram
-         region where the host LPC read/write region can be buffered.
+         Control LPC firmware cycle mappings through ioctl()s. The driver
+         also provides a read/write interface to a BMC ram region where the
+         host LPC read/write region can be buffered.
 
 config ASPEED_LPC_SNOOP
-       tristate "Aspeed ast2500 HOST LPC snoop support"
-       depends on SOC_ASPEED && REGMAP && MFD_SYSCON
+       tristate "ASPEED LPC snoop support"
+       select REGMAP
+       select MFD_SYSCON
        help
          Provides a driver to control the LPC snoop interface which
          allows the BMC to listen on and save the data written by
          the host to an arbitrary LPC I/O port.
 
 config ASPEED_P2A_CTRL
-       depends on SOC_ASPEED && REGMAP && MFD_SYSCON
-       tristate "Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC bridge control"
+       tristate "ASPEED P2A (VGA MMIO to BMC) bridge control"
+       select REGMAP
+       select MFD_SYSCON
        help
-         Control Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC mappings through
-         ioctl()s, the driver also provides an interface for userspace mappings to
-         a pre-defined region.
+         Control ASPEED P2A VGA MMIO to BMC mappings through ioctl()s.  The
+         driver also provides an interface for userspace mappings to a
+         pre-defined region.
 
 endmenu
+
+endif