Skip to content

backport of upstream i2s and clock #1439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

backport of upstream i2s and clock #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
37d9644
ARM: bcm2708: enable clock manager by default
msperl Apr 25, 2016
2cd17db
ARM: 2708: i2s: removed clock registers and added clock
msperl Apr 25, 2016
1a7aedd
Revert "bcm2835-i2s: Reduce the TX DREQ threshold"
msperl Apr 25, 2016
8768a24
Revert "bcm2835-i2s: Enable MMAP support via a DT property"
msperl Apr 25, 2016
3f7b494
Revert "bcm2835-i2s: Register PCM device"
msperl Apr 25, 2016
904c0bb
Revert "bcm2835-i2s: Eliminate debugfs directory error"
msperl Apr 25, 2016
768d0c1
Revert "bcm2835-i2s: setup clock only if CPU is clock master"
msperl Apr 25, 2016
1a0a306
Revert "bcm2835-i2s: add 24bit support, update bclk_ratio to more cor…
msperl Apr 25, 2016
362ff05
Revert "bcm2835-i2s: get base address for DMA from devicetree"
msperl Apr 25, 2016
e0a2eb8
ASoC: bcm2835: cleanup includes by ordering them alphabetically
msperl Jan 9, 2016
62c3648
ASoC: bcm2835: move to use the clock framework
msperl Jan 12, 2016
a8d1ff1
ASoC: bcm2835: add 24bit support
HiassofT Oct 11, 2015
477a259
ASoC: bcm2835: setup clock only if CPU is clock master
HiassofT Oct 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/bcm2708_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <dt-bindings/clock/bcm2835.h>
#include <dt-bindings/clock/bcm2835-aux.h>
#include "skeleton.dtsi"

Expand Down Expand Up @@ -99,7 +100,6 @@
* oscillator.
*/
clocks = <&clk_osc>;
status = "disabled";
};

random: rng@7e104000 {
Expand Down Expand Up @@ -145,8 +145,8 @@

i2s: i2s@7e203000 {
compatible = "brcm,bcm2835-i2s";
reg = <0x7e203000 0x24>,
<0x7e101098 0x08>;
reg = <0x7e203000 0x24>;
clocks = <&cprman BCM2835_CLOCK_PCM>;

dmas = <&dma 2>, <&dma 3>;
dma-names = "tx", "rx";
Expand Down
Loading