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

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

Merge "msm: imem: Rename "qti" device tree prefix back to "qcom""

parents ea508b37 212ced7f

Documentation/devicetree/bindings/arm/msm/imem.txt

+16 −16
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ IMEM is fast on-chip memory used for various debug features and dma transactions 


Required properties



-compatible: "qti,msm-imem"

-compatible: "qcom,msm-imem"

-reg: start address and size of imem memory



If any children nodes exist the following properties are required:
@@ -19,80 +19,80 @@ Child nodes: 
Peripheral Image Loader (pil):

------------------------------

Required properties:

-compatible: "qti,msm-imem-pil"

-compatible: "qcom,msm-imem-pil"

-reg: start address and size of PIL region in imem



Bootloader Stats:

-----------------

Required properties:

-compatible: "qti,msm-imem-boot_stats"

-compatible: "qcom,msm-imem-boot_stats"

-reg: start address and size of boot_stats region in imem



Cache error reporting:

-----------------

Required properties:

-compatible: "qti,msm-imem-cache_erp"

-compatible: "qcom,msm-imem-cache_erp"

-reg: start address and size of cache_erp region in imem



Memory Dump:

------------

Required properties:

-compatible: "qti,msm-imem-mem_dump_table"

-compatible: "qcom,msm-imem-mem_dump_table"

-reg: start address and size of mem_dump_table region in imem



Restart Reason:

---------------

Required properties:

-compatible: "qti,msm-imem-restart_reason

-compatible: "qcom,msm-imem-restart_reason

-reg: start address and size of restart_reason region in imem



Download Mode:

--------------

Required properties:

-compatible: "qti,msm-imem-download_mode"

-compatible: "qcom,msm-imem-download_mode"

-reg: start address and size of download_mode region in imem



Emergency Download Mode:

------------------------

-compatible: "qti,msm-imem-emergency_download_mode"

-compatible: "qcom,msm-imem-emergency_download_mode"

-reg: start address and size of emergency_download_mode region in imem



Example:



	qti,msm-imem {

		compatible = "qti,msm-imem";

	qcom,msm-imem {

		compatible = "qcom,msm-imem";

		reg = <0xdeadbeef 0x1000>; /* < start_address size > */

		ranges = <0x0 0xdeadbeef 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		download_mode@0 {

			compatible = "qti,msm-imem-download_mode";

			compatible = "qcom,msm-imem-download_mode";

			reg = <0x0 8>;

		};



		restart_reason@65c {

			compatible = "qti,msm-imem-restart_reason";

			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};



		imem_cache_erp: cache_erp@6a4 {

			compatible = "qti,msm-imem-cache_erp";

			compatible = "qcom,msm-imem-cache_erp";

			reg = <0x6a4 4>;

		};



		boot_stats@6b0 {

			compatible = "qti,msm-imem-boot_stats";

			compatible = "qcom,msm-imem-boot_stats";

			reg = <0x6b0 32>;

		};



		pil@94c {

			compatible = "qti,msm-imem-pil";

			compatible = "qcom,msm-imem-pil";

			reg = <0x94c 200>;

		};



		emergency_download_mode@fe0 {

			compatible = "qti,msm-imem-emergency_download_mode";

			compatible = "qcom,msm-imem-emergency_download_mode";

			reg = <0xfe0 12>;

		};

	};

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

+9 −9
Original line number Diff line number Diff line
@@ -257,45 +257,45 @@ 
		rpm-channel-type = <15>; /* SMD_APPS_RPM */

	};



        qti,msm-imem@fe805000 {

		compatible = "qti,msm-imem";

        qcom,msm-imem@fe805000 {

		compatible = "qcom,msm-imem";

		reg = <0xfe805000 0x1000>; /* Address and size of IMEM */

		ranges = <0x0 0xfe805000 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		download_mode@0 {

			compatible = "qti,msm-imem-download_mode";

			compatible = "qcom,msm-imem-download_mode";

			reg = <0x0 8>;

		};



		mem_dump_table@14 {

			compatible = "qti,msm-imem-mem_dump_table";

			compatible = "qcom,msm-imem-mem_dump_table";

			reg = <0x14 4>;

		};



		restart_reason@65c {

			compatible = "qti,msm-imem-restart_reason";

			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};



		imem_cache_erp: cache_erp@6a4 {

			compatible = "qti,msm-imem-cache_erp";

			compatible = "qcom,msm-imem-cache_erp";

			reg = <0x6a4 4>;

		};



		boot_stats@6b0 {

			compatible = "qti,msm-imem-boot_stats";

			compatible = "qcom,msm-imem-boot_stats";

			reg = <0x6b0 32>;

		};



		pil@94c {

			compatible = "qti,msm-imem-pil";

			compatible = "qcom,msm-imem-pil";

			reg = <0x94c 200>;

		};



		emergency_download_mode@fe0 {

			compatible = "qti,msm-imem-emergency_download_mode";

			compatible = "qcom,msm-imem-emergency_download_mode";

			reg = <0xfe0 12>;

		};

	};

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

+9 −9
Original line number Diff line number Diff line
@@ -284,45 +284,45 @@ 
		interrupts = <1 7 0xf00>;

	};



	qti,msm-imem@fe805000 {

		compatible = "qti,msm-imem";

	qcom,msm-imem@fe805000 {

		compatible = "qcom,msm-imem";

		reg = <0xfe805000 0x1000>; /* Address and size of IMEM */

		ranges = <0x0 0xfe805000 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		download_mode@0 {

			compatible = "qti,msm-imem-download_mode";

			compatible = "qcom,msm-imem-download_mode";

			reg = <0x0 8>;

		};



		mem_dump_table@14 {

			compatible = "qti,msm-imem-mem_dump_table";

			compatible = "qcom,msm-imem-mem_dump_table";

			reg = <0x14 4>;

		};



		restart_reason@65c {

			compatible = "qti,msm-imem-restart_reason";

			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};



		imem_cache_erp: cache_erp@6a4 {

			compatible = "qti,msm-imem-cache_erp";

			compatible = "qcom,msm-imem-cache_erp";

			reg = <0x6a4 4>;

		};



		boot_stats@6b0 {

			compatible = "qti,msm-imem-boot_stats";

			compatible = "qcom,msm-imem-boot_stats";

			reg = <0x6b0 32>;

		};



		pil@94c {

			compatible = "qti,msm-imem-pil";

			compatible = "qcom,msm-imem-pil";

			reg = <0x94c 200>;

		};



		emergency_download_mode@fe0 {

			compatible = "qti,msm-imem-emergency_download_mode";

			compatible = "qcom,msm-imem-emergency_download_mode";

			reg = <0xfe0 12>;

		};

	};

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

+8 −8
Original line number Diff line number Diff line
@@ -164,40 +164,40 @@ 
		status = "disabled";

	};



	qti,msm-imem@fe805000 {

		compatible = "qti,msm-imem";

	qcom,msm-imem@fe805000 {

		compatible = "qcom,msm-imem";

		reg = <0xfe805000 0x1000>; /* Address and size of IMEM */

		ranges = <0x0 0xfe805000 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		download_mode@0 {

			compatible = "qti,msm-imem-download_mode";

			compatible = "qcom,msm-imem-download_mode";

			reg = <0x0 8>;

		};



		mem_dump_table@14 {

			compatible = "qti,msm-imem-mem_dump_table";

			compatible = "qcom,msm-imem-mem_dump_table";

			reg = <0x14 4>;

		};



		restart_reason@65c {

			compatible = "qti,msm-imem-restart_reason";

			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};



		boot_stats@6b0 {

			compatible = "qti,msm-imem-boot_stats";

			compatible = "qcom,msm-imem-boot_stats";

			reg = <0x6b0 32>;

		};



		pil@94c {

			compatible = "qti,msm-imem-pil";

			compatible = "qcom,msm-imem-pil";

			reg = <0x94c 200>;

		};



		emergency_download_mode@fe0 {

			compatible = "qti,msm-imem-emergency_download_mode";

			compatible = "qcom,msm-imem-emergency_download_mode";

			reg = <0xfe0 12>;

		};

	};

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

+8 −8
Original line number Diff line number Diff line
@@ -238,40 +238,40 @@ 
		status = "disabled";

	};



	qti,msm-imem@fe805000 {

		compatible = "qti,msm-imem";

	qcom,msm-imem@fe805000 {

		compatible = "qcom,msm-imem";

		reg = <0xfe805000 0x1000>; /* Address and size of IMEM */

		ranges = <0x0 0xfe805000 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		download_mode@0 {

			compatible = "qti,msm-imem-download_mode";

			compatible = "qcom,msm-imem-download_mode";

			reg = <0x0 8>;

		};



		mem_dump_table@14 {

			compatible = "qti,msm-imem-mem_dump_table";

			compatible = "qcom,msm-imem-mem_dump_table";

			reg = <0x14 4>;

		};



		restart_reason@65c {

			compatible = "qti,msm-imem-restart_reason";

			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};



		boot_stats@6b0 {

			compatible = "qti,msm-imem-boot_stats";

			compatible = "qcom,msm-imem-boot_stats";

			reg = <0x6b0 32>;

		};



		pil@94c {

			compatible = "qti,msm-imem-pil";

			compatible = "qcom,msm-imem-pil";

			reg = <0x94c 200>;

		};



		emergency_download_mode@fe0 {

			compatible = "qti,msm-imem-emergency_download_mode";

			compatible = "qcom,msm-imem-emergency_download_mode";

			reg = <0xfe0 12>;

		};

	};