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

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

Merge "msm: Change vendor name from 'qcom' to 'qti' for msm_cache_erp"

parents 038265c9 a6342e50

Documentation/devicetree/bindings/cache/msm_cache_erp.txt

+5 −5
Original line number Diff line number Diff line 
* Qualcomm Krait L1 / L2 cache error reporting driver



Required properties:

- compatible: Should be "qcom,cache_erp"

- compatible: Should be "qti,cache_erp"

- interrupts: Should contain the L1/CPU error interrupt number and

  the L2 cache interrupt number

- interrupt-names: Should contain the interrupt names "l1_irq" and
@@ -19,14 +19,14 @@ Optional properties: 
  many elements as the "reg" property.



Example:

	qcom,cache_erp {

		compatible = "qcom,cache_erp";

	qti,cache_erp {

		compatible = "qti,cache_erp";

		interrupts = <1 9 0>, <0 2 0>;

		interrupt-names = "l1_irq", "l2_irq";

	};



Example with "reg" property defined:

	qcom,cache_erp@f9012000 {

	qti,cache_erp@f9012000 {

		reg = <0xf9012000 0x80>,

		      <0xf9089000 0x80>,

		      <0xf9099000 0x80>;
@@ -35,7 +35,7 @@ Example with "reg" property defined: 
			    "krait0_saw",

			    "krait1_saw";



		compatible = "qcom,cache_erp";

		compatible = "qti,cache_erp";

		interrupts = <1 9 0>, <0 2 0>;

		interrupt-names = "l1_irq", "l2_irq";

	};

arch/arm/boot/dts/qti/apq8084.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -232,8 +232,8 @@ 
				<84 512 500 800>;

	};



	qcom,cache_erp {

		compatible = "qcom,cache_erp";

	qti,cache_erp {

		compatible = "qti,cache_erp";

		interrupts = <1 9 0>, <0 2 0>;

		interrupt-names = "l1_irq", "l2_irq";

	};

arch/arm/boot/dts/qti/fsm9900.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -288,8 +288,8 @@ 
		reg = <0xfe805000 0x1000>; /* Address and size of IMEM */

	};



	qcom,cache_erp {

		compatible = "qcom,cache_erp";

	qti,cache_erp {

		compatible = "qti,cache_erp";

		interrupts = <1 9 0>, <0 2 0>;

		interrupt-names = "l1_irq", "l2_irq";

	};

arch/arm/boot/dts/qti/msm8974.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -2113,7 +2113,7 @@ 
		qcom,firmware-name = "venus";

	};



	qcom,cache_erp@f9012000 {

	qti,cache_erp@f9012000 {

		reg = <0xf9012000 0x80>,

		      <0xf9089000 0x80>,

		      <0xf9099000 0x80>,
@@ -2134,7 +2134,7 @@ 
			    "krait2_acs",

			    "krait3_acs";



		compatible = "qcom,cache_erp";

		compatible = "qti,cache_erp";

		interrupts = <1 9 0>, <0 2 0>;

		interrupt-names = "l1_irq", "l2_irq";

	};

arch/arm/mach-msm/cache_erp.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2013, 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
@@ -621,7 +621,7 @@ static int msm_cache_erp_remove(struct platform_device *pdev) 
}



static struct of_device_id cache_erp_match_table[] = {

	{	.compatible = "qcom,cache_erp",	},

	{	.compatible = "qti,cache_erp",	},

	{}

};