AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

32bit arch changes for Rockchip socs containing enablement for ZONE_DMA

Browse Source 
for LPAE builds due to the peripherals only being 32bit capable
 and conversion to the exclusive reset controls in smp code.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAlmEUeMQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgbiTB/9YizLGRLJOb/+WQrU0271D5neb5sifoI2N
 olwKxi7VzQA5UhvaTEcSC6KWGS+uov1Q2p6tELHJeaP8+Jt7yvRLjRlnyV5VZ4ei
 Q8+ha3B9HMQ1KbZRgqg7AhxbRkvRYzN+DY80EY2cNeDT8uNOuWAx/VHKDmyPMUNu
 SezpAgtKu8myApoYMObehYIqj3JZH+D1c/97EBXhT4LI3ni38wwJKd7FdZwUYfJv
 doGVx0QJMM+PBANTYUx3femJVP0xbCG34PR4NCV/i/5NRct7OaFh5o0CxYzZqGoA
 5tc1b3ZLyn6STzvlub1DXv9HR9qqZJt+UvAboRtNusQRCCL1U28m
 =vGxJ
 -----END PGP SIGNATURE-----

Merge tag 'v4.14-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

Pull "Rockchip soc32 changes for 4.14" from Heiko Stübner:

32bit arch changes for Rockchip socs containing enablement for ZONE_DMA
for LPAE builds due to the peripherals only being 32bit capable
and conversion to the exclusive reset controls in smp code.

* tag 'v4.14-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: enable ZONE_DMA for non 64-bit capable peripherals
  ARM: rockchip: explicitly request exclusive reset control in smp code
This commit is contained in:
Arnd Bergmann 2017-08-16 23:34:15 +02:00
commit ecb09d4017
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-rockchip/Kconfig
View File

@ -16,6 +16,7 @@ config ARCH_ROCKCHIP
select ROCKCHIP_TIMER
select ARM_GLOBAL_TIMER
select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
select ZONE_DMA if ARM_LPAE
help
Support for Rockchip's Cortex-A9 Single-to-Quad-Core-SoCs
containing the RK2928, RK30xx and RK31xx series.

2
arch/arm/mach-rockchip/platsmp.c
View File

@ -67,7 +67,7 @@ static struct reset_control *rockchip_get_core_reset(int cpu)
else
np = of_get_cpu_node(cpu, NULL);
return of_reset_control_get(np, NULL);
return of_reset_control_get_exclusive(np, NULL);
}
static int pmu_set_power_domain(int pd, bool on)