diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:28 +0100 |
| commit | ffd6dd3eaa1e6a0d454c08efcc996ea7014aa1d2 (patch) | |
| tree | 744fe8a02980ed1c40900e26d0b58f3591db27ce /drivers/spi/spi-sh-hspi.c | |
| parent | Merge remote-tracking branch 'spi/topic/gpio' into spi-next (diff) | |
| parent | spi/hspi: add device tree support (diff) | |
| download | linux-dev-ffd6dd3eaa1e6a0d454c08efcc996ea7014aa1d2.tar.xz linux-dev-ffd6dd3eaa1e6a0d454c08efcc996ea7014aa1d2.zip | |
Merge remote-tracking branch 'spi/topic/hspi' into spi-next
Diffstat (limited to 'drivers/spi/spi-sh-hspi.c')
| -rw-r--r-- | drivers/spi/spi-sh-hspi.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c index 7e749a22f51e..292567ab4c6c 100644 --- a/drivers/spi/spi-sh-hspi.c +++ b/drivers/spi/spi-sh-hspi.c @@ -137,7 +137,7 @@ static void hspi_hw_setup(struct hspi_priv *hspi, rate /= 16; /* CLKCx calculation */ - rate /= (((idiv_clk & 0x1F) + 1) * 2) ; + rate /= (((idiv_clk & 0x1F) + 1) * 2); /* save best settings */ tmp = abs(target_rate - rate); @@ -303,6 +303,7 @@ static int hspi_probe(struct platform_device *pdev) master->setup = hspi_setup; master->cleanup = hspi_cleanup; master->mode_bits = SPI_CPOL | SPI_CPHA; + master->dev.of_node = pdev->dev.of_node; master->auto_runtime_pm = true; master->transfer_one_message = hspi_transfer_one_message; ret = devm_spi_register_master(&pdev->dev, master); @@ -332,12 +333,19 @@ static int hspi_remove(struct platform_device *pdev) return 0; } +static struct of_device_id hspi_of_match[] = { + { .compatible = "renesas,hspi", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, hspi_of_match); + static struct platform_driver hspi_driver = { .probe = hspi_probe, .remove = hspi_remove, .driver = { .name = "sh-hspi", .owner = THIS_MODULE, + .of_match_table = hspi_of_match, }, }; module_platform_driver(hspi_driver); |