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

Commit 40d731a1 authored by Abhimanyu Kapur's avatar Abhimanyu Kapur
Browse files

msm: boot_stats: Support multiplatform 



Convert to support multiplatform kernels. This requires drivers to be
located in generic functionality directories instead of specific mach
directories.

Move over the boot stats driver to drivers/soc/qcom/boot_stats.c from
arch/arm/mach-msm/boot_stats.c

Change-Id: Iee7ec288fe44606b468dc533bb4221f8d018b3cb
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent 3536f4b9

arch/arm/mach-msm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -983,14 +983,6 @@ config MSM_UARTDM_Core_v14 
	help

		Select if BLSP based UART Core v.14 or higher is present.



config MSM_BOOT_STATS

	bool "Use MSM boot stats reporting"

	help

	 Use this to report msm boot stats such as bootloader throughput,

	 display init, total boot time.

	 This figures are reported in mpm sleep clock cycles and have a

	 resolution of 31 bits as 1 bit is used as an overflow check.



config KRAIT_REGULATOR

	bool "Support Kraits powered via ganged regulators in the pmic"

	help

arch/arm/mach-msm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ obj-$(CONFIG_MSM_PCIE) += pcie.o pcie_irq.o pcie_phy.o 
obj-$(CONFIG_MSM_DMA_TEST) += dma_test.o

obj-$(CONFIG_SURF_FFA_GPIO_KEYPAD) += keypad-surf-ffa.o



obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o



obj-$(CONFIG_ARCH_FSM9900) += board-fsm9900.o board-fsm9900-gpiomux.o

obj-$(CONFIG_ARCH_FSM9900) += clock-fsm9900.o

obj-$(CONFIG_ARCH_FSM9900) += rfic-fsm9900.o bbif-fsm9900.o

drivers/soc/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -430,6 +430,14 @@ config MSM_OCMEM_POWER_DISABLE 
          Enable this configuration if OCMEM is being exclusively

          used as GMEM or OCIMEM.



config MSM_BOOT_STATS

	bool "Use MSM boot stats reporting"

	help

	 Use this to report msm boot stats such as bootloader throughput,

	 display init, total boot time.

	 This figures are reported in mpm sleep clock cycles and have a

	 resolution of 31 bits as 1 bit is used as an overflow check.



config MSM_SCM

	bool "Secure Channel Manager (SCM) support"

	default n

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) 


obj-y		+= qdsp6v2/



obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o

obj-$(CONFIG_MSM_RUN_QUEUE_STATS) += msm_rq_stats.o

obj-$(CONFIG_DEBUG_FS) += nohlt.o

obj-$(CONFIG_ARM64) += idle-v8.o cpu_ops.o

arch/arm/mach-msm/boot_stats.c→drivers/soc/qcom/boot_stats.c

+1 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,13 +17,11 @@ 
#include <linux/delay.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/smp.h>

#include <linux/clk.h>

#include <linux/cpu.h>

#include <linux/sched.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <mach/msm_iomap.h>



struct boot_stats {

	uint32_t bootloader_start;