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

Commit e076497f authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove LLCC ECC interrupt for Kona"

parents d962a699 5f6f4bd9

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

+0 −1
Original line number Diff line number Diff line
@@ -703,7 +703,6 @@ 
		compatible = "qcom,kona-llcc";

		reg = <0x9200000 0x1d0000> , <0x9600000 0x50000>;

		reg-names = "llcc_base", "llcc_broadcast_base";

		interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;

		cap-based-alloc-and-pwr-collapse;

	};

drivers/edac/qcom_edac.c

+11 −11
Original line number Diff line number Diff line
@@ -362,10 +362,6 @@ static int qcom_llcc_edac_probe(struct platform_device *pdev) 
	int ecc_irq;

	int rc;



	rc = qcom_llcc_core_setup(llcc_driv_data->bcast_regmap);

	if (rc)

		return rc;



	/* Allocate edac control info */

	edev_ctl = edac_device_alloc_ctl_info(0, "qcom-llcc", 1, "bank",

					      llcc_driv_data->num_banks, 1,
@@ -390,7 +386,17 @@ static int qcom_llcc_edac_probe(struct platform_device *pdev) 
		edev_ctl->poll_msec = poll_msec;

		edev_ctl->edac_check = qcom_llcc_poll_cache_errors;

		edev_ctl->defer_work = 1;

	} else {

	}



	rc = edac_device_add_device(edev_ctl);

	if (rc)

		goto out_mem;



	if (ecc_irq >= 0) {

		rc = qcom_llcc_core_setup(llcc_driv_data->bcast_regmap);

		if (rc)

			goto out_dev;



		rc = devm_request_irq(dev, ecc_irq, llcc_ecc_irq_handler,

			      IRQF_SHARED | IRQF_ONESHOT | IRQF_TRIGGER_HIGH,

			      "llcc_ecc", edev_ctl);
@@ -398,19 +404,13 @@ static int qcom_llcc_edac_probe(struct platform_device *pdev) 
			goto out_dev;

	}



	rc = edac_device_add_device(edev_ctl);

	if (rc)

		goto out_mem;



	platform_set_drvdata(pdev, edev_ctl);



	return rc;



out_dev:

	edac_device_del_device(edev_ctl->dev);

out_mem:

	edac_device_free_ctl_info(edev_ctl);



	return rc;

}

drivers/soc/qcom/llcc-slice.c

+6 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

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

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

 */



#include <linux/bitmap.h>
@@ -384,13 +384,11 @@ int qcom_llcc_probe(struct platform_device *pdev, 
		return ret;



	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");

	}



	return ret;

}