diff options
| author | Braden Kell <bradenkell@google.com> | 2017-07-14 14:39:54 -0700 |
|---|---|---|
| committer | Braden Kell <bradenkell@google.com> | 2017-07-14 16:42:16 -0700 |
| commit | 3f86aea6051f695f9b10a10cc1aa6f47e9c05b30 (patch) | |
| tree | 79e858a4fe9a048d30609365c201c91325235d52 | |
| parent | 2d57130f9bea7e2fe14fb0bd933ab8784e3a02ae (diff) | |
| download | pi-v4.4-3f86aea6051f695f9b10a10cc1aa6f47e9c05b30.tar.gz | |
Add devicetree overlay to fix I2S clock conflict
The new version of the I2S driver uses the clock
API instead of accessing cprman registers
directly.
Bug: 63644623
Test: Checked /sys/firmware/devicetree for new
I2S clocks and reg properties
Change-Id: Ibe0f1e04b94c9930933d655c493494823806248a
| -rw-r--r-- | arch/arm/boot/dts/overlays/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/overlays/bcm2710-rpi-3-b-i2s-use-cprman-overlay.dts | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile index 43c15add4dd0..a457257a72cc 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -33,6 +33,7 @@ dtbo-$(RPI_DT_OVERLAYS) += hifiberry-dac.dtbo dtbo-$(RPI_DT_OVERLAYS) += hifiberry-dacplus.dtbo dtbo-$(RPI_DT_OVERLAYS) += hifiberry-digi.dtbo dtbo-$(RPI_DT_OVERLAYS) += hifiberry-digi-pro.dtbo +dtbo-$(RPI_DT_OVERLAYS) += bcm2710-rpi-3-b-i2s-use-cprman.dtbo dtbo-$(RPI_DT_OVERLAYS) += bcm2710-rpi-3-b-spi0-pin-reorder.dtbo dtbo-$(RPI_DT_OVERLAYS) += generic-i2s.dtbo dtbo-$(RPI_DT_OVERLAYS) += hy28a.dtbo diff --git a/arch/arm/boot/dts/overlays/bcm2710-rpi-3-b-i2s-use-cprman-overlay.dts b/arch/arm/boot/dts/overlays/bcm2710-rpi-3-b-i2s-use-cprman-overlay.dts new file mode 100644 index 000000000000..456335c448ad --- /dev/null +++ b/arch/arm/boot/dts/overlays/bcm2710-rpi-3-b-i2s-use-cprman-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +/{ + fragment@0 { + target = <&i2s>; + __overlay__ { + reg = <0x7e203000 0x24>; + clocks = <&cprman 31>; /* 31 is the BCM2835_CLOCK_PCM */ + }; + }; +}; |