Skip to contentSkip to conversation

rmobile updates for 2.6.37-rc4

GIT PULL Paul Mundt 2 participants 3 messages Nov 24, 2010 – Nov 25, 2010 SuperH

lore
Share & tools
lore

Paul Mundt

author
#0 lore raw

This was going to be a fairly simple set of changes, but it was unfortunately discovered that the FSIDIV clock has been doing some fairly bogus things with regards to finding creative ways to sidestep its refcount, leading to situations where users of the clock in question can find themselves invariably shafted by the alsa driver. As a result of this, a bit of a rethink was needed, resulting in the FSIDIV and PLLC2 clock handling being refactored for AP4.

As we're already at -rc3 this is obviously a lot bigger than I would care for at this point. The alternative would be a series of reverts that would result in a similar amount of churn, and then giving it all a go again for .38. I can prepare a topic branch that does that if you'd prefer that option, this would however render the alsa driver unusable for .37.

Please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-fixes-for-linus

Which contains:

Kuninori Morimoto (6):
ARM: mach-shmobile: clock-sh7372: remove fsidiv bogus disable
ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI
ARM: mach-shmobile: ap4evb: FSI clock use proper process for ak4642
ARM: mach-shmobile: clock-sh7372: modify error code
ARM: mach-shmobile: clock-sh7372: remove unnecessary fsi clocks
ARM: mach-shmobile: clock-sh7372: remove bogus pllc2 clock toggling.

Magnus Damm (1):
ARM: mach-shmobile: sh7372 USB0/IIC1 MSTP fix

 arch/arm/mach-shmobile/board-ap4evb.c |  147 +++++++++++++++++++++++++--------
 arch/arm/mach-shmobile/clock-sh7372.c |   33 ++------
 include/sound/sh_fsi.h                |    6 +-
 sound/soc/sh/fsi.c                    |   25 ++++--
 4 files changed, 140 insertions(+), 71 deletions(-)
#1 lore raw
Quoted 6 lines · Paul Mundt

Please pull from:

       master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-fixes-for-linus

Which contains:

Hmm. I´m not getting that. I only see the single

ARM: mach-shmobile: sh7372 USB0/IIC1 MSTP fix

commit there. Forgot to push out?

Linus

author
#2 lore raw
Quoted 6 lines · Linus Torvalds
Quoted 5 lines · Paul Mundt

Please pull from:

? ? ? ?master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-fixes-for-linus

Quoted 8 lines
Quoted 1 line

Which contains:

Hmm. I?m not getting that. I only see the single

ARM: mach-shmobile: sh7372 USB0/IIC1 MSTP fix

commit there. Forgot to push out?

Looks that way. Pushed now, sorry for the noise.