Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 725d2e3f authored by Christian Fetzer's avatar Christian Fetzer Committed by Wolfram Sang
Browse files

i2c: piix4: Add adapter port name support for SB800 chipset 



This patch adds support for port names for the SB800 chipset.
Since the chipset supports a multiplexed main SMBus controller, adding
the channel name to the adapter name is necessary to differentiate the
ports better (for example in sensors output).

Signed-off-by: default avatarChristian Fetzer <fetzer.ch@gmail.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 2fee61d2

drivers/i2c/busses/i2c-piix4.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -136,6 +136,12 @@ static const struct dmi_system_id piix4_dmi_ibm[] = { 
	{ },

	{ },

};

};





/* SB800 globals */

static const char *piix4_main_port_names_sb800[PIIX4_MAX_ADAPTERS] = {

	"SDA0", "SDA2", "SDA3", "SDA4"

};

static const char *piix4_aux_port_name_sb800 = "SDA1";



struct i2c_piix4_adapdata {

struct i2c_piix4_adapdata {

	unsigned short smba;

	unsigned short smba;
@@ -619,7 +625,7 @@ static struct i2c_adapter *piix4_main_adapters[PIIX4_MAX_ADAPTERS]; 
static struct i2c_adapter *piix4_aux_adapter;

static struct i2c_adapter *piix4_aux_adapter;





static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,

static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,

			     struct i2c_adapter **padap)

			     const char *name, struct i2c_adapter **padap)

{

{

	struct i2c_adapter *adap;

	struct i2c_adapter *adap;

	struct i2c_piix4_adapdata *adapdata;

	struct i2c_piix4_adapdata *adapdata;
@@ -648,7 +654,7 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba, 
	adap->dev.parent = &dev->dev;

	adap->dev.parent = &dev->dev;





	snprintf(adap->name, sizeof(adap->name),

	snprintf(adap->name, sizeof(adap->name),

		"SMBus PIIX4 adapter at %04x", smba);

		"SMBus PIIX4 adapter %s at %04x", name, smba);





	i2c_set_adapdata(adap, adapdata);

	i2c_set_adapdata(adap, adapdata);
@@ -680,6 +686,7 @@ static int piix4_add_adapters_sb800(struct pci_dev *dev, unsigned short smba) 




	for (port = 0; port < PIIX4_MAX_ADAPTERS; port++) {

	for (port = 0; port < PIIX4_MAX_ADAPTERS; port++) {

		retval = piix4_add_adapter(dev, smba,

		retval = piix4_add_adapter(dev, smba,

					   piix4_main_port_names_sb800[port],

					   &piix4_main_adapters[port]);

					   &piix4_main_adapters[port]);

		if (retval < 0)

		if (retval < 0)

			goto error;

			goto error;
@@ -749,7 +756,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id) 
			return retval;

			return retval;





		/* Try to register main SMBus adapter, give up if we can't */

		/* Try to register main SMBus adapter, give up if we can't */

		retval = piix4_add_adapter(dev, retval,

		retval = piix4_add_adapter(dev, retval, "main",

					   &piix4_main_adapters[0]);

					   &piix4_main_adapters[0]);

		if (retval < 0)

		if (retval < 0)

			return retval;

			return retval;
@@ -776,7 +783,8 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	if (retval > 0) {

	if (retval > 0) {

		/* Try to add the aux adapter if it exists,

		/* Try to add the aux adapter if it exists,

		 * piix4_add_adapter will clean up if this fails */

		 * piix4_add_adapter will clean up if this fails */

		piix4_add_adapter(dev, retval, &piix4_aux_adapter);

		piix4_add_adapter(dev, retval, piix4_aux_port_name_sb800,

				  &piix4_aux_adapter);

	}

	}





	return 0;

	return 0;