platform: x86: intel_cht_int33fe: Fix dependencies

The driver will not probe unless bq24190 is loaded, so
making it a dependency.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 8d21b9825d71764dc950a47dec4a3bc3dc102e25..fce9f2ca0570d50cb9a3c336686e19931b04c3ab 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -202,8 +202,7 @@ config I2C_CHT_WC
 
          Note this controller is hooked up to a TI bq24292i charger-IC,
          combined with a FUSB302 Type-C port-controller as such it is advised
-         to also select CONFIG_CHARGER_BQ24190=m and CONFIG_TYPEC_FUSB302=m
-         (the fusb302 driver currently is in drivers/staging).
+         to also select CONFIG_TYPEC_FUSB302=m.
 
 config I2C_NFORCE2
        tristate "Nvidia nForce2, nForce3 and nForce4"

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 566644bb496ac82bf3263bb6ea285c7ab1fb070f..f27cb186437dcc7214ca6985e5c0a3c13bc70592 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -866,6 +866,7 @@ config ACPI_CMPC
 config INTEL_CHT_INT33FE
        tristate "Intel Cherry Trail ACPI INT33FE Driver"
        depends on X86 && ACPI && I2C && REGULATOR
+       depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m)
        ---help---
          This driver add support for the INT33FE ACPI device found on
          some Intel Cherry Trail devices.
@@ -877,8 +878,7 @@ config INTEL_CHT_INT33FE
          i2c drivers for these chips can bind to the them.
 
          If you enable this driver it is advised to also select
-         CONFIG_TYPEC_FUSB302=m, CONFIG_CHARGER_BQ24190=m and
-         CONFIG_BATTERY_MAX17042=m.
+         CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m.
 
 config INTEL_INT0002_VGPIO
        tristate "Intel ACPI INT0002 Virtual GPIO driver"