瀏覽代碼

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>
Heikki Krogerus 7 年之前
父節點
當前提交
7c8d44566d
共有 2 個文件被更改,包括 3 次插入4 次删除
  1. 1 2
      drivers/i2c/busses/Kconfig
  2. 2 2
      drivers/platform/x86/Kconfig

+ 1 - 2
drivers/i2c/busses/Kconfig

@@ -202,8 +202,7 @@ config I2C_CHT_WC
 
 
 	  Note this controller is hooked up to a TI bq24292i charger-IC,
 	  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
 	  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
 config I2C_NFORCE2
 	tristate "Nvidia nForce2, nForce3 and nForce4"
 	tristate "Nvidia nForce2, nForce3 and nForce4"

+ 2 - 2
drivers/platform/x86/Kconfig

@@ -866,6 +866,7 @@ config ACPI_CMPC
 config INTEL_CHT_INT33FE
 config INTEL_CHT_INT33FE
 	tristate "Intel Cherry Trail ACPI INT33FE Driver"
 	tristate "Intel Cherry Trail ACPI INT33FE Driver"
 	depends on X86 && ACPI && I2C && REGULATOR
 	depends on X86 && ACPI && I2C && REGULATOR
+	depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m)
 	---help---
 	---help---
 	  This driver add support for the INT33FE ACPI device found on
 	  This driver add support for the INT33FE ACPI device found on
 	  some Intel Cherry Trail devices.
 	  some Intel Cherry Trail devices.
@@ -877,8 +878,7 @@ config INTEL_CHT_INT33FE
 	  i2c drivers for these chips can bind to the them.
 	  i2c drivers for these chips can bind to the them.
 
 
 	  If you enable this driver it is advised to also select
 	  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
 config INTEL_INT0002_VGPIO
 	tristate "Intel ACPI INT0002 Virtual GPIO driver"
 	tristate "Intel ACPI INT0002 Virtual GPIO driver"