* [GIT PULL] rmobile updates for 2.6.37-rc2
@ 2010-11-08 1:13 Paul Mundt
2010-11-24 13:50 ` [GIT PULL] rmobile updates for 2.6.37-rc4 Paul Mundt
2010-12-20 16:14 ` [GIT PULL] rmobile updates for 2.6.37-rc7 Paul Mundt
0 siblings, 2 replies; 5+ messages in thread
From: Paul Mundt @ 2010-11-08 1:13 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-sh, linux-kernel
As discussed at kernel summit, here's the first attempt at bringing the
SH/R-Mobile bits in to a more coherent branch topology within the SH tree
proper. Following this I'll be killing off my ARM tree completely and
simply sticking with this approach.
There's nothing really exciting here, with the exception of the FSIDIV
clock addition. This is something that the HDMI audio depends on and has
up until now been blocked on core infrastructure patches in the SH tree,
all of which were merged during -rc1. These have all been sitting in
-next for the last few weeks and have had extensive out-of-tree testing
since well before that, so there should be no real surprises here.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-fixes-for-linus
Which contains:
Guennadi Liakhovetski (1):
ARM: mach-shmobile: fix sh7372 after a recent clock framework rework
Kuninori Morimoto (2):
ARM: mach-shmobile: clock-sh7372: Add FSIDIV clock support
ARM: mach-shmobile: ap4evb: Add HDMI sound support
Magnus Damm (1):
ARM: shmobile: remove sh_timer_config clk member
Paul Mundt (3):
ARM: mach-shmobile: include drivers/sh/Kconfig
ARM: mach-shmobile: Allow GPIO chips to register IRQ mappings.
mmc: sh_mmcif: Convert extern inline to static inline.
arch/arm/mach-shmobile/Kconfig | 2 +
arch/arm/mach-shmobile/board-ap4evb.c | 46 +++++++++++-
arch/arm/mach-shmobile/clock-sh7372.c | 102 ++++++++++++++++++++++++++
arch/arm/mach-shmobile/include/mach/gpio.h | 4 +-
arch/arm/mach-shmobile/include/mach/sh7372.h | 2 +
drivers/clocksource/sh_cmt.c | 10 +--
drivers/clocksource/sh_mtu2.c | 10 +--
drivers/clocksource/sh_tmu.c | 10 +--
include/linux/mmc/sh_mmcif.h | 18 ++--
include/linux/sh_timer.h | 1 -
10 files changed, 171 insertions(+), 34 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [GIT PULL] rmobile updates for 2.6.37-rc4
2010-11-08 1:13 [GIT PULL] rmobile updates for 2.6.37-rc2 Paul Mundt
@ 2010-11-24 13:50 ` Paul Mundt
2010-11-24 22:02 ` Linus Torvalds
2010-12-20 16:14 ` [GIT PULL] rmobile updates for 2.6.37-rc7 Paul Mundt
1 sibling, 1 reply; 5+ messages in thread
From: Paul Mundt @ 2010-11-24 13:50 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-sh, linux-kernel
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(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [GIT PULL] rmobile updates for 2.6.37-rc4
2010-11-24 13:50 ` [GIT PULL] rmobile updates for 2.6.37-rc4 Paul Mundt
@ 2010-11-24 22:02 ` Linus Torvalds
2010-11-25 6:57 ` Paul Mundt
0 siblings, 1 reply; 5+ messages in thread
From: Linus Torvalds @ 2010-11-24 22:02 UTC (permalink / raw)
To: Paul Mundt; +Cc: linux-sh, linux-kernel
On Wed, Nov 24, 2010 at 10:50 PM, Paul Mundt <lethal@linux-sh.org> wrote:
>
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [GIT PULL] rmobile updates for 2.6.37-rc4
2010-11-24 22:02 ` Linus Torvalds
@ 2010-11-25 6:57 ` Paul Mundt
0 siblings, 0 replies; 5+ messages in thread
From: Paul Mundt @ 2010-11-25 6:57 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-sh, linux-kernel
On Thu, Nov 25, 2010 at 07:02:03AM +0900, Linus Torvalds wrote:
> On Wed, Nov 24, 2010 at 10:50 PM, Paul Mundt <lethal@linux-sh.org> wrote:
> >
> > 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?
>
Looks that way. Pushed now, sorry for the noise.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] rmobile updates for 2.6.37-rc7
2010-11-08 1:13 [GIT PULL] rmobile updates for 2.6.37-rc2 Paul Mundt
2010-11-24 13:50 ` [GIT PULL] rmobile updates for 2.6.37-rc4 Paul Mundt
@ 2010-12-20 16:14 ` Paul Mundt
1 sibling, 0 replies; 5+ messages in thread
From: Paul Mundt @ 2010-12-20 16:14 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-sh, linux-kernel
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-fixes-for-linus
Which contains:
Magnus Damm (2):
ARM: mach-shmobile: fix compile warning in mm/init.c
ARM: mach-shmobile: INTC interrupt priority level demux fix
arch/arm/mach-shmobile/include/mach/entry-macro.S | 30 ++++++++++++++++++---
arch/arm/mach-shmobile/include/mach/vmalloc.h | 2 +-
2 files changed, 27 insertions(+), 5 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-20 16:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-08 1:13 [GIT PULL] rmobile updates for 2.6.37-rc2 Paul Mundt
2010-11-24 13:50 ` [GIT PULL] rmobile updates for 2.6.37-rc4 Paul Mundt
2010-11-24 22:02 ` Linus Torvalds
2010-11-25 6:57 ` Paul Mundt
2010-12-20 16:14 ` [GIT PULL] rmobile updates for 2.6.37-rc7 Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).