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

+4
+4
arch/arm/mach-shmobile/board-ap4evb.c
··· 583 return -EINVAL; 584 585 switch (rate) { 586 case 48000: 587 clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 85428000)); 588 clk_set_rate(fdiv_clk, clk_round_rate(fdiv_clk, 12204000));
··· 583 return -EINVAL; 584 585 switch (rate) { 586 + case 44100: 587 + clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 11283000)); 588 + ret = SH_FSI_ACKMD_256 | SH_FSI_BPFMD_64; 589 + break; 590 case 48000: 591 clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 85428000)); 592 clk_set_rate(fdiv_clk, clk_round_rate(fdiv_clk, 12204000));