summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-04-21 19:11:36 +0200
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2020-04-21 20:01:50 +0200
commit6abf4a2f80eab562a41dff1ade14e2d85743bc9f (patch)
tree3d61216d4977fcbe675a8c580a06ce66d3aaf5c6 /sound
parent269b3a9ac538c4ae87f84be640b9fa89914a2489 (diff)
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: acfaaf52ebfd ("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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/txx9/txx9aclc-ac97.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c
index 7402448bdb09..d9e348444bd0 100644
--- a/sound/soc/txx9/txx9aclc-ac97.c
+++ b/sound/soc/txx9/txx9aclc-ac97.c
@@ -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)