]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 16:18:43 +0000 (17:18 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 16:18:43 +0000 (17:18 +0100)
commit1c4b0c23bae0604d0271b5f14198c917f0f4f7a8
treee2c084add2bab79a1407cde49cbbc76ea036680c
parentef1c45860df98893556a10a20c19c5eddfbeb503
parent13fce6a766ca71272f178a9089616356bc16d198
Merge tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

Pull "code part of the rk3288 smp support" from Heiko Stübner:

here is the second batch of soc related changes, consisting only
of the smp support for rk3288.

Due to the slight misheap of the v3.18 cpuclk pull being merge, it is based
on exactly this merge commit from Olof to next/soc.

* tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: add basic smp support for rk3288
  ARM: rockchip: add option to access the pmu via a phandle in smp_operations
  ARM: rockchip: convert to regmap and use pmu syscon if available

Signed-off-by: Arnd Bergmann <arnd@arndb.de>