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

Commit 22875221 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: llcc: Do not explicitly write enable to tag ram ecc" into msm-4.8

parents c9b7da0a 5381ef28
Loading
Loading
Loading
Loading
+1 −10
Original line number Diff line number Diff line
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2016-2017, 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
@@ -22,7 +22,6 @@
/* Config registers offsets*/
#define COMMON_CFG0		0x00030004
#define DRP_ECC_ERROR_CFG	0x00040000
#define TRP_MISC_CFG		0x00022300

/* TRP, DRP interrupt register offsets */
#define CMN_INTERRUPT_0_ENABLE		0x0003001C
@@ -33,8 +32,6 @@
#define DATA_RAM_ECC_ENABLE	0x1
#define SB_ERROR_THRESHOLD	0x1
#define SB_ERROR_THRESHOLD_SHIFT	24
#define TAG_RAM_ECC_DISABLE	0x1
#define TAG_RAM_ECC_DISABLE_SHIFT	0x1
#define SB_DB_TRP_INTERRUPT_ENABLE	0x3
#define TRP0_INTERRUPT_ENABLE	0x1
#define DRP0_INTERRUPT_ENABLE	BIT(6)
@@ -43,14 +40,8 @@

static void qcom_llcc_core_setup(struct regmap *llcc_regmap)
{
	u32 trp_misc_val;
	u32 sb_err_threshold;

	/* Enable Tag RAM ECC */
	trp_misc_val = (TAG_RAM_ECC_DISABLE << TAG_RAM_ECC_DISABLE_SHIFT);
	regmap_update_bits(llcc_regmap, TRP_MISC_CFG,
			   ~trp_misc_val, trp_misc_val);

	/* Enable TRP in instance 2 of common interrupt enable register */
	regmap_update_bits(llcc_regmap, CMN_INTERRUPT_2_ENABLE,
			   TRP0_INTERRUPT_ENABLE, TRP0_INTERRUPT_ENABLE);