* [GIT PULL] ARM: SoC fixes for 3.16-rc
From: Olof Johansson @ 2014-07-19 5:49 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
The following changes since commit cacadb4ff969a82628d47db87b5a531be466b134:
Merge tag 'samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes (2014-07-12 21:19:21 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus
for you to fetch changes up to 9637f30e6b7bc394c08fa9d27d63622f141142e9:
ARM: EXYNOS: Fix core ID used by platsmp and hotplug code (2014-07-18 17:12:57 -0700)
----------------------------------------------------------------
ARM: SoC fixes for 3.16-rc
A smaller set of fixes this week, and all regression fixes:
- a handful of issues fixed on at91 with common clock conversion
- a set of fixes for Marvell mvebu (SMP, coherency, PM)
- a clock fix for i.MX6Q.
- ... and a SMP/hotplug fix for Exynos
----------------------------------------------------------------
Bo Shen (1):
ARM: at91: at91sam9x5: correct typo error for ohci clock
Boris BREZILLON (2):
ARM: at91/dt: fix usb0 clocks definition in sam9n12 dtsi
ARM: at91/dt: add missing clocks property to pwm node in sam9x5.dtsi
Ezequiel Garcia (1):
ARM: mvebu: Fix coherency bus notifiers by using separate notifiers
Gregory CLEMENT (1):
ARM: mvebu: Fix the operand list in the inline asm of armada_370_xp_pmsu_idle_enter
Lucas Stach (1):
ARM: clk-imx6q: parent lvds_sel input from upstream clock gates
Olof Johansson (3):
Merge tag 'mvebu-fixes-3.16-3' of git://git.infradead.org/linux-mvebu into fixes
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
Merge tag 'imx-fixes-3.16-2' of git://git.kernel.org/.../shawnguo/linux into fixes
Thomas Petazzoni (1):
ARM: mvebu: fix SMP boot for Armada 38x and Armada 375 Z1 in big endian
Tomasz Figa (1):
ARM: EXYNOS: Fix core ID used by platsmp and hotplug code
arch/arm/boot/dts/at91sam9n12.dtsi | 2 +-
arch/arm/boot/dts/at91sam9x5.dtsi | 4 ++--
arch/arm/mach-exynos/hotplug.c | 10 ++++++----
arch/arm/mach-exynos/platsmp.c | 34 +++++++++++++++++++---------------
arch/arm/mach-imx/clk-imx6q.c | 4 ++--
arch/arm/mach-mvebu/coherency.c | 6 +++++-
arch/arm/mach-mvebu/headsmp-a9.S | 9 ++++++++-
arch/arm/mach-mvebu/pmsu.c | 10 +++++-----
8 files changed, 48 insertions(+), 31 deletions(-)
^ permalink raw reply
* [GIT PULL] ARM: SPEAr13xx PCIe updates for v3.17
From: Olof Johansson @ 2014-07-19 5:33 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20140719045804.GC20064@quad.lixom.net>
On Fri, Jul 18, 2014 at 09:58:04PM -0700, Olof Johansson wrote:
> On Wed, Jul 16, 2014 at 02:33:03PM +0530, Viresh Kumar wrote:
> > Hi Olof/Arnd,
> >
> > This is another attempt to merge SPEAr PCIe updates after olof
> > pointed out *enough* issues with initial PULL request:
> >
> > https://lkml.org/lkml/2014/7/9/641
> >
> > Last version was sent here: http://patchwork.ozlabs.org/patch/368479/
> > and all the nits pointed out by Kishon & Bjorn are fixed in this pull
> > request.
> >
> > Apart from ARM specific changes, this updates drivers/{pci|phy}. Bjorn
> > advised to get complete series via arm-soc tree earlier:
> >
> > http://www.spinics.net/lists/linux-pci/msg30271.html
> >
> > Please let me know if I couldn't get it right this time.
>
> Looks good. Thanks for following up on this and fixing up stuff.
>
> >
> > The following changes since commit 4c834452aad01531db949414f94f817a86348d59:
> >
> > Linux 3.16-rc3 (2014-06-29 14:11:36 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux.git
> > spear/pcie-support-v10
> >
> > for you to fetch changes up to f6e670a3b62d23722d04e801244a068755a45b7a:
> >
> > ARM: SPEAr13xx: Update defconfigs (2014-07-14 11:04:44 +0530)
>
> Merged into next/drivers.
>
> If anything, just one thing: you should consider using signed tags. :)
Also, there's a conflict with one of the fixes that were sent earlier.
It'd been nice to keep this based on the -rc that had that fix to avoid the
conflict. Please check the contents in our for-next.
-Olof
^ permalink raw reply
* [GIT PULL] Samsung fixes-4 for v3.16
From: Olof Johansson @ 2014-07-19 5:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <022101cfa30f$e9fa0fb0$bdee2f10$@samsung.com>
On Fri, Jul 18, 2014 at 10:11 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Olof Johansson wrote:
>>
>> On Fri, Jul 18, 2014 at 5:43 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>> > On 07/19/14 09:18, Kukjin Kim wrote:
>> >>
>> >> On 07/19/14 09:12, Olof Johansson wrote:
>> >>>
>> >>> On Fri, Jul 18, 2014 at 4:34 PM, Kukjin Kim<kgene.kim@samsung.com> wrote:
>> >>>>
>> >>>> Hi,
>> >>>>
>> >>>> This is a regression for v3.16 so please take this in -rc.
>> >>>>
>> >>>> Thanks,
>> >>>> Kukjin
>> >>>>
>> >>>> The following changes since commit
>> >>>> 1795cd9b3a91d4b5473c97f491d63892442212ab:
>> >>>>
>> >>>> Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
>> >>>>
>> >>>> are available in the git repository at:
>> >>>>
>> >>>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>> >>>> tags/samsung-fixes-4
>> >>>>
>> >>>> for you to fetch changes up to 4e3a498d6fc438d8c203c51aadc6ca8fb47b0577:
>> >>>>
>> >>>> ARM: EXYNOS: Fix core ID used by platsmp and hotplug code (2014-07-16
>> >>>> 02:59:18 +0900)
>> >>>
>> >>>
>> >>> This is based on a newer branch than our current fixes. So I've cherry
>> >>> picked the patch instead of merged the branch -- if you have the
>> >>> branch in linux-next you should remove it.
>> >>>
>> >> OK, I will.
>> >>
>> > BTW, other pm related branches in my tree have dependencies with the change
>> > so I just reverted that in my -next.
>> >
>> > If any problems, please let me know.
>>
>> Are they part of the branches you sent now? Is that patch a base in
>> those branches?
>>
> No, I didn't send out any branch including the fix to arm-soc because I also
> don't want to make any conflict or inconvenience for you :) Just thought, I
> need to sort it out once it has been merged into mainline.
Ok, it should be in for -rc6.
-Olof
^ permalink raw reply
* [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17
From: Olof Johansson @ 2014-07-19 5:27 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <cover.1405556312.git.horms+renesas@verge.net.au>
On Thu, Jul 17, 2014 at 09:40:20AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC DT Timers updates for v3.17.
>
> This pull request is based on a merge of the following to provide
> all dependencies and try to eliminate conflicts. It turns out the changes
> in this pull requests are a nexus for dependencies due to modifying DT,
> SoC, board and recently moved header files as well as requiring driver
> changes.
>
> * The clockevents/renesas-timers-dt branch of Daniel Lezcano's tree.
> He has indicated that this branch has stable commit ids and will
> be included in v3.17. Olof and arm at kernel.org were CCed on the
> thread where he, Laurent Pinchart and I discussed the use of that branch.
>
> The clockevents/renesas-timers-dt's branch is in turn based on v3.16-rc3.
>
> * "Third Round of Renesas ARM Based SoC DT Updates for v3.17",
> tagged as renesas-dt3-for-v3.17, which I have sent a pull request for.
>
> * "Renesas ARM Based SoC Clock Updates for v3.17",
> tagged as renesas-clock-for-v3.17, which you have merged
> into next/soc
>
> * "Second Round of Renesas ARM Based SoC soc-cleanup Updates for v3.17",
> tagged as renesas-soc-cleanup2-for-v3.17, which you have merged
> into next/cleanup.
>
> * "Third Round of Renesas ARM Based SoC r8a7779 Multiplatform Updates for
> v3.17", tagged as renesas-r8a7779-multiplatform3-for-v3.17, which
> you have merged into next/soc
>
> * "Renesas ARM Based SoC Boards Updates for v3.17",
> tagged as renesas-boards-for-v3.17, which you have merged
> into next/boards
>
> * "Third Round of Renesas ARM Based SoC Updates for v3.17",
> tagged as renesas-soc3-for-v3.17, which you have merged
> into next/soc
>
>
> The following changes since commit 5c174afd407acc7a90701900b279578151bc007f:
>
> Merge branch 'clockevents/renesas-timers-dt' of git://git.linaro.org/people/daniel.lezcano/linux into dt-timers-for-v3.17.base (2014-07-15 16:31:45 +0900)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-timers-for-v3.17
>
> for you to fetch changes up to 9394af4314554d15762585a3464cefaa2e6d0420:
>
> ARM: shmobile: genmai-reference: Enable MTU2 in device tree (2014-07-15 21:26:42 +0900)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC DT Timers Updates for v3.17
>
> * Enable timers using DT when booting boards without Legacy-C code
>
> ----------------------------------------------------------------
> Laurent Pinchart (8):
> ARM: shmobile: r8a7790: Add CMT devices to DT
> ARM: shmobile: r8a7791: Add CMT devices to DT
> ARM: shmobile: r8a7779: Add TMU devices to DT
> ARM: shmobile: lager-reference: Enable CMT0 in device tree
> ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
> ARM: shmobile: marzen-reference: Enable TMU0 in device tree
> ARM: shmobile: r7s72100: Add MTU2 device to DT
> ARM: shmobile: genmai-reference: Enable MTU2 in device tree
Ok, this branch definitely contains a lot more than this. For dependent
external branches such as clocksource, we still prefer to see a pull request so
that we can merge in the dependency and get a clean diffstat when we do the
merge of your branch, otherwise it gets awkward to compare that what we're
getting is what you thought you sent (which is one of the things we check on
merges).
Please regenerate this pull request as appropriate.
-Olof
^ permalink raw reply
* [GIT PULL] omap dts changes for v3.17 merge window, part1
From: Olof Johansson @ 2014-07-19 5:15 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20140716125553.GC18374@atomide.com>
On Wed, Jul 16, 2014 at 05:55:58AM -0700, Tony Lindgren wrote:
> The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
>
> Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.17/dt-part1
>
> for you to fetch changes up to 3c9464ed75d6c15ee864da6d8f6a4cd3b0f2c934:
>
> ARM: DTS: omap5-uevm: Enable basic audio (McPDM <-> twl6040) (2014-07-15 00:21:25 -0700)
>
> ----------------------------------------------------------------
> First set of .dts changes for omaps for v3.17 merge
> window:
>
> - Enable irqchip crossbar interrupt mapping. These changes
> are based on an immutable irqchip branch set up by Jason
> Cooper to make it easier to merge the related .dts changes.
>
> - Removal of omap2 related static clock data that now comes
> from device tree.
>
> - Enabling of PHY regulators for various omaps
>
> - Enabling of PCIe for dra7
>
> - Add support for am437x starterkit
>
> - Enable audio for for omap5
>
> - Enable display and am335x-evmsk
Merged, but:
1) There was a conflict in the qspi node of dra7.dtsi due to a fix to
remove the interrupts property. It'd be nice to get these branches
based on the fixes so that we don't see these conflicts (or at least
get told about them). Besides, if we happen to have an older base in
our branch than what had the fix, it'll bubble all the way up to Linus.
2) There was an add/add conflict in the dra7.dtsi file, due to new
entries just being appended. Please keep these sorted on address to
avoid that.
-Olof
^ permalink raw reply
* [GIT PULL] Samsung fixes-4 for v3.16
From: Kukjin Kim @ 2014-07-19 5:11 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAOesGMgX2m4UbO756JbtQLZVJv3SY+dXDE+My-OeY0oCFA-aew@mail.gmail.com>
Olof Johansson wrote:
>
> On Fri, Jul 18, 2014 at 5:43 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > On 07/19/14 09:18, Kukjin Kim wrote:
> >>
> >> On 07/19/14 09:12, Olof Johansson wrote:
> >>>
> >>> On Fri, Jul 18, 2014 at 4:34 PM, Kukjin Kim<kgene.kim@samsung.com> wrote:
> >>>>
> >>>> Hi,
> >>>>
> >>>> This is a regression for v3.16 so please take this in -rc.
> >>>>
> >>>> Thanks,
> >>>> Kukjin
> >>>>
> >>>> The following changes since commit
> >>>> 1795cd9b3a91d4b5473c97f491d63892442212ab:
> >>>>
> >>>> Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
> >>>>
> >>>> are available in the git repository at:
> >>>>
> >>>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> >>>> tags/samsung-fixes-4
> >>>>
> >>>> for you to fetch changes up to 4e3a498d6fc438d8c203c51aadc6ca8fb47b0577:
> >>>>
> >>>> ARM: EXYNOS: Fix core ID used by platsmp and hotplug code (2014-07-16
> >>>> 02:59:18 +0900)
> >>>
> >>>
> >>> This is based on a newer branch than our current fixes. So I've cherry
> >>> picked the patch instead of merged the branch -- if you have the
> >>> branch in linux-next you should remove it.
> >>>
> >> OK, I will.
> >>
> > BTW, other pm related branches in my tree have dependencies with the change
> > so I just reverted that in my -next.
> >
> > If any problems, please let me know.
>
> Are they part of the branches you sent now? Is that patch a base in
> those branches?
>
No, I didn't send out any branch including the fix to arm-soc because I also
don't want to make any conflict or inconvenience for you :) Just thought, I
need to sort it out once it has been merged into mainline.
Thanks,
Kukjin
^ permalink raw reply
* [GIT PULL] ARM: SPEAr13xx PCIe updates for v3.17
From: Olof Johansson @ 2014-07-19 4:58 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAKohpo=T3taZx8e39tenCRBNxCUr=7H2xG7Ng=e+YQXuuY9u8Q@mail.gmail.com>
On Wed, Jul 16, 2014 at 02:33:03PM +0530, Viresh Kumar wrote:
> Hi Olof/Arnd,
>
> This is another attempt to merge SPEAr PCIe updates after olof
> pointed out *enough* issues with initial PULL request:
>
> https://lkml.org/lkml/2014/7/9/641
>
> Last version was sent here: http://patchwork.ozlabs.org/patch/368479/
> and all the nits pointed out by Kishon & Bjorn are fixed in this pull
> request.
>
> Apart from ARM specific changes, this updates drivers/{pci|phy}. Bjorn
> advised to get complete series via arm-soc tree earlier:
>
> http://www.spinics.net/lists/linux-pci/msg30271.html
>
> Please let me know if I couldn't get it right this time.
Looks good. Thanks for following up on this and fixing up stuff.
>
> The following changes since commit 4c834452aad01531db949414f94f817a86348d59:
>
> Linux 3.16-rc3 (2014-06-29 14:11:36 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux.git
> spear/pcie-support-v10
>
> for you to fetch changes up to f6e670a3b62d23722d04e801244a068755a45b7a:
>
> ARM: SPEAr13xx: Update defconfigs (2014-07-14 11:04:44 +0530)
Merged into next/drivers.
If anything, just one thing: you should consider using signed tags. :)
-Olof
^ permalink raw reply
* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.17
From: Olof Johansson @ 2014-07-19 4:48 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <cover.1405398515.git.horms+renesas@verge.net.au>
On Tue, Jul 15, 2014 at 06:16:36PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these third round of Renesas ARM based SoC DT updates for v3.17.
>
> This pull request is based on a merge of:
>
> * The previous round of such requests, tagged as renesas-dt2-for-v3.17,
> which you have already pulled into next/dt and;
> * The second round of Renesas ARM Based SoC Clock Updates for v3.17,
> tagged as renesas-clock2-for-v3.17, which I have send a pull request for.
>
> The reason for the clock update is to provide run-time dependencies
> to allow SCI to be initialised on DT on SoCs that do not yet have
> CCF support. The key word being yet, it is being worked on.
>
> which I have already sent a pull-request for.
>
>
> The following changes since commit 963b0c359bf5d284fc597bed07a668cb7396bfd2:
>
> Merge branch 'clock-for-v3.17' into dt-for-v3.17 (2014-07-12 15:16:37 +0200)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.17
>
> for you to fetch changes up to 700ce7c2bb2a4963472d95eba1436d6b0945918e:
>
> ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT (2014-07-12 15:16:58 +0200)
Hi,
The diffstat I got were not the same as you, I get more diffs, and more
patches. It seems that you specified your merge commit as the base, while you
had new patches applied before the merge too.
Anyway, merged since the contents looked generally OK.
-Olof
^ permalink raw reply
* [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.17
From: Olof Johansson @ 2014-07-19 4:31 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <cover.1405398284.git.horms+renesas@verge.net.au>
On Tue, Jul 15, 2014 at 06:16:22PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these second round of Renesas ARM based SoC clock updates for v3.17.
>
> This pull request is based on the previous round of
> such requests, tagged as renesas-clock-for-v3.17,
> which you have already pulled into next/soc.
>
> CCF support for the SoCs in question is being worked on,
> so I expect this code to be a temporary measure.
>
>
> The following changes since commit edc8fb1d6ebdfc4efa009073586d3567c3368475:
>
> ARM: shmobile: Fix device node reference leakage in shmobile_init_delay (2014-06-16 19:52:00 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-clock2-for-v3.17
>
> for you to fetch changes up to ff4ce48e1f163d945c037c1c90ce12950961d91d:
>
> ARM: shmobile: sh73a0: add SCI clock support for DT (2014-07-12 15:15:39 +0200)
Merged, thanks.
-Olof
^ permalink raw reply
* [GIT PULL] Samsung fixes-4 for v3.16
From: Olof Johansson @ 2014-07-19 4:21 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <53C9BF34.2030903@samsung.com>
On Fri, Jul 18, 2014 at 5:43 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> On 07/19/14 09:18, Kukjin Kim wrote:
>>
>> On 07/19/14 09:12, Olof Johansson wrote:
>>>
>>> On Fri, Jul 18, 2014 at 4:34 PM, Kukjin Kim<kgene.kim@samsung.com> wrote:
>>>>
>>>> Hi,
>>>>
>>>> This is a regression for v3.16 so please take this in -rc.
>>>>
>>>> Thanks,
>>>> Kukjin
>>>>
>>>> The following changes since commit
>>>> 1795cd9b3a91d4b5473c97f491d63892442212ab:
>>>>
>>>> Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
>>>>
>>>> are available in the git repository at:
>>>>
>>>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>>>> tags/samsung-fixes-4
>>>>
>>>> for you to fetch changes up to 4e3a498d6fc438d8c203c51aadc6ca8fb47b0577:
>>>>
>>>> ARM: EXYNOS: Fix core ID used by platsmp and hotplug code (2014-07-16
>>>> 02:59:18 +0900)
>>>
>>>
>>> This is based on a newer branch than our current fixes. So I've cherry
>>> picked the patch instead of merged the branch -- if you have the
>>> branch in linux-next you should remove it.
>>>
>> OK, I will.
>>
> BTW, other pm related branches in my tree have dependencies with the change
> so I just reverted that in my -next.
>
> If any problems, please let me know.
Are they part of the branches you sent now? Is that patch a base in
those branches?
-Olof
^ permalink raw reply
* [PATCH 2/4] ARM: add IPI tracepoints
From: Steven Rostedt @ 2014-07-19 3:30 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <alpine.LFD.2.11.1407182249020.3647@knanqh.ubzr>
On Fri, 18 Jul 2014 22:55:12 -0400 (EDT)
Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
> Any comments / ACKs on the other patches? I'd like to see 1/4 to 3/4
> (and your patch) merged upstream during the next window. 4/4 is up for
> debate.
You can add my Acked-by for patches 1,2 and 3, after the clean up of
the #ifdefs there.
I still don't like the fact that you need to add the #undef in patch 4.
I'm looking at other ways to fix that. I tried to do a few different
clean ups in the tracing infrastructure, but it seems that it may be
required. The other method I may try is to move the #undefs into the
ipi.h header itself.
I'll play more with this on Monday.
-- Steve
^ permalink raw reply
* [PATCH 2/4] ARM: add IPI tracepoints
From: Nicolas Pitre @ 2014-07-19 2:55 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20140718172221.6dbe83e4@gandalf.local.home>
On Fri, 18 Jul 2014, Steven Rostedt wrote:
> On Fri, 18 Jul 2014 16:55:42 -0400 (EDT)
> Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
>
> >
> > Here's the patch I have at the head of the series now, with the above
> > ugliness changed to an unconditional __tracepoint_string attribute.
> >
>
> I was thinking of something like this. Feel free to add this to your
> series.
OK. Same end result, but much clearer. Thanks.
Any comments / ACKs on the other patches? I'd like to see 1/4 to 3/4
(and your patch) merged upstream during the next window. 4/4 is up for
debate.
> -- Steve
>
> From: Steven Rostedt <rostedt@goodmis.org>
> Subject: [PATCH] tracing: Do not do anything special with tracepoint_string when tracing is disabled
>
> When CONFIG_TRACING is not enabled, there's no reason to save the trace
> strings either by the linker or as a static variable that can be
> referenced later. Simply pass back the string that is given to
> tracepoint_string().
>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
> ---
> diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
> index cff3106..b296363 100644
> --- a/include/linux/ftrace_event.h
> +++ b/include/linux/ftrace_event.h
> @@ -574,6 +574,7 @@ do { \
> __trace_printk(ip, fmt, ##args); \
> } while (0)
>
> +#ifdef CONFIG_TRACING
> /**
> * tracepoint_string - register constant persistent string to trace system
> * @str - a constant persistent string that will be referenced in tracepoints
> @@ -607,6 +608,15 @@ do { \
> ___tp_str; \
> })
> #define __tracepoint_string __attribute__((section("__tracepoint_str")))
> +#else
> +/*
> + * tracepoint_string() is used to save the string address for userspace
> + * tracing tools. When tracing isn't configured, there's no need to save
> + * anything.
> + */
> +# define tracepoint_string(str) str
> +# define __tracepoint_string
> +#endif
>
> #ifdef CONFIG_PERF_EVENTS
> struct perf_event;
>
>
^ permalink raw reply
* [GIT PULL 5/5] Samsung DT updates for v3.17
From: Kukjin Kim @ 2014-07-19 0:53 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/samsung-dt
for you to fetch changes up to ccaba4527156da1619a23bafcb944e8e029d0573:
ARM: dts: Add I2S dt node for exynos3250 (2014-07-19 04:10:44 +0900)
----------------------------------------------------------------
Samsung DT updates for v3.17
exynos3250: add i2s dt for audio interface
exynos4
- cleanup arm-pmu node because of 4 pmu on
exynos4412 but 2 pmu on other exynos4 SoCs
- add support sub-nodes to exynos usb host for exynos4
exynos4412-odroid-common
- fix T-FLASH hotplug detection
- disable 'always on' for BUCK8
- add support for GPIO based buttons
- add MAX98090 audio codec
exynos4412-odroidx2 and exynos4412-odroidu3
- refactor exynos4412-odroidx and exynos4412-odroid-common
for odroid-x2 and u2/u3
exynos4412-odroidx
- add support for USB phy, host and device
- enable common hardware blocks, secure firmware calls,
watchdog, g2d and fimc (mem2mem) multimedia accelerators
- add support for USB phy, host and device
- correct memory size
exynos5410
- fill in CPU clock-frequency property to avoid warning
exynos5420
- remove display pd because of instability
exynos5420-peach-pit and exynos5800-peach-pi
- sort nodes each other to check its differences easily
- enable audio support and add sound-card name property
- add mask-tpm-reset node
- add cros_ec including keyboard, i2c tunnel and tps65090
and battery under the i2c tunnel
----------------------------------------------------------------
Andreas Faerber (1):
ARM: dts: Fill in CPU clock-frequency for exynos5410
Chanho Park (1):
ARM: dts: clean up arm-pmu node for exynos4
Doug Anderson (2):
ARM: dts: Add mask-tpm-reset node in exynos5420-peach-pit
ARM: dts: Add cros_ec to exynos5420-peach-pit and exynos5800-peach-pi
Kamil Debski (2):
ARM: dts: add support for USB phy, host and device for
exynos4412-odroidx
ARM: dts: disable 'always on' for BUCK8 regulator for
exynos4412-odroid-common
Marek Szyprowski (6):
ARM: dts: add port sub-nodes to exynos usb host modules for exynos4
ARM: dts: enable common hardware blocks for exynos4412-odroidx
ARM: dts: correct memory size for exynos4412-odroidx
ARM: dts: refactor Odroid DTS file and add support for Odroid X2
and U2/U3
ARM: dts: add support for GPIO buttons for exynos4412-odroid
ARM: dts: fix T-FLASH hotplug detection for exynos4412-odroid-common
Rahul Sharma (1):
ARM: dts: remove display power domain for exynos5420
Sylwester Nawrocki (1):
ARM: dts: Add sound nodes for Odroid-X2/U3 boards
Tomasz Figa (1):
ARM: dts: Add I2S dt node for exynos3250
Tushar Behera (3):
ARM: dts: Enable audio support for exynos5800-peach-pi
ARM: dts: Sort nodes within Peach-pit/Peach-pi dts files
ARM: dts: Add sound-card name for Snow/Peach-Pit/Peach-Pi
Vikas Sajjan (1):
ARM: dts: Add mask-tpm-reset node in exynos5800-peach-pi
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/exynos3250.dtsi | 13 +
arch/arm/boot/dts/exynos4.dtsi | 30 ++
arch/arm/boot/dts/exynos4210.dtsi | 6 -
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 371
++++++++++++++++++++++
arch/arm/boot/dts/exynos4412-odroidu3.dts | 61 ++++
arch/arm/boot/dts/exynos4412-odroidx.dts | 279 ++---------------
arch/arm/boot/dts/exynos4412-odroidx2.dts | 32 ++
arch/arm/boot/dts/exynos4412.dtsi | 4 +
arch/arm/boot/dts/exynos4x12.dtsi | 6 -
arch/arm/boot/dts/exynos5250-snow.dts | 1 +
arch/arm/boot/dts/exynos5410.dtsi | 4 +
arch/arm/boot/dts/exynos5420-peach-pit.dts | 392
+++++++++++++++++-------
arch/arm/boot/dts/exynos5420.dtsi | 6 -
arch/arm/boot/dts/exynos5800-peach-pi.dts | 374
++++++++++++++++------
15 files changed, 1106 insertions(+), 475 deletions(-)
create mode 100644 arch/arm/boot/dts/exynos4412-odroid-common.dtsi
create mode 100644 arch/arm/boot/dts/exynos4412-odroidu3.dts
create mode 100644 arch/arm/boot/dts/exynos4412-odroidx2.dts
^ permalink raw reply
* [GIT PULL 4/5] Samsung exynos_mct update for v3.17
From: Kukjin Kim @ 2014-07-19 0:52 UTC (permalink / raw)
To: linux-arm-kernel
Note that this is also based on 3.16-rc5 because of dependency with
previous samsung fixes including exynos_mct already merged in mainline
during -rc.
The following changes since commit 1795cd9b3a91d4b5473c97f491d63892442212ab:
Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/exynos-mct
for you to fetch changes up to 1a631118c1d085fe162f3b6d44f710c72206ef2d:
clocksource: exynos_mct: Only use 32-bits where possible (2014-07-19
03:07:52 +0900)
----------------------------------------------------------------
exynos_mct update for v3.17
- only use 32-bit access for performance benefits on exynos
32-bit system and this means ARCH timer should be supported
on exynos 64-bit system instead of current MCT.
- use readl_relaxed/writel_relaxed to consistently use the
proper functions in exynos_mct.
----------------------------------------------------------------
Doug Anderson (2):
clocksource: exynos_mct: use readl_relaxed/writel_relaxed
clocksource: exynos_mct: Only use 32-bits where possible
drivers/clocksource/Kconfig | 1 +
drivers/clocksource/exynos_mct.c | 63
++++++++++++++++++++++++++++------------
2 files changed, 45 insertions(+), 19 deletions(-)
^ permalink raw reply
* [GIT PULL 3/5] Samsung exynos cpuidle update for v3.17
From: Kukjin Kim @ 2014-07-19 0:52 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 1795cd9b3a91d4b5473c97f491d63892442212ab:
Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/exynos-cpuidle
for you to fetch changes up to fc2cac41ebbfb16da8b036cba6ec6714ab780a6d:
ARM: EXYNOS: populate suspend and powered_up callbacks for mcpm
(2014-07-19 03:36:00 +0900)
----------------------------------------------------------------
exynos cpuidle update for v3.17
- add callbacks exynos_suspend() and exynos_powered_up()
for support cpuidle through mcpm
- skip exynos_cpuidle for exynos5420 because is uses
cpuidle-big-liggle generic cpuidle driver
- add generic functions to calculate cpu number is used
for pmu and this is required for exynos5420 multi-cluster
- add of_device_id structure for big.LITTLE cpuidle and
add "samsung,exynos5420" compatible string for exynos5420
----------------------------------------------------------------
Chander Kashyap (6):
cpuidle: big.LITTLE: add of_device_id structure
ARM: EXYNOS: add generic function to calculate cpu number
cpuidle: big.LITTLE: Add ARCH_EXYNOS entry in config
cpuidle: big.LITTLE: init driver for exynos5420
ARM: EXYNOS: do not allow cpuidle registration for exynos5420
ARM: EXYNOS: populate suspend and powered_up callbacks for mcpm
arch/arm/mach-exynos/exynos.c | 4 +++-
arch/arm/mach-exynos/mcpm-exynos.c | 36
++++++++++++++++++++++++++++++++++++
arch/arm/mach-exynos/regs-pmu.h | 9 +++++++++
drivers/cpuidle/Kconfig.arm | 2 +-
drivers/cpuidle/cpuidle-big_little.c | 12 +++++++++++-
5 files changed, 60 insertions(+), 3 deletions(-)
^ permalink raw reply
* [GIT PULL 2/5] Samsung cleanup for v3.17
From: Kukjin Kim @ 2014-07-19 0:52 UTC (permalink / raw)
To: linux-arm-kernel
Note that this is based on 3.16-rc5 because of dependency with previous
samsung fixes already merged in mainline during -rc.
The following changes since commit 1795cd9b3a91d4b5473c97f491d63892442212ab:
Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/samsung-cleanup
for you to fetch changes up to fce9e5bb25264153f9f002eada41757118d25ba9:
ARM: EXYNOS: Add support for mapping PMU base address via DT
(2014-07-15 08:40:32 +0900)
----------------------------------------------------------------
Samsung cleanup for v3.17
: Most of them are for exynos SoCs, remove useless
codes and update for PMU consolidation.
- remove unnecessary header file in mach-exynos/pmu.c
- remove unused code in mach-exynos/common.h
- remove mach-exynos/regs-pmu.h dependency from PD
- remove file path from comment section in mach-exynos
- move SYSREG definitions into mach-exynos/regs-sys.h
- add mapping PMU base address via DT for PMU cleanup
- use staic in mach-exynos/common.h
- update Samsung UART config options for low-level debug
----------------------------------------------------------------
Pankaj Dubey (6):
ARM: EXYNOS: Make exynos machine_ops as static
ARM: EXYNOS: Move SYSREG definition into sys-reg specific file
ARM: EXYNOS: Remove file path from comment section
ARM: EXYNOS: Remove regs-pmu.h header dependency from pm_domain
ARM: EXYNOS: Remove "linux/bug.h" from pmu.c
ARM: EXYNOS: Add support for mapping PMU base address via DT
Sachin Kamat (2):
ARM: debug: Update Samsung UART config options
ARM: EXYNOS: Remove unused code in common.h
arch/arm/Kconfig.debug | 20 +++-----------
arch/arm/mach-exynos/common.h | 13 +--------
arch/arm/mach-exynos/exynos.c | 44
++++++++++++++++++++++++++++--
arch/arm/mach-exynos/headsmp.S | 1 -
arch/arm/mach-exynos/hotplug.c | 3 +-
arch/arm/mach-exynos/include/mach/map.h | 3 +-
arch/arm/mach-exynos/include/mach/memory.h | 3 +-
arch/arm/mach-exynos/platsmp.c | 3 +-
arch/arm/mach-exynos/pm.c | 1 +
arch/arm/mach-exynos/pm_domains.c | 9 +++---
arch/arm/mach-exynos/pmu.c | 1 -
arch/arm/mach-exynos/regs-pmu.h | 4 ---
arch/arm/mach-exynos/regs-sys.h | 22 +++++++++++++++
13 files changed, 77 insertions(+), 50 deletions(-)
create mode 100644 arch/arm/mach-exynos/regs-sys.h
^ permalink raw reply
* [GIT PULL 1/5] Samsung non-critical-fixes for v3.17
From: Kukjin Kim @ 2014-07-19 0:51 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 1795cd9b3a91d4b5473c97f491d63892442212ab:
Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/fixes-for-3.17
for you to fetch changes up to 042b687f880adcca77847688aac35e2e16927944:
ARM: EXYNOS: Fix build breakge with PM_SLEEP=n (2014-07-19 04:45:02
+0900)
----------------------------------------------------------------
Samsung non critical fixes for v3.17
- update exynos_defconfig for remove outdated configs and
enable most of the configs used on latest exynos platforms
- fix build breakge for exynos_defconfig with PM_SLEEP=n
----------------------------------------------------------------
Krzysztof Kozlowski (1):
ARM: EXYNOS: Fix build breakge with PM_SLEEP=n
Sachin Kamat (1):
ARM: exynos_defconfig: Update exynos_defconfig
arch/arm/configs/exynos_defconfig | 56 ++++++++++++++++++++++++++++-----
arch/arm/mach-exynos/platsmp.c | 66
+++++++++++++++++++++++++++++++++++++++
arch/arm/mach-exynos/pm.c | 66
---------------------------------------
3 files changed, 114 insertions(+), 74 deletions(-)
^ permalink raw reply
* [GIT PULL] Samsung fixes-4 for v3.16
From: Kukjin Kim @ 2014-07-19 0:43 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <53C9B952.6010000@samsung.com>
On 07/19/14 09:18, Kukjin Kim wrote:
> On 07/19/14 09:12, Olof Johansson wrote:
>> On Fri, Jul 18, 2014 at 4:34 PM, Kukjin Kim<kgene.kim@samsung.com> wrote:
>>> Hi,
>>>
>>> This is a regression for v3.16 so please take this in -rc.
>>>
>>> Thanks,
>>> Kukjin
>>>
>>> The following changes since commit
>>> 1795cd9b3a91d4b5473c97f491d63892442212ab:
>>>
>>> Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
>>>
>>> are available in the git repository at:
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>>> tags/samsung-fixes-4
>>>
>>> for you to fetch changes up to 4e3a498d6fc438d8c203c51aadc6ca8fb47b0577:
>>>
>>> ARM: EXYNOS: Fix core ID used by platsmp and hotplug code (2014-07-16
>>> 02:59:18 +0900)
>>
>> This is based on a newer branch than our current fixes. So I've cherry
>> picked the patch instead of merged the branch -- if you have the
>> branch in linux-next you should remove it.
>>
> OK, I will.
>
BTW, other pm related branches in my tree have dependencies with the
change so I just reverted that in my -next.
If any problems, please let me know.
Thanks,
Kukjin
^ permalink raw reply
* [GIT PULL] Samsung fixes-4 for v3.16
From: Kukjin Kim @ 2014-07-19 0:18 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAOesGMgt50Ut8qv+ifDHoSQCBV4NNu-tx6B_t=T7D5SHVx0XMg@mail.gmail.com>
On 07/19/14 09:12, Olof Johansson wrote:
> On Fri, Jul 18, 2014 at 4:34 PM, Kukjin Kim<kgene.kim@samsung.com> wrote:
>> Hi,
>>
>> This is a regression for v3.16 so please take this in -rc.
>>
>> Thanks,
>> Kukjin
>>
>> The following changes since commit 1795cd9b3a91d4b5473c97f491d63892442212ab:
>>
>> Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>> tags/samsung-fixes-4
>>
>> for you to fetch changes up to 4e3a498d6fc438d8c203c51aadc6ca8fb47b0577:
>>
>> ARM: EXYNOS: Fix core ID used by platsmp and hotplug code (2014-07-16
>> 02:59:18 +0900)
>
> This is based on a newer branch than our current fixes. So I've cherry
> picked the patch instead of merged the branch -- if you have the
> branch in linux-next you should remove it.
>
OK, I will.
Thanks.
Kukjin
^ permalink raw reply
* [PATCH v4] PM / devfreq: Add possible_frequencies device attribute
From: Saravana Kannan @ 2014-07-19 0:15 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <725805840.101171405558256488.JavaMail.weblogic@epmlwas01c>
Some devices use freq_table instead of OPP. For those devices, the
available_frequencies sysfs file shows up empty. So, add a
possible_frequencies attribute/syfs file that list all the possible
frequencies.
For devices that use OPP, the output of this file will match
available_frequencies. It may change in the future to show all OPP
frequencies -- even the disabled ones.
Signed-off-by: Saravana Kannan <skannan@codeaurora.org>
---
Documentation/ABI/testing/sysfs-class-devfreq | 15 +++++++++++++++
drivers/devfreq/devfreq.c | 26 ++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/Documentation/ABI/testing/sysfs-class-devfreq b/Documentation/ABI/testing/sysfs-class-devfreq
index ee39aca..a461e67 100644
--- a/Documentation/ABI/testing/sysfs-class-devfreq
+++ b/Documentation/ABI/testing/sysfs-class-devfreq
@@ -72,6 +72,21 @@ Description:
This is a snapshot of available frequencies and not limited
by the min/max frequency restrictions.
+What: /sys/class/devfreq/.../possible_frequencies
+Date: July 2014
+Contact: Saravana Kannan <skannan@codeaurora.org>
+Description:
+ The /sys/class/devfreq/.../possible_frequencies shows
+ the possible frequencies of the corresponding devfreq object.
+ This is a snapshot of possible frequencies and not limited by
+ the min/max frequency restrictions. Unlike
+ available_frequencies, this is also does not require the
+ devfreq device to use OPP for listing its possible
+ frequencies. When OPP is used, this behaves the same way as
+ available_frequencies. It maybe improved in the future to
+ list all possible OPP frequencies even if some of them are
+ disabled at run-time.
+
What: /sys/class/devfreq/.../available_governors
Date: October 2012
Contact: Nishanth Menon <nm@ti.com>
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 9f90369..65eed38 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -994,6 +994,31 @@ static ssize_t available_frequencies_show(struct device *d,
}
static DEVICE_ATTR_RO(available_frequencies);
+static ssize_t possible_frequencies_show(struct device *d,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct devfreq *df = to_devfreq(d);
+ unsigned int i = 0;
+ ssize_t count = 0;
+
+ if (!df->profile->freq_table)
+ return available_frequencies_show(d, attr, buf);
+
+ for (i = 0; i < df->profile->max_state; i++)
+ count += scnprintf(&buf[count], (PAGE_SIZE - count - 2),
+ "%u ", df->profile->freq_table[i]);
+
+ /* Truncate the trailing space */
+ if (count)
+ count--;
+
+ count += sprintf(&buf[count], "\n");
+
+ return count;
+}
+static DEVICE_ATTR_RO(possible_frequencies);
+
static ssize_t trans_stat_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -1041,6 +1066,7 @@ static struct attribute *devfreq_attrs[] = {
&dev_attr_available_governors.attr,
&dev_attr_cur_freq.attr,
&dev_attr_available_frequencies.attr,
+ &dev_attr_possible_frequencies.attr,
&dev_attr_target_freq.attr,
&dev_attr_polling_interval.attr,
&dev_attr_min_freq.attr,
--
1.8.2.1
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related
* [PATCH] sched_clock: Avoid corrupting hrtimer tree during suspend
From: John Stultz @ 2014-07-19 0:14 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <53C9ACCA.3070306@codeaurora.org>
On 07/18/2014 04:24 PM, Stephen Boyd wrote:
> On 07/18/14 15:42, John Stultz wrote:
>> If its a regression (and needs -stable backports) it needs to go in via
>> tip/timers/urgent, and not via the regular merge window.
>>
>> Whats the additional risk -stable wise for canceling the timer during
>> suspend and starting it back up during resume?
>>
> I'd say close to zero given that we'd only be making the timer run a
> little bit later and we have slack in there already. Here's that version.
Ok, thanks. I'll try to do a closer review it and get it queued. Is
there anyone who might be able to validate this and provide a Tested-by: ?
thanks
-john
^ permalink raw reply
* [GIT PULL] Samsung fixes-4 for v3.16
From: Olof Johansson @ 2014-07-19 0:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <53C9AF23.6030007@samsung.com>
On Fri, Jul 18, 2014 at 4:34 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Hi,
>
> This is a regression for v3.16 so please take this in -rc.
>
> Thanks,
> Kukjin
>
> The following changes since commit 1795cd9b3a91d4b5473c97f491d63892442212ab:
>
> Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> tags/samsung-fixes-4
>
> for you to fetch changes up to 4e3a498d6fc438d8c203c51aadc6ca8fb47b0577:
>
> ARM: EXYNOS: Fix core ID used by platsmp and hotplug code (2014-07-16
> 02:59:18 +0900)
This is based on a newer branch than our current fixes. So I've cherry
picked the patch instead of merged the branch -- if you have the
branch in linux-next you should remove it.
Thanks,
-Olof
^ permalink raw reply
* mvebu cpuidle and cpufreq branch handling for v3.17
From: Rafael J. Wysocki @ 2014-07-18 23:51 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20140718230740.GR24496@titan.lakedaemon.net>
On Friday, July 18, 2014 07:07:40 PM Jason Cooper wrote:
> Arnd, Olof, Kevin,
>
> I have two branches with the remaining mvebu SoC changes for v3.17.
> They are mvebu/soc-cpuidle and mvebu/soc-cpufreq. Each branch is
> slightly problematic because both contain changes to their respective
> code in drivers/. To send the driver changes through the appropriate
> subsystems would be a garish nightmare of branch on branch on branch.
> Thankfully, the changes are isolated to drivers only mvebu uses, so
> keeping it all together should cause minimal, if any, conflicts.
>
> I've requested Acks from the appropriate maintainers but as it's summer
> I'm not confident that we'll receive those Acks in time for the arm-soc
> cutoff (-rc6 -ish).
>
> As I see it, I could send arm-soc two topic branch pull requests, which
> arm-soc would keep out separate on the remote chance of an objection.
>
> Or, I could wait for the Acks (the code has already been in -next for
> several days), merge it into mvebu/soc, and send a, most likely, late
> pull request for it.
>
> Which would you guys prefer?
>
> The cpuidle branch and ML link:
>
> git://git.infradead.org/linux-mvebu.git mvebu/soc-cpuidle
>
> https://lkml.kernel.org/r/1404913221-17343-1-git-send-email-thomas.petazzoni at free-electrons.com
>
> The cpufreq branch and ML link:
>
> git://git.infradead.org/linux-mvebu.git mvebu/soc-cpufreq
>
> https://lkml.kernel.org/r/1404920715-19834-1-git-send-email-thomas.petazzoni at free-electrons.com
I'm generally OK with the cpufreq/cpuidle changes here in drivers/, but as I
said in response to the cpuidle series, I'd like someone from the ARM side of
things to look at those changes too.
Rafael
^ permalink raw reply
* mvebu cpuidle and cpufreq branch handling for v3.17
From: Daniel Lezcano @ 2014-07-18 23:36 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <4295346.6091tevmKX@vostro.rjw.lan>
On 07/19/2014 01:51 AM, Rafael J. Wysocki wrote:
> On Friday, July 18, 2014 07:07:40 PM Jason Cooper wrote:
>> Arnd, Olof, Kevin,
>>
>> I have two branches with the remaining mvebu SoC changes for v3.17.
>> They are mvebu/soc-cpuidle and mvebu/soc-cpufreq. Each branch is
>> slightly problematic because both contain changes to their respective
>> code in drivers/. To send the driver changes through the appropriate
>> subsystems would be a garish nightmare of branch on branch on branch.
>> Thankfully, the changes are isolated to drivers only mvebu uses, so
>> keeping it all together should cause minimal, if any, conflicts.
>>
>> I've requested Acks from the appropriate maintainers but as it's summer
>> I'm not confident that we'll receive those Acks in time for the arm-soc
>> cutoff (-rc6 -ish).
>>
>> As I see it, I could send arm-soc two topic branch pull requests, which
>> arm-soc would keep out separate on the remote chance of an objection.
>>
>> Or, I could wait for the Acks (the code has already been in -next for
>> several days), merge it into mvebu/soc, and send a, most likely, late
>> pull request for it.
>>
>> Which would you guys prefer?
>>
>> The cpuidle branch and ML link:
>>
>> git://git.infradead.org/linux-mvebu.git mvebu/soc-cpuidle
>>
>> https://lkml.kernel.org/r/1404913221-17343-1-git-send-email-thomas.petazzoni at free-electrons.com
>>
>> The cpufreq branch and ML link:
>>
>> git://git.infradead.org/linux-mvebu.git mvebu/soc-cpufreq
>>
>> https://lkml.kernel.org/r/1404920715-19834-1-git-send-email-thomas.petazzoni at free-electrons.com
>
> I'm generally OK with the cpufreq/cpuidle changes here in drivers/, but as I
> said in response to the cpuidle series, I'd like someone from the ARM side of
> things to look at those changes too.
I am currently in vacation. I will be back Monday and look at this patchset.
Thanks
-- Daniel
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply
* [GIT PULL] Samsung fixes-4 for v3.16
From: Kukjin Kim @ 2014-07-18 23:34 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
This is a regression for v3.16 so please take this in -rc.
Thanks,
Kukjin
The following changes since commit 1795cd9b3a91d4b5473c97f491d63892442212ab:
Linux 3.16-rc5 (2014-07-13 14:04:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/samsung-fixes-4
for you to fetch changes up to 4e3a498d6fc438d8c203c51aadc6ca8fb47b0577:
ARM: EXYNOS: Fix core ID used by platsmp and hotplug code (2014-07-16
02:59:18 +0900)
----------------------------------------------------------------
Samsung fixes-4 for v3.16
- Fix core ID for platsmp and hotplug
This fixes existing calculation of PMU register offsets on
exynos SoCs and this also fixes CPU hotplug with more than
2 cores, because it removes incorrect condition check in
platform_do_lowpower().
----------------------------------------------------------------
Tomasz Figa (1):
ARM: EXYNOS: Fix core ID used by platsmp and hotplug code
arch/arm/mach-exynos/hotplug.c | 10 ++++++----
arch/arm/mach-exynos/platsmp.c | 34 +++++++++++++++++++---------------
2 files changed, 25 insertions(+), 19 deletions(-)
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox