Commit 27b984af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd 

Pull tpm updates from Jarkko Sakkinen:
 "Small bug fixes and device tree updates. No new features"

* tag 'tpmdd-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: tis_i2c: Add compatible string nuvoton,npct75x
  tpm_tis: Add compatible string atmel,at97sc3204
  tpm_tis_spi: Add compatible string atmel,attpm20p
  dt-bindings: tpm: Add compatible string atmel,attpm20p
  tpm,tpm_tis: Avoid warning splat at shutdown
  tpm/tpm_ftpm_tee: fix all kernel-doc warnings
parents 9687d4ac 6fa6b796

Documentation/devicetree/bindings/tpm/tcg,tpm_tis-spi.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
  compatible:

    items:

      - enum:

          - atmel,attpm20p

          - infineon,slb9670

          - st,st33htpm-spi

          - st,st33zp24-spi

drivers/char/tpm/tpm_ftpm_tee.c

+3 −3
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int ftpm_tee_match(struct tee_ioctl_version_data *ver, const void *data) 


/**

 * ftpm_tee_probe() - initialize the fTPM

 * @pdev: the platform_device description.

 * @dev: the device description.

 *

 * Return:

 *	On success, 0. On failure, -errno.
@@ -304,7 +304,7 @@ static int ftpm_plat_tee_probe(struct platform_device *pdev) 


/**

 * ftpm_tee_remove() - remove the TPM device

 * @pdev: the platform_device description.

 * @dev: the device description.

 *

 * Return:

 *	0 always.
@@ -341,7 +341,7 @@ static void ftpm_plat_tee_remove(struct platform_device *pdev) 
}



/**

 * ftpm_tee_shutdown() - shutdown the TPM device

 * ftpm_plat_tee_shutdown() - shutdown the TPM device

 * @pdev: the platform_device description.

 */

static void ftpm_plat_tee_shutdown(struct platform_device *pdev)

drivers/char/tpm/tpm_tis.c

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ static void tpm_tis_plat_remove(struct platform_device *pdev) 


#ifdef CONFIG_OF

static const struct of_device_id tis_of_platform_match[] = {

	{.compatible = "atmel,at97sc3204"},

	{.compatible = "tcg,tpm-tis-mmio"},

	{},

};

drivers/char/tpm/tpm_tis_core.c

+1 −2
Original line number Diff line number Diff line
@@ -919,8 +919,6 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, 
	int rc;

	u32 int_status;



	INIT_WORK(&priv->free_irq_work, tpm_tis_free_irq_func);



	rc = devm_request_threaded_irq(chip->dev.parent, irq, NULL,

				       tis_int_handler, IRQF_ONESHOT | flags,

				       dev_name(&chip->dev), chip);
@@ -1132,6 +1130,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, 
	priv->phy_ops = phy_ops;

	priv->locality_count = 0;

	mutex_init(&priv->locality_count_mutex);

	INIT_WORK(&priv->free_irq_work, tpm_tis_free_irq_func);



	dev_set_drvdata(&chip->dev, priv);

drivers/char/tpm/tpm_tis_i2c.c

+2 −0
Original line number Diff line number Diff line
@@ -383,6 +383,8 @@ MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_id); 
#ifdef CONFIG_OF

static const struct of_device_id of_tis_i2c_match[] = {

	{ .compatible = "infineon,slb9673", },

	{ .compatible = "nuvoton,npct75x", },

	{ .compatible = "tcg,tpm-tis-i2c", },

	{}

};

MODULE_DEVICE_TABLE(of, of_tis_i2c_match);