diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2020-05-13 18:45:41 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2020-08-14 01:54:10 +0200 |
| commit | 105adc4806f688a30a41dd0fc395ad2af339723f (patch) | |
| tree | e2285f93987ff33dc23914b340031f7d18702022 | |
| parent | 57eb8fb222623dd5e91033f1822372ba929ab748 (diff) | |
| download | openfirmware-105adc4806f688a30a41dd0fc395ad2af339723f.tar.gz | |
olpc/sound: split the /audio register range into two
There are separate blocks for RX and TX paths. However, in between the
first pair there's the clock controller and thus the SSPA device
shouldn't claim the whole continuous range.
| -rw-r--r-- | cpu/arm/olpc/4.0/compat.fth | 10 | ||||
| -rw-r--r-- | cpu/arm/olpc/sound.fth | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/cpu/arm/olpc/4.0/compat.fth b/cpu/arm/olpc/4.0/compat.fth index 2202e70a..38f12aa6 100644 --- a/cpu/arm/olpc/4.0/compat.fth +++ b/cpu/arm/olpc/4.0/compat.fth @@ -266,4 +266,14 @@ dev /display@d420b000/port h# 20001102 " clock-divider-regval" integer-property dend +dev /audio + " reg" delete-property + h# c00 +audio h# 100 reg +dend + +dev /sspa + " reg" delete-property + h# d00 +audio h# 100 reg +dend + : olpc-compat ; diff --git a/cpu/arm/olpc/sound.fth b/cpu/arm/olpc/sound.fth index 886c7db3..daf831f0 100644 --- a/cpu/arm/olpc/sound.fth +++ b/cpu/arm/olpc/sound.fth @@ -129,7 +129,9 @@ finish-device new-device " sspa" name - h# d00 +audio h# 100 reg + h# d00 +audio encode-int h# 30 encode-int encode+ + h# d80 +audio encode-int encode+ h# 30 encode-int encode+ + " reg" property " marvell,mmp-sspa-dai" +compatible [ifdef] mmp2 " marvell,mmp2-sspa-dai" +compatible [then] @@ -144,7 +146,9 @@ finish-device new-device " audio" name -h# c00 +audio h# 100 reg +h# c00 +audio encode-int h# 30 encode-int encode+ + h# c80 +audio encode-int encode+ h# 30 encode-int encode+ + " reg" property " marvell,mmp-sspa-dai" +compatible [ifdef] mmp2 " marvell,mmp2-sspa-dai" +compatible [then] |