Commit 4b326491 authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

i2c: cht-wc: Make charger i2c-client instantiation board/device-model specific 



The i2c-controller on the Cherry Trail - Whiskey Cove PMIC is special
in that it is always connected to the I2C charger IC of the board on
which the PMIC is used; and the charger IC is not described in ACPI,
so the i2c-cht-wc code needs to instantiate an i2c-client for it itself.

So far this was hardcoded to instantiate an i2c-client for the
bq24292i, with all properties, etc. set to match how this charger
is used on the GPD win and GPD pocket devices.

There is a rudimentary check to make sure the ACPI tables are at least
somewhat as expected, but this is far from accurate, leading to
a wrong i2c-client being instantiated for the charger on some boards.

Switch to the new DMI based intel_cht_wc_get_model() helper which is
exported by the MFD driver for the CHT Whiskey Cove PMIC to help PMIC
cell drivers like the i2c-cht-wc code reliably detect which board
they are running on.

And add board_info for the charger ICs as found on the other 2 known
boards with a Whisky Cove PMIC.

This has been tested on all 3 known boards.

Acked-by: default avatarWolfram Sang <wsa@kernel.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 3afcbe09

drivers/i2c/busses/i2c-cht-wc.c

+102 −18
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/power/bq24190_charger.h>

#include <linux/power/bq25890_charger.h>

#include <linux/slab.h>



#define CHT_WC_I2C_CTRL			0x5e24
@@ -270,6 +271,7 @@ static const struct irq_chip cht_wc_i2c_irq_chip = { 
	.name			= "cht_wc_ext_chrg_irq_chip",

};



/********** GPD Win / Pocket charger IC settings **********/

static const char * const bq24190_suppliers[] = {

	"tcpm-source-psy-i2c-fusb302" };
@@ -304,17 +306,92 @@ static struct bq24190_platform_data bq24190_pdata = { 
	.regulator_init_data = &bq24190_vbus_init_data,

};



static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev)

{

	struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent);

	struct cht_wc_i2c_adap *adap;

	struct i2c_board_info board_info = {

static struct i2c_board_info gpd_win_board_info = {

	.type = "bq24190",

	.addr = 0x6b,

	.dev_name = "bq24190",

	.swnode = &bq24190_node,

	.platform_data = &bq24190_pdata,

};



/********** Xiaomi Mi Pad 2 charger IC settings  **********/

static struct regulator_consumer_supply bq2589x_vbus_consumer = {

	.supply = "vbus",

	.dev_name = "cht_wcove_pwrsrc",

};



static const struct regulator_init_data bq2589x_vbus_init_data = {

	.constraints = {

		.valid_ops_mask = REGULATOR_CHANGE_STATUS,

	},

	.consumer_supplies = &bq2589x_vbus_consumer,

	.num_consumer_supplies = 1,

};



static struct bq25890_platform_data bq2589x_pdata = {

	.regulator_init_data = &bq2589x_vbus_init_data,

};



static const struct property_entry xiaomi_mipad2_props[] = {

	PROPERTY_ENTRY_BOOL("linux,skip-reset"),

	PROPERTY_ENTRY_BOOL("linux,read-back-settings"),

	{ }

};



static const struct software_node xiaomi_mipad2_node = {

	.properties = xiaomi_mipad2_props,

};



static struct i2c_board_info xiaomi_mipad2_board_info = {

	.type = "bq25890",

	.addr = 0x6a,

	.dev_name = "bq25890",

	.swnode = &xiaomi_mipad2_node,

	.platform_data = &bq2589x_pdata,

};



/********** Lenovo Yogabook YB1-X90F/-X91F/-X91L charger settings **********/

static const char * const lenovo_yb1_bq25892_suppliers[] = { "cht_wcove_pwrsrc" };



static const struct property_entry lenovo_yb1_bq25892_props[] = {

	PROPERTY_ENTRY_STRING_ARRAY("supplied-from",

				    lenovo_yb1_bq25892_suppliers),

	PROPERTY_ENTRY_U32("linux,pump-express-vbus-max", 12000000),

	PROPERTY_ENTRY_BOOL("linux,skip-reset"),

	/*

	 * The firmware sets everything to the defaults, which leads to a

	 * somewhat low charge-current of 2048mA and worse to a battery-voltage

	 * of 4.2V instead of 4.35V (when booted without a charger connected).

	 * Use our own values instead of "linux,read-back-settings" to fix this.

	 */

	PROPERTY_ENTRY_U32("ti,charge-current", 4224000),

	PROPERTY_ENTRY_U32("ti,battery-regulation-voltage", 4352000),

	PROPERTY_ENTRY_U32("ti,termination-current", 256000),

	PROPERTY_ENTRY_U32("ti,precharge-current", 128000),

	PROPERTY_ENTRY_U32("ti,minimum-sys-voltage", 3500000),

	PROPERTY_ENTRY_U32("ti,boost-voltage", 4998000),

	PROPERTY_ENTRY_U32("ti,boost-max-current", 1400000),

	PROPERTY_ENTRY_BOOL("ti,use-ilim-pin"),

	{ }

};



static const struct software_node lenovo_yb1_bq25892_node = {

	.properties = lenovo_yb1_bq25892_props,

};



static struct i2c_board_info lenovo_yogabook1_board_info = {

	.type = "bq25892",

	.addr = 0x6b,

	.dev_name = "bq25892",

	.swnode = &lenovo_yb1_bq25892_node,

	.platform_data = &bq2589x_pdata,

};



static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev)

{

	struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent);

	struct i2c_board_info *board_info = NULL;

	struct cht_wc_i2c_adap *adap;

	int ret, reg, irq;



	irq = platform_get_irq(pdev, 0);
@@ -379,17 +456,24 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev) 
	if (ret)

		goto remove_irq_domain;



	/*

	 * Normally the Whiskey Cove PMIC is paired with a TI bq24292i charger,

	 * connected to this i2c bus, and a max17047 fuel-gauge and a fusb302

	 * USB Type-C controller connected to another i2c bus. In this setup

	 * the max17047 and fusb302 devices are enumerated through an INT33FE

	 * ACPI device. If this device is present register an i2c-client for

	 * the TI bq24292i charger.

	 */

	if (acpi_dev_present("INT33FE", NULL, -1)) {

		board_info.irq = adap->client_irq;

		adap->client = i2c_new_client_device(&adap->adapter, &board_info);

	switch (pmic->cht_wc_model) {

	case INTEL_CHT_WC_GPD_WIN_POCKET:

		board_info = &gpd_win_board_info;

		break;

	case INTEL_CHT_WC_XIAOMI_MIPAD2:

		board_info = &xiaomi_mipad2_board_info;

		break;

	case INTEL_CHT_WC_LENOVO_YOGABOOK1:

		board_info = &lenovo_yogabook1_board_info;

		break;

	default:

		dev_warn(&pdev->dev, "Unknown model, not instantiating charger device\n");

		break;

	}



	if (board_info) {

		board_info->irq = adap->client_irq;

		adap->client = i2c_new_client_device(&adap->adapter, board_info);

		if (IS_ERR(adap->client)) {

			ret = PTR_ERR(adap->client);

			goto del_adapter;