diff options
| author | Martin Sperl <kernel@martin.sperl.org> | 2015-10-15 10:10:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-16 15:35:33 +0100 |
| commit | 07bce09e11f5007635d7f9e6bc55679dd6ed18bd (patch) | |
| tree | e5f073eb8e787acbd6d11903eaadf2bf7901434e /drivers/spi/spi-bcm2835aux.c | |
| parent | 72aac02b3730fa0e2e1ccab57712a94400344f8a (diff) | |
| download | blackbird-op-linux-07bce09e11f5007635d7f9e6bc55679dd6ed18bd.tar.gz blackbird-op-linux-07bce09e11f5007635d7f9e6bc55679dd6ed18bd.zip | |
spi: bcm2835aux: change initialization order and switch to platform_get_irq
Change the initialization order of the HW so that the interrupt
is only requested after the HW is initialized
Also the use of irq_of_parse_and_map is replaced by platform_get_irq.
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-bcm2835aux.c')
| -rw-r--r-- | drivers/spi/spi-bcm2835aux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c index 05d2d6eb7bfa..7de6f8472a81 100644 --- a/drivers/spi/spi-bcm2835aux.c +++ b/drivers/spi/spi-bcm2835aux.c @@ -429,7 +429,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) goto out_master_put; } - bs->irq = irq_of_parse_and_map(pdev->dev.of_node, 0); + bs->irq = platform_get_irq(pdev, 0); if (bs->irq <= 0) { dev_err(&pdev->dev, "could not get IRQ: %d\n", bs->irq); err = bs->irq ? bs->irq : -ENODEV; @@ -451,6 +451,9 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) goto out_clk_disable; } + /* reset SPI-HW block */ + bcm2835aux_spi_reset_hw(bs); + err = devm_request_irq(&pdev->dev, bs->irq, bcm2835aux_spi_interrupt, IRQF_SHARED, @@ -460,9 +463,6 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) goto out_clk_disable; } - /* reset SPI-HW block */ - bcm2835aux_spi_reset_hw(bs); - err = devm_spi_register_master(&pdev->dev, master); if (err) { dev_err(&pdev->dev, "could not register SPI master: %d\n", err); |
