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

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

Merge "ARM: dts: msm: add bus scale values for bandwidth scaling"

parents bbfdbeac 983f3244

arch/arm64/boot/dts/qcom/sm8150-mhi.dtsi

+48 −30
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ 
				reg = <100>;

				label = "IP_HW0";

				mhi,num-elements = <512>;

				mhi,event-ring = <4>;

				mhi,event-ring = <5>;

				mhi,chan-dir = <1>;

				mhi,data-type = <1>;

				mhi,doorbell-mode = <3>;
@@ -329,7 +329,7 @@ 
				reg = <101>;

				label = "IP_HW0";

				mhi,num-elements = <512>;

				mhi,event-ring = <5>;

				mhi,event-ring = <6>;

				mhi,chan-dir = <2>;

				mhi,data-type = <4>;

				mhi,doorbell-mode = <3>;
@@ -339,7 +339,7 @@ 
			mhi_chan@102 {

				reg = <102>;

				label = "IP_HW_ADPL";

				mhi,event-ring = <6>;

				mhi,event-ring = <7>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -351,7 +351,7 @@ 
				reg = <103>;

				label = "IP_HW_QDSS";

				mhi,num-elements = <128>;

				mhi,event-ring = <7>;

				mhi,event-ring = <8>;

				mhi,chan-dir = <2>;

				mhi,data-type = <0>;

				mhi,doorbell-mode = <2>;
@@ -361,7 +361,7 @@ 
			mhi_chan@104 {

				reg = <104>;

				label = "IP_HW_OFFLOAD_0";

				mhi,event-ring = <4>;

				mhi,event-ring = <5>;

				mhi,chan-dir = <1>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -370,7 +370,7 @@ 
			mhi_chan@105 {

				reg = <105>;

				label = "IP_HW_OFFLOAD_0";

				mhi,event-ring = <5>;

				mhi,event-ring = <6>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -381,7 +381,7 @@ 
			mhi_chan@107 {

				reg = <107>;

				label = "IP_HW_MHIP_1";

				mhi,event-ring = <10>;

				mhi,event-ring = <11>;

				mhi,chan-dir = <1>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -391,7 +391,7 @@ 
			mhi_chan@108 {

				reg = <108>;

				label = "IP_HW_MHIP_1";

				mhi,event-ring = <11>;

				mhi,event-ring = <12>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -438,6 +438,15 @@ 
			};



			mhi_event@4 {

				mhi,num-elements = <32>;

				mhi,intmod = <1>;

				mhi,msi = <0>;

				mhi,priority = <2>;

				mhi,brstmode = <2>;

				mhi,data-type = <3>;

			};



			mhi_event@5 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <5>;
@@ -447,7 +456,7 @@ 
				mhi,hw-ev;

			};



			mhi_event@5 {

			mhi_event@6 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <6>;
@@ -458,7 +467,7 @@ 
				mhi,client-manage;

			};



			mhi_event@6 {

			mhi_event@7 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <7>;
@@ -470,7 +479,7 @@ 
				mhi,offload;

			};



			mhi_event@7 {

			mhi_event@8 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <8>;
@@ -480,7 +489,7 @@ 
				mhi,hw-ev;

			};



			mhi_event@8 {

			mhi_event@9 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <9>;
@@ -492,7 +501,7 @@ 
				mhi,offload;

			};



			mhi_event@9 {

			mhi_event@10 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <10>;
@@ -504,7 +513,7 @@ 
				mhi,offload;

			};



			mhi_event@10 {

			mhi_event@11 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <11>;
@@ -516,7 +525,7 @@ 
				mhi,offload;

			};



			mhi_event@11 {

			mhi_event@12 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <12>;
@@ -868,7 +877,7 @@ 
				reg = <100>;

				label = "IP_HW0";

				mhi,num-elements = <512>;

				mhi,event-ring = <4>;

				mhi,event-ring = <5>;

				mhi,chan-dir = <1>;

				mhi,data-type = <1>;

				mhi,doorbell-mode = <3>;
@@ -880,7 +889,7 @@ 
				reg = <101>;

				label = "IP_HW0";

				mhi,num-elements = <512>;

				mhi,event-ring = <5>;

				mhi,event-ring = <6>;

				mhi,chan-dir = <2>;

				mhi,data-type = <4>;

				mhi,doorbell-mode = <3>;
@@ -890,7 +899,7 @@ 
			mhi_chan@102 {

				reg = <102>;

				label = "IP_HW_ADPL";

				mhi,event-ring = <6>;

				mhi,event-ring = <7>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -902,7 +911,7 @@ 
				reg = <103>;

				label = "IP_HW_QDSS";

				mhi,num-elements = <128>;

				mhi,event-ring = <7>;

				mhi,event-ring = <8>;

				mhi,chan-dir = <2>;

				mhi,data-type = <0>;

				mhi,doorbell-mode = <2>;
@@ -912,7 +921,7 @@ 
			mhi_chan@104 {

				reg = <104>;

				label = "IP_HW_OFFLOAD_0";

				mhi,event-ring = <4>;

				mhi,event-ring = <5>;

				mhi,chan-dir = <1>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -922,7 +931,7 @@ 
			mhi_chan@105 {

				reg = <105>;

				label = "IP_HW_OFFLOAD_0";

				mhi,event-ring = <5>;

				mhi,event-ring = <6>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -933,7 +942,7 @@ 
			mhi_chan@107 {

				reg = <107>;

				label = "IP_HW_MHIP_1";

				mhi,event-ring = <10>;

				mhi,event-ring = <11>;

				mhi,chan-dir = <1>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -943,7 +952,7 @@ 
			mhi_chan@108 {

				reg = <108>;

				label = "IP_HW_MHIP_1";

				mhi,event-ring = <11>;

				mhi,event-ring = <12>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;
@@ -990,6 +999,15 @@ 
			};



			mhi_event@4 {

				mhi,num-elements = <32>;

				mhi,intmod = <1>;

				mhi,msi = <0>;

				mhi,priority = <2>;

				mhi,brstmode = <2>;

				mhi,data-type = <3>;

			};



			mhi_event@5 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <5>;
@@ -999,7 +1017,7 @@ 
				mhi,hw-ev;

			};



			mhi_event@5 {

			mhi_event@6 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <6>;
@@ -1010,7 +1028,7 @@ 
				mhi,client-manage;

			};



			mhi_event@6 {

			mhi_event@7 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <7>;
@@ -1022,7 +1040,7 @@ 
				mhi,offload;

			};



			mhi_event@7 {

			mhi_event@8 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <8>;
@@ -1032,7 +1050,7 @@ 
				mhi,hw-ev;

			};



			mhi_event@8 {

			mhi_event@9 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <9>;
@@ -1044,7 +1062,7 @@ 
				mhi,offload;

			};



			mhi_event@9 {

			mhi_event@10 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <10>;
@@ -1056,7 +1074,7 @@ 
				mhi,offload;

			};



			mhi_event@10 {

			mhi_event@11 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <11>;
@@ -1068,7 +1086,7 @@ 
				mhi,offload;

			};



			mhi_event@11 {

			mhi_event@12 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <12>;

arch/arm64/boot/dts/qcom/sm8150-sdx50m.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
	};



	mhi_events {

		mhi_event@4 {

		mhi_event@5 {

			mhi,num-elements = <0>;

			mhi,intmod = <0>;

			mhi,msi = <5>;
@@ -87,7 +87,7 @@ 
			mhi,offload;

		};



		mhi_event@5 {

		mhi_event@6 {

			mhi,num-elements = <0>;

			mhi,intmod = <0>;

			mhi,msi = <6>;
@@ -99,10 +99,6 @@ 
			mhi,offload;

		};



		mhi_events@6 {

			status = "disabled";

		};



		mhi_events@7 {

			status = "disabled";

		};
@@ -122,6 +118,10 @@ 
		mhi_events@11 {

			status = "disabled";

		};



		mhi_events@12 {

			status = "disabled";

		};

	};

};
@@ -165,7 +165,7 @@ 
	};



	mhi_events {

		mhi_event@4 {

		mhi_event@5 {

			mhi,num-elements = <0>;

			mhi,intmod = <0>;

			mhi,msi = <5>;
@@ -177,7 +177,7 @@ 
			mhi,offload;

		};



		mhi_event@5 {

		mhi_event@6 {

			mhi,num-elements = <0>;

			mhi,intmod = <0>;

			mhi,msi = <6>;
@@ -189,10 +189,6 @@ 
			mhi,offload;

		};



		mhi_events@6 {

			status = "disabled";

		};



		mhi_events@7 {

			status = "disabled";

		};
@@ -212,6 +208,10 @@ 
		mhi_events@11 {

			status = "disabled";

		};



		mhi_events@12 {

			status = "disabled";

		};

	};

};

arch/arm64/boot/dts/qcom/sm8150-sdxprairie.dtsi

+18 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include <dt-bindings/thermal/qmi_thermal.h>

#include <dt-bindings/msm/msm-bus-ids.h>



&mdm3 {

	compatible = "qcom,ext-sdxprairie";
@@ -33,6 +34,20 @@ 
	qcom,smmu-cfg = <0x1d>;

	qcom,addr-win = <0x0 0x20000000 0x0 0x2fffffff>;



	/* controller noc frequency scaling configuration */

	qcom,msm-bus,name = "mhi0";

	qcom,msm-bus,num-cases = <4>;

	qcom,msm-bus,num-paths = <1>;

	qcom,msm-bus,vectors-KBps =

			<MSM_BUS_MASTER_PCIE_1 MSM_BUS_SLAVE_EBI_CH0

			0 0>,

			<MSM_BUS_MASTER_PCIE_1 MSM_BUS_SLAVE_EBI_CH0

			0 0>,

			<MSM_BUS_MASTER_PCIE_1 MSM_BUS_SLAVE_EBI_CH0

			500000 0>, /* 4 Gbps */

			<MSM_BUS_MASTER_PCIE_1 MSM_BUS_SLAVE_EBI_CH0

			1000000 0>; /* 8 Gbps */



	mhi_channels {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -61,7 +76,7 @@ 
			label = "IP_HW0_RSC";

			mhi,num-elements = <512>;

			mhi,local-elements = <3078>;

			mhi,event-ring = <5>;

			mhi,event-ring = <6>;

			mhi,chan-dir = <2>;

			mhi,data-type = <5>;

			mhi,doorbell-mode = <3>;
@@ -70,7 +85,7 @@ 


		mhi_chan@105 {

			label = "IP_HW_MHIP_0";

			mhi,event-ring = <8>;

			mhi,event-ring = <9>;

			mhi,chan-dir = <1>;

			mhi,data-type = <3>;

			mhi,ee = <0x4>;
@@ -80,7 +95,7 @@ 
		mhi_chan@106 {

			reg = <106>;

			label = "IP_HW_MHIP_0";

			mhi,event-ring = <9>;

			mhi,event-ring = <10>;

			mhi,chan-dir = <2>;

			mhi,data-type = <3>;

			mhi,ee = <0x4>;