[GIT PULL]ARM: sirf: machine update for 3.14

Barry Song 21cnbao at gmail.com
Thu Jan 23 07:08:37 EST 2014


2014/1/23 Kevin Hilman <khilman at linaro.org>:
> Barry Song <21cnbao at gmail.com> writes:
>
>> Hi Olof/Kevin,
>> this series was missed?
>
> It was skipped because it came well after the normal cutoff of -rc6
> (Dec. 29th) or -rc7 (Jan 4th).  This time we extended things a little
> due to the end of year holidays, but yours came well after that as well.
>
> If we have time we may try to get it into a late/* branch which might
> still make it for v3.13, but it's unlikely at this point.

sorry for that. the reset controller was ready too close to merge window.

i guess i can rebase these two againest 3.14-rc1 for 3.14:
- MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers
- ARM: prima2: make sirfsoc_init_late function static

and queue the below for 3.15:
- ARM: prima2: move to generic reset controller driver framework

>
> Kevin
>
>
>> 2014/1/15 Barry Song <21cnbao at gmail.com>:
>>> Hi Kevin/Olof,
>>>
>>> The following changes since commit 374b105797c3d4f29c685f3be535c35f5689b30e:
>>>
>>>   Linux 3.13-rc3 (2013-12-06 09:34:04 -0800)
>>>
>>> are available in the git repository at:
>>>
>>>   git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
>>> tags/sirf-soc-for-3.14
>>>
>>> for you to fetch changes up to dbd1b42baa6ec8082bce6eec37de5e1b46aff19c:
>>>
>>>   ARM: prima2: make sirfsoc_init_late function static (2014-01-15
>>> 10:42:26 +0800)
>>>
>>> ----------------------------------------------------------------
>>> ARM: sirf: machine update for 3.14
>>>
>>> Among them:
>>>  - ARM: prima2: move to generic reset controller driver framework
>>>  - MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers
>>>  - ARM: prima2: make sirfsoc_init_late function static
>>>
>>> ----------------------------------------------------------------
>>> Barry Song (3):
>>>       ARM: prima2: move to generic reset controller driver framework
>>>       MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers
>>>       ARM: prima2: make sirfsoc_init_late function static
>>>
>>>  .../devicetree/bindings/reset/sirf,rstc.txt        |   42 +++++++++
>>>  MAINTAINERS                                        |    9 +-
>>>  arch/arm/boot/dts/atlas6.dtsi                      |    3 +-
>>>  arch/arm/boot/dts/marco.dtsi                       |    3 +-
>>>  arch/arm/boot/dts/prima2.dtsi                      |    3 +-
>>>  arch/arm/mach-prima2/Kconfig                       |    1 +
>>>  arch/arm/mach-prima2/common.c                      |    2 +-
>>>  arch/arm/mach-prima2/rstc.c                        |   93 +++++++++++++-------
>>>  8 files changed, 110 insertions(+), 46 deletions(-)
>>>  create mode 100644 Documentation/devicetree/bindings/reset/sirf,rstc.txt
>>>
>>> -barry

-barry



More information about the linux-arm-kernel mailing list