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

Commit 72d1e8fc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: 8084: enable krait regulator driver compilation"

parents 455a78cb 51f3963e

arch/arm/mach-msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ config ARCH_APQ8084 
	select MSM_PM8X60 if PM

	select MSM_RPM_SMD

	select USB_ARCH_HAS_XHCI

	select KRAIT_REGULATOR



config ARCH_MPQ8092

	bool "MPQ8092"

arch/arm/mach-msm/board-8084.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/memory.h>

#include <linux/regulator/krait-regulator.h>

#include <linux/msm_tsens.h>

#include <linux/msm_thermal.h>

#include <asm/mach/map.h>
@@ -96,6 +97,7 @@ void __init apq8084_add_drivers(void) 
	msm_pm_sleep_status_init();

	rpm_regulator_smd_driver_init();

	msm_spm_device_init();

	krait_power_init();

	if (of_board_is_rumi())

		msm_clock_init(&apq8084_rumi_clock_init_data);

	else

include/linux/regulator/krait-regulator.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 * success and error on failure.

 */



#ifdef CONFIG_ARCH_MSM8974

#ifdef CONFIG_KRAIT_REGULATOR

int __init krait_power_init(void);

void secondary_cpu_hs_init(void *base_ptr, int cpu);

#else