Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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
Arnd Bergmann 8 years ago
parent
d4e508c298 bf3c4b517c
commit
ecb09d4017
2 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 0
      arch/arm/mach-rockchip/Kconfig
  2. 1 1
      arch/arm/mach-rockchip/platsmp.c

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

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

+ 1 - 1
arch/arm/mach-rockchip/platsmp.c
View File 

@@ -67,7 +67,7 @@ static struct reset_control *rockchip_get_core_reset(int cpu)
 
 	else
 
 	else
 
 		np = of_get_cpu_node(cpu, NULL);
 
 		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)
 
 static int pmu_set_power_domain(int pd, bool on)