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

Commit 2d2e376f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jarkko Sakkinen
Browse files

tpm/st33zp24: Add GPIO ACPI mapping table 



In order to make GPIO ACPI library stricter prepare users of
gpiod_get_index() to correctly behave when there no mapping is
provided by firmware.

Here we add explicit mapping between _CRS GpioIo() resources and
their names used in the driver.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 31574d32

drivers/char/tpm/st33zp24/i2c.c

+20 −3
Original line number Diff line number Diff line
@@ -111,6 +111,13 @@ static const struct st33zp24_phy_ops i2c_phy_ops = { 
	.recv = st33zp24_i2c_recv,

};



static const struct acpi_gpio_params lpcpd_gpios = { 1, 0, false };



static const struct acpi_gpio_mapping acpi_st33zp24_gpios[] = {

	{ "lpcpd-gpios", &lpcpd_gpios, 1 },

	{},

};



static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client)

{

	struct tpm_chip *chip = i2c_get_clientdata(client);
@@ -118,10 +125,14 @@ static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client) 
	struct st33zp24_i2c_phy *phy = tpm_dev->phy_id;

	struct gpio_desc *gpiod_lpcpd;

	struct device *dev = &client->dev;

	int ret;



	ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), acpi_st33zp24_gpios);

	if (ret)

		return ret;



	/* Get LPCPD GPIO from ACPI */

	gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,

					   GPIOD_OUT_HIGH);

	gpiod_lpcpd = devm_gpiod_get(dev, "lpcpd", GPIOD_OUT_HIGH);

	if (IS_ERR(gpiod_lpcpd)) {

		dev_err(&client->dev,

			"Failed to retrieve lpcpd-gpios from acpi.\n");
@@ -268,8 +279,14 @@ static int st33zp24_i2c_probe(struct i2c_client *client, 
static int st33zp24_i2c_remove(struct i2c_client *client)

{

	struct tpm_chip *chip = i2c_get_clientdata(client);

	int ret;



	ret = st33zp24_remove(chip);

	if (ret)

		return ret;



	return st33zp24_remove(chip);

	acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev));

	return 0;

}



static const struct i2c_device_id st33zp24_i2c_id[] = {

drivers/char/tpm/st33zp24/spi.c

+20 −3
Original line number Diff line number Diff line
@@ -230,6 +230,13 @@ static const struct st33zp24_phy_ops spi_phy_ops = { 
	.recv = st33zp24_spi_recv,

};



static const struct acpi_gpio_params lpcpd_gpios = { 1, 0, false };



static const struct acpi_gpio_mapping acpi_st33zp24_gpios[] = {

	{ "lpcpd-gpios", &lpcpd_gpios, 1 },

	{},

};



static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev)

{

	struct tpm_chip *chip = spi_get_drvdata(spi_dev);
@@ -237,10 +244,14 @@ static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev) 
	struct st33zp24_spi_phy *phy = tpm_dev->phy_id;

	struct gpio_desc *gpiod_lpcpd;

	struct device *dev = &spi_dev->dev;

	int ret;



	ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), acpi_st33zp24_gpios);

	if (ret)

		return ret;



	/* Get LPCPD GPIO from ACPI */

	gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,

					   GPIOD_OUT_HIGH);

	gpiod_lpcpd = devm_gpiod_get(dev, "lpcpd", GPIOD_OUT_HIGH);

	if (IS_ERR(gpiod_lpcpd)) {

		dev_err(dev, "Failed to retrieve lpcpd-gpios from acpi.\n");

		phy->io_lpcpd = -1;
@@ -385,8 +396,14 @@ static int st33zp24_spi_probe(struct spi_device *dev) 
static int st33zp24_spi_remove(struct spi_device *dev)

{

	struct tpm_chip *chip = spi_get_drvdata(dev);

	int ret;



	ret = st33zp24_remove(chip);

	if (ret)

		return ret;



	return st33zp24_remove(chip);

	acpi_dev_remove_driver_gpios(ACPI_COMPANION(&dev->dev));

	return 0;

}



static const struct spi_device_id st33zp24_spi_id[] = {