ASoC: txx9: add back the hack for a too small resource_size_t
Looks like I misread the Kconfig magic and this driver can be compiled
into 32-bit kernels. Add back the hack to extent the range of the
resource_size_t, and include the header with the txx9-specific ioremap
magic for that.
Fixes: acfaaf52eb
("ASoC: txx9: don't work around too small resource_size_t")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
parent
269b3a9ac5
commit
6abf4a2f80
|
@ -14,6 +14,7 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <asm/mach-tx39xx/ioremap.h> /* for TXX9_DIRECTMAP_BASE */
|
||||
#include <sound/core.h>
|
||||
#include <sound/pcm.h>
|
||||
#include <sound/soc.h>
|
||||
|
@ -175,8 +176,6 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
|
|||
int err;
|
||||
int irq;
|
||||
|
||||
BUILD_BUG_ON(sizeof(drvdata->physbase) > sizeof(r->start));
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
|
@ -192,6 +191,10 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
|
|||
|
||||
platform_set_drvdata(pdev, drvdata);
|
||||
drvdata->physbase = r->start;
|
||||
if (sizeof(drvdata->physbase) > sizeof(r->start) &&
|
||||
r->start >= TXX9_DIRECTMAP_BASE &&
|
||||
r->start < TXX9_DIRECTMAP_BASE + 0x400000)
|
||||
drvdata->physbase |= 0xf00000000ull;
|
||||
err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq,
|
||||
0, dev_name(&pdev->dev), drvdata);
|
||||
if (err < 0)
|
||||
|
|
Loading…
Reference in New Issue