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

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

Merge "Revert "ARM: dts: msm: add MID details for BWMON counter in sdm670""

parents d0595fdc 105001fa

arch/arm64/boot/dts/qcom/sdm670.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -2546,8 +2546,6 @@ 
		qcom,count-unit = <0x10000>;

		qcom,hw-timer-hz = <19200000>;

		qcom,target-dev = <&cpubw>;

		qcom,byte-mid-mask = <0xe000>;

		qcom,byte-mid-match = <0xe000>;

	};



	memlat_cpu0: qcom,memlat-cpu0 {

drivers/devfreq/bimc-bwmon.c

+7 −5
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2014-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
@@ -35,7 +35,8 @@ 
#define	GLB_INT_EN(m)		((m)->global_base + 0x10C)

#define MON_INT_STATUS(m)	((m)->base + 0x100)

#define MON_INT_STATUS_MASK	0x03

#define MON2_INT_STATUS_MASK	0xF0

#define MON2_INT_STATUS_MASK	0xA0

#define MON2_INT_DISABLE_MASK	0xF0

#define MON2_INT_STATUS_SHIFT	4

#define MON_INT_CLR(m)		((m)->base + 0x108)

#define	MON_INT_EN(m)		((m)->base + 0x10C)
@@ -63,7 +64,8 @@ 
#define MON3_INT_STATUS(m)	((m)->base + 0x00)

#define MON3_INT_CLR(m)		((m)->base + 0x08)

#define MON3_INT_EN(m)		((m)->base + 0x0C)

#define MON3_INT_STATUS_MASK	0x0F

#define MON3_INT_STATUS_MASK	0x0A

#define MON3_INT_DISABLE_MASK	0x0F

#define MON3_EN(m)		((m)->base + 0x10)

#define MON3_CLEAR(m)		((m)->base + 0x14)

#define MON3_MASK(m)		((m)->base + 0x18)
@@ -283,12 +285,12 @@ void mon_irq_disable(struct bwmon *m, enum mon_reg_type type) 
	case MON2:

		mon_glb_irq_disable(m);

		val = readl_relaxed(MON_INT_EN(m));

		val &= ~MON2_INT_STATUS_MASK;

		val &= ~MON2_INT_DISABLE_MASK;

		writel_relaxed(val, MON_INT_EN(m));

		break;

	case MON3:

		val = readl_relaxed(MON3_INT_EN(m));

		val &= ~MON3_INT_STATUS_MASK;

		val &= ~MON3_INT_DISABLE_MASK;

		writel_relaxed(val, MON3_INT_EN(m));

		break;

	}