Merge "defconfig: lahaina: Enable CONFIG_EDAC_QGKI flag"

This commit is contained in:
qctecmdr 2020-02-17 21:08:38 -08:00 • committed by Gerrit - the friendly Code Review server
commit f0eb9ece12
2 changed files with 6 additions and 7 deletions

View file

@ -71,6 +71,7 @@ CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y
CONFIG_DEVFREQ_GOV_MEMLAT=y
CONFIG_DEVFREQ_SIMPLE_DEV=y
CONFIG_EDAC_QCOM=y
CONFIG_EDAC_QGKI=y
CONFIG_EDAC_QCOM_LLCC_PANIC_ON_UE=y
CONFIG_QCOM_DEVFREQ_ICC=y
CONFIG_QCOM_LLCC_PMU=y

View file

@ -469,13 +469,11 @@ int qcom_llcc_probe(struct platform_device *pdev,
}
drv_data->ecc_irq = platform_get_irq(pdev, 0);
if (drv_data->ecc_irq >= 0) {
llcc_edac = platform_device_register_data(&pdev->dev,
"qcom_llcc_edac", -1, drv_data,
sizeof(*drv_data));
if (IS_ERR(llcc_edac))
dev_err(dev, "Failed to register llcc edac driver\n");
}
llcc_edac = platform_device_register_data(&pdev->dev,
"qcom_llcc_edac", -1, drv_data,
sizeof(*drv_data));
if (IS_ERR(llcc_edac))
dev_err(dev, "Failed to register llcc edac driver\n");
llcc_perfmon = platform_device_register_data(&pdev->dev,
"qcom_llcc_perfmon", -1,