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

Commit 4c7ece16 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 imem"

parents face77b8 65d7ef01

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

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


Required properties



-compatible: "qcom,msm-imem"

-compatible: "qti,msm-imem"

-reg: start address and size of imem memory



Example:



	qcom,msm-imem {

		compatible = "qcom,msm-imem";

	qti,msm-imem {

		compatible = "qti,msm-imem";

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

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -250,8 +250,8 @@ 
		rpm-channel-type = <15>; /* SMD_APPS_RPM */

	};



        qcom,msm-imem@fe805000 {

                compatible = "qcom,msm-imem";

        qti,msm-imem@fe805000 {

                compatible = "qti,msm-imem";

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

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ 
		interrupts = <1 7 0xf00>;

	};



	qcom,msm-imem@fe805000 {

		compatible = "qcom,msm-imem";

	qti,msm-imem@fe805000 {

		compatible = "qti,msm-imem";

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

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ 
		status = "disabled";

	};



	qcom,msm-imem@fe805000 {

                compatible = "qcom,msm-imem";

	qti,msm-imem@fe805000 {

                compatible = "qti,msm-imem";

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

	};

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

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

	};



	qcom,msm-imem@fe805000 {

		compatible = "qcom,msm-imem";

	qti,msm-imem@fe805000 {

		compatible = "qti,msm-imem";

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

	};