projects/linux·commit c8f36780

Merge branch 'rmobile/core' into rmobile-fixes-for-linus

c8f36780 · Paul Mundt <[email protected]> · 2010-11-15 14:47:16 +09:00

Commit
c8f367802c5fdae87b36b2f846b46f38486b239b
Parents
a60a3155 · 574490e3

Merge commit. Changes below are compared with the first parent: a60a3155.

Changes

1 files changed · +4 −0

FileStatusAddDelContent
arch/arm/mach-shmobile/board-ap4evb.cmodified+4−0View file

arch/arm/mach-shmobile/board-ap4evb.c

View file
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 63c2fca..d326054 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -583,6 +583,10 @@ static int fsi_set_rate(int is_porta, int rate)
return -EINVAL;
switch (rate) {
+ case 44100:
+ clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 11283000));
+ ret = SH_FSI_ACKMD_256 | SH_FSI_BPFMD_64;
+ break;
case 48000:
clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 85428000));
clk_set_rate(fdiv_clk, clk_round_rate(fdiv_clk, 12204000));