mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: ARM: mach-shmobile: clock-sh7372: remove bogus pllc2 clock toggling. ARM: mach-shmobile: clock-sh7372: remove unnecessary fsi clocks ARM: mach-shmobile: clock-sh7372: modify error code ARM: mach-shmobile: ap4evb: FSI clock use proper process for ak4642 ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI ARM: mach-shmobile: clock-sh7372: remove fsidiv bogus disable ARM: mach-shmobile: sh7372 USB0/IIC1 MSTP fix
This commit is contained in:
commit
d4d2ad948e
4 changed files with 140 additions and 71 deletions
|
|
@ -85,7 +85,9 @@
|
|||
* ACK_MD (FSI2)
|
||||
* CKG1 (FSI)
|
||||
*
|
||||
* err: return value < 0
|
||||
* err : return value < 0
|
||||
* no change : return value == 0
|
||||
* change xMD : return value > 0
|
||||
*
|
||||
* 0x-00000AB
|
||||
*
|
||||
|
|
@ -111,7 +113,7 @@
|
|||
struct sh_fsi_platform_info {
|
||||
unsigned long porta_flags;
|
||||
unsigned long portb_flags;
|
||||
int (*set_rate)(int is_porta, int rate); /* for master mode */
|
||||
int (*set_rate)(struct device *dev, int is_porta, int rate, int enable);
|
||||
};
|
||||
|
||||
#endif /* __SOUND_FSI_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue