Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecb09d40 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.14-rockchip-soc32-1' of... 

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
parents d4e508c2 bf3c4b51

arch/arm/mach-rockchip/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -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.

arch/arm/mach-rockchip/platsmp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)