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

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

Merge "defconfig: msm: Enable bw_hwmon for msm8953 devfreq available governor"

parents dd514bf8 bb0a944f

arch/arm/configs/msm8953-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -485,6 +485,8 @@ CONFIG_MSM_PM=y 
CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

arch/arm/configs/msm8953_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -504,6 +504,8 @@ CONFIG_MSM_PM=y 
CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

arch/arm64/configs/msm8953-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -550,6 +550,8 @@ CONFIG_MSM_BAM_DMUX=y 
CONFIG_WCNSS_CORE=y

CONFIG_WCNSS_CORE_PRONTO=y

CONFIG_WCNSS_REGISTER_DUMP_ON_BITE=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_SPDM_SCM=y

CONFIG_DEVFREQ_SPDM=y

arch/arm64/configs/msm8953_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -571,6 +571,8 @@ CONFIG_MSM_BAM_DMUX=y 
CONFIG_WCNSS_CORE=y

CONFIG_WCNSS_CORE_PRONTO=y

CONFIG_WCNSS_REGISTER_DUMP_ON_BITE=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_SPDM_SCM=y

CONFIG_DEVFREQ_SPDM=y

drivers/devfreq/governor_bw_hwmon.c

+2 −2
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2013-2018, 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
@@ -171,7 +171,7 @@ static DEVICE_ATTR(__attr, 0644, show_list_##__attr, store_list_##__attr) 
#define MAX_MS	500U



/* Returns MBps of read/writes for the sampling window. */

static unsigned int bytes_to_mbps(long long bytes, unsigned int us)

static unsigned long bytes_to_mbps(unsigned long long bytes, unsigned int us)

{

	bytes *= USEC_PER_SEC;

	do_div(bytes, us);