diff options
| author | Christophe RICARD <christophe.ricard@gmail.com> | 2016-02-23 16:25:49 -0500 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-06-25 10:26:35 -0400 |
| commit | 86ff205b8e7b5b85ef1eb5e13f92f37c40a7181a (patch) | |
| tree | c3dab30435d95bda5aa31292a52a5eed9ca05f36 /drivers/char | |
| parent | 22eb90db936755e5d600a4561a0cc7a82c791eb9 (diff) | |
tpm: st33zp24: Add support for acpi probing for spi device.
Add support for acpi probing. SMO3324 is used for st33zp24.
It has been tested with the following acpi node on Minnowboard:
Device (TPM1)
{
Name (_ADR, Zero) // _ADR: Address
Name (_HID, "SMO3324") // _HID: Hardware ID
Name (_CID, "SMO3324") // _CID: Compatible ID
Name (_DDN, "SMO TPM") // _DDN: DOS Device Name
Name (_UID, One) // _UID: Unique ID
Method (_CRS, 0, NotSerialized) // _CRS: Current Resource Settings
{
Name (SBUF, ResourceTemplate ()
{
SpiSerialBus (0, PolarityLow, FourWireMode, 8,
ControllerInitiated, 4000000, ClockPolarityLow,
ClockPhaseFirst, "\\_SB.SPI1",
0x00, ResourceConsumer, ,)
GpioInt (Edge, ActiveHigh, ExclusiveAndWake, PullNone, 0x0000,
"\\_SB.GPO2", 0x00, ResourceConsumer, ,)
{ // Pin list
0x0001
}
GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly,
"\\_SB.GPO2", 0x00, ResourceConsumer, ,)
{ // Pin list
0x0002,
}
})
Return (SBUF) /* \_SB_.SPI1.TPM1._CRS.SBUF */
}
Method (_STA, 0, NotSerialized) // _STA: Status
{
Return (0x0F)
}
}
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/st33zp24/spi.c | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c index eb351ba48689..173db725b535 100644 --- a/drivers/char/tpm/st33zp24/spi.c +++ b/drivers/char/tpm/st33zp24/spi.c | |||
| @@ -19,8 +19,10 @@ | |||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/spi/spi.h> | 20 | #include <linux/spi/spi.h> |
| 21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
| 22 | #include <linux/gpio/consumer.h> | ||
| 22 | #include <linux/of_irq.h> | 23 | #include <linux/of_irq.h> |
| 23 | #include <linux/of_gpio.h> | 24 | #include <linux/of_gpio.h> |
| 25 | #include <linux/acpi.h> | ||
| 24 | #include <linux/tpm.h> | 26 | #include <linux/tpm.h> |
| 25 | #include <linux/platform_data/st33zp24.h> | 27 | #include <linux/platform_data/st33zp24.h> |
| 26 | 28 | ||
| @@ -227,6 +229,42 @@ static const struct st33zp24_phy_ops spi_phy_ops = { | |||
| 227 | .recv = st33zp24_spi_recv, | 229 | .recv = st33zp24_spi_recv, |
| 228 | }; | 230 | }; |
| 229 | 231 | ||
| 232 | static int st33zp24_spi_acpi_request_resources(struct st33zp24_spi_phy *phy) | ||
| 233 | { | ||
| 234 | struct spi_device *spi_dev = phy->spi_device; | ||
| 235 | const struct acpi_device_id *id; | ||
| 236 | struct gpio_desc *gpiod_lpcpd; | ||
| 237 | struct device *dev; | ||
| 238 | |||
| 239 | if (!spi_dev) | ||
| 240 | return -EINVAL; | ||
| 241 | |||
| 242 | dev = &spi_dev->dev; | ||
| 243 | |||
| 244 | /* Match the struct device against a given list of ACPI IDs */ | ||
| 245 | id = acpi_match_device(dev->driver->acpi_match_table, dev); | ||
| 246 | if (!id) | ||
| 247 | return -ENODEV; | ||
| 248 | |||
| 249 | /* Get LPCPD GPIO from ACPI */ | ||
| 250 | gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1, | ||
| 251 | GPIOD_OUT_HIGH); | ||
| 252 | if (IS_ERR(gpiod_lpcpd)) { | ||
| 253 | dev_err(dev, "Failed to retrieve lpcpd-gpios from acpi.\n"); | ||
| 254 | phy->io_lpcpd = -1; | ||
| 255 | /* | ||
| 256 | * lpcpd pin is not specified. This is not an issue as | ||
| 257 | * power management can be also managed by TPM specific | ||
| 258 | * commands. So leave with a success status code. | ||
| 259 | */ | ||
| 260 | return 0; | ||
| 261 | } | ||
| 262 | |||
| 263 | phy->io_lpcpd = desc_to_gpio(gpiod_lpcpd); | ||
| 264 | |||
| 265 | return 0; | ||
| 266 | } | ||
| 267 | |||
| 230 | static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy) | 268 | static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy) |
| 231 | { | 269 | { |
| 232 | struct device_node *pp; | 270 | struct device_node *pp; |
| @@ -328,6 +366,10 @@ static int st33zp24_spi_probe(struct spi_device *dev) | |||
| 328 | ret = st33zp24_spi_request_resources(dev, phy); | 366 | ret = st33zp24_spi_request_resources(dev, phy); |
| 329 | if (ret) | 367 | if (ret) |
| 330 | return ret; | 368 | return ret; |
| 369 | } else if (ACPI_HANDLE(&dev->dev)) { | ||
| 370 | ret = st33zp24_spi_acpi_request_resources(phy); | ||
| 371 | if (ret) | ||
| 372 | return ret; | ||
| 331 | } | 373 | } |
| 332 | 374 | ||
| 333 | phy->latency = st33zp24_spi_evaluate_latency(phy); | 375 | phy->latency = st33zp24_spi_evaluate_latency(phy); |
| @@ -362,6 +404,12 @@ static const struct of_device_id of_st33zp24_spi_match[] = { | |||
| 362 | }; | 404 | }; |
| 363 | MODULE_DEVICE_TABLE(of, of_st33zp24_spi_match); | 405 | MODULE_DEVICE_TABLE(of, of_st33zp24_spi_match); |
| 364 | 406 | ||
| 407 | static const struct acpi_device_id st33zp24_spi_acpi_match[] = { | ||
| 408 | {"SMO3324"}, | ||
| 409 | {} | ||
| 410 | }; | ||
| 411 | MODULE_DEVICE_TABLE(acpi, st33zp24_spi_acpi_match); | ||
| 412 | |||
| 365 | static SIMPLE_DEV_PM_OPS(st33zp24_spi_ops, st33zp24_pm_suspend, | 413 | static SIMPLE_DEV_PM_OPS(st33zp24_spi_ops, st33zp24_pm_suspend, |
| 366 | st33zp24_pm_resume); | 414 | st33zp24_pm_resume); |
| 367 | 415 | ||
| @@ -370,6 +418,7 @@ static struct spi_driver st33zp24_spi_driver = { | |||
| 370 | .name = TPM_ST33_SPI, | 418 | .name = TPM_ST33_SPI, |
| 371 | .pm = &st33zp24_spi_ops, | 419 | .pm = &st33zp24_spi_ops, |
| 372 | .of_match_table = of_match_ptr(of_st33zp24_spi_match), | 420 | .of_match_table = of_match_ptr(of_st33zp24_spi_match), |
| 421 | .acpi_match_table = ACPI_PTR(st33zp24_spi_acpi_match), | ||
| 373 | }, | 422 | }, |
| 374 | .probe = st33zp24_spi_probe, | 423 | .probe = st33zp24_spi_probe, |
| 375 | .remove = st33zp24_spi_remove, | 424 | .remove = st33zp24_spi_remove, |