Since the core is not usable without one of the bus modules it should not
be presented in the UI but should instead be selected by the bus modules.
Signed-off-by: Mark Brown <[email protected]>
---
drivers/mfd/Kconfig | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index ffb7c05..8bc76aa 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -614,7 +614,7 @@ config MFD_MC13783
tristate
config MFD_MC13XXX
- tristate "Support Freescale MC13783 and MC13892"
+ tristate
depends on SPI_MASTER || I2C
select MFD_CORE
select MFD_MC13783
@@ -624,12 +624,11 @@ config MFD_MC13XXX
additional drivers must be enabled in order to use the
functionality of the device.
-if MFD_MC13XXX
-
config MFD_MC13XXX_SPI
tristate "MC13xxx SPI interface" if SPI_MASTER
default SPI_MASTER
select REGMAP_SPI
+ select MFD_MC13XXX
help
Select this if your MC13xxx is connected via an SPI bus.
@@ -637,11 +636,10 @@ config MFD_MC13XXX_I2C
tristate "MC13xxx I2C interface" if I2C
default I2C
select REGMAP_I2C
+ select MFD_MC13XXX
help
Select this if your MC13xxx is connected via an I2C bus.
-endif
-
config ABX500_CORE
bool "ST-Ericsson ABX500 Mixed Signal Circuit register functions"
default y if ARCH_U300 || ARCH_U8500
--
1.7.10
Hello,
On Wed, May 16, 2012 at 06:51:08PM +0100, Mark Brown wrote:
> Since the core is not usable without one of the bus modules it should not
> be presented in the UI but should instead be selected by the bus modules.
>
> Signed-off-by: Mark Brown <[email protected]>
> ---
> drivers/mfd/Kconfig | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index ffb7c05..8bc76aa 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -614,7 +614,7 @@ config MFD_MC13783
> tristate
>
> config MFD_MC13XXX
> - tristate "Support Freescale MC13783 and MC13892"
> + tristate
> depends on SPI_MASTER || I2C
> select MFD_CORE
> select MFD_MC13783
> @@ -624,12 +624,11 @@ config MFD_MC13XXX
> additional drivers must be enabled in order to use the
> functionality of the device.
>
> -if MFD_MC13XXX
> -
> config MFD_MC13XXX_SPI
> tristate "MC13xxx SPI interface" if SPI_MASTER
> default SPI_MASTER
> select REGMAP_SPI
> + select MFD_MC13XXX
> help
> Select this if your MC13xxx is connected via an SPI bus.
>
> @@ -637,11 +636,10 @@ config MFD_MC13XXX_I2C
> tristate "MC13xxx I2C interface" if I2C
> default I2C
> select REGMAP_I2C
> + select MFD_MC13XXX
> help
> Select this if your MC13xxx is connected via an I2C bus.
>
> -endif
> -
If you change the logic in this way please change
tristate "MC13xxx SPI interface" if SPI_MASTER
default SPI_MASTER
to
tristate "Freescale MC13783 and MC13892 SPI interface"
depends on SPI_MASTER
and similar to the i2c part. IIRC only MC13892 supports i2c.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
On Wed, May 16, 2012 at 08:01:54PM +0200, Uwe Kleine-K?nig wrote:
> If you change the logic in this way please change
> tristate "MC13xxx SPI interface" if SPI_MASTER
> default SPI_MASTER
> to
> tristate "Freescale MC13783 and MC13892 SPI interface"
> depends on SPI_MASTER
> and similar to the i2c part. IIRC only MC13892 supports i2c.
I don't care that much about randconfigs; I just thought it was quicker
to post a patch than describe the fix.
Hi Mark,
On Wed, May 16, 2012 at 06:51:08PM +0100, Mark Brown wrote:
> Since the core is not usable without one of the bus modules it should not
> be presented in the UI but should instead be selected by the bus modules.
Patch applied, with Uwe suggestions added.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/