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

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

Merge "ARM: dts: msm: add support for RMNET_CTL channels"

parents 1058dac1 e54c3f11

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

+134 −32
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
		qcom,smmu-cfg = <0x3>;



		/* mhi bus specific settings */

		mhi,max-channels = <110>;

		mhi,max-channels = <111>;

		mhi,timeout = <2000>;



		mhi_channels {
@@ -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,13 +391,35 @@ 
			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>;

				mhi,offload-chan;

				mhi,lpm-notify;

			};



			mhi_chan@109 {

				reg = <109>;

				label = "RMNET_CTL";

				mhi,num-elements = <128>;

				mhi,event-ring = <12>;

				mhi,chan-dir = <1>;

				mhi,data-type = <1>;

				mhi,doorbell-mode = <2>;

				mhi,ee = <0x4>;

			};



			mhi_chan@110 {

				reg = <110>;

				label = "RMNET_CTL";

				mhi,num-elements = <128>;

				mhi,event-ring = <13>;

				mhi,chan-dir = <2>;

				mhi,data-type = <0>;

				mhi,doorbell-mode = <2>;

				mhi,ee = <0x4>;

			};

		};



		mhi_events {
@@ -438,6 +460,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 +478,7 @@ 
				mhi,hw-ev;

			};



			mhi_event@5 {

			mhi_event@6 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

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

			};



			mhi_event@6 {

			mhi_event@7 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

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

			};



			mhi_event@7 {

			mhi_event@8 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

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

			};



			mhi_event@8 {

			mhi_event@9 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

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

			};



			mhi_event@9 {

			mhi_event@10 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

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

			};



			mhi_event@10 {

			mhi_event@11 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

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

			};



			mhi_event@11 {

			mhi_event@12 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <12>;
@@ -527,6 +558,26 @@ 
				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@13 {

				mhi,num-elements = <1024>;

				mhi,intmod = <1>;

				mhi,msi = <13>;

				mhi,chan = <109>;

				mhi,priority = <0>;

				mhi,brstmode = <2>;

				mhi,hw-ev;

			};



			mhi_event@14 {

				mhi,num-elements = <1024>;

				mhi,intmod = <0>;

				mhi,msi = <14>;

				mhi,chan = <110>;

				mhi,priority = <0>;

				mhi,brstmode = <2>;

				mhi,hw-ev;

			};

		};



		mhi_devices {
@@ -575,7 +626,7 @@ 
			<45 512 1200000000 650000000>;



		/* mhi bus specific settings */

		mhi,max-channels = <110>;

		mhi,max-channels = <111>;

		mhi,timeout = <2000>;



		mhi_channels {
@@ -867,7 +918,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>;
@@ -879,7 +930,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>;
@@ -889,7 +940,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>;
@@ -901,7 +952,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>;
@@ -911,7 +962,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>;
@@ -921,7 +972,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>;
@@ -932,7 +983,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>;
@@ -942,13 +993,35 @@ 
			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>;

				mhi,offload-chan;

				mhi,lpm-notify;

			};



			mhi_chan@109 {

				reg = <109>;

				label = "RMNET_CTL";

				mhi,num-elements = <128>;

				mhi,event-ring = <12>;

				mhi,chan-dir = <1>;

				mhi,data-type = <1>;

				mhi,doorbell-mode = <2>;

				mhi,ee = <0x4>;

			};



			mhi_chan@110 {

				reg = <110>;

				label = "RMNET_CTL";

				mhi,num-elements = <128>;

				mhi,event-ring = <13>;

				mhi,chan-dir = <2>;

				mhi,data-type = <0>;

				mhi,doorbell-mode = <2>;

				mhi,ee = <0x4>;

			};

		};



		mhi_events {
@@ -989,6 +1062,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>;
@@ -998,7 +1080,7 @@ 
				mhi,hw-ev;

			};



			mhi_event@5 {

			mhi_event@6 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <6>;
@@ -1009,7 +1091,7 @@ 
				mhi,client-manage;

			};



			mhi_event@6 {

			mhi_event@7 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <7>;
@@ -1021,7 +1103,7 @@ 
				mhi,offload;

			};



			mhi_event@7 {

			mhi_event@8 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <8>;
@@ -1031,7 +1113,7 @@ 
				mhi,hw-ev;

			};



			mhi_event@8 {

			mhi_event@9 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <9>;
@@ -1043,7 +1125,7 @@ 
				mhi,offload;

			};



			mhi_event@9 {

			mhi_event@10 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <10>;
@@ -1055,7 +1137,7 @@ 
				mhi,offload;

			};



			mhi_event@10 {

			mhi_event@11 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <11>;
@@ -1067,7 +1149,7 @@ 
				mhi,offload;

			};



			mhi_event@11 {

			mhi_event@12 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <12>;
@@ -1078,6 +1160,26 @@ 
				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@13 {

				mhi,num-elements = <1024>;

				mhi,intmod = <1>;

				mhi,msi = <13>;

				mhi,chan = <109>;

				mhi,priority = <0>;

				mhi,brstmode = <2>;

				mhi,hw-ev;

			};



			mhi_event@14 {

				mhi,num-elements = <1024>;

				mhi,intmod = <0>;

				mhi,msi = <14>;

				mhi,chan = <110>;

				mhi,priority = <0>;

				mhi,brstmode = <2>;

				mhi,hw-ev;

			};

		};



		mhi_devices {

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

+44 −12
Original line number Diff line number Diff line
@@ -72,10 +72,18 @@ 
		mhi_chan@108 {

			status = "disabled";

		};



		mhi_chan@109 {

			status = "disabled";

		};



		mhi_chan@110 {

			status = "disabled";

		};

	};



	mhi_events {

		mhi_event@4 {

		mhi_event@5 {

			mhi,num-elements = <0>;

			mhi,intmod = <0>;

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

		};



		mhi_event@5 {

		mhi_event@6 {

			mhi,num-elements = <0>;

			mhi,intmod = <0>;

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

		};



		mhi_events@6 {

			status = "disabled";

		};



		mhi_events@7 {

			status = "disabled";

		};
@@ -122,6 +126,18 @@ 
		mhi_events@11 {

			status = "disabled";

		};



		mhi_events@12 {

			status = "disabled";

		};



		mhi_events@13 {

			status = "disabled";

		};



		mhi_events@14 {

			status = "disabled";

		};

	};

};
@@ -162,10 +178,18 @@ 
		mhi_chan@108 {

			status = "disabled";

		};



		mhi_chan@109 {

			status = "disabled";

		};



		mhi_chan@110 {

			status = "disabled";

		};

	};



	mhi_events {

		mhi_event@4 {

		mhi_event@5 {

			mhi,num-elements = <0>;

			mhi,intmod = <0>;

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

		};



		mhi_event@5 {

		mhi_event@6 {

			mhi,num-elements = <0>;

			mhi,intmod = <0>;

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

		};



		mhi_events@6 {

			status = "disabled";

		};



		mhi_events@7 {

			status = "disabled";

		};
@@ -212,6 +232,18 @@ 
		mhi_events@11 {

			status = "disabled";

		};



		mhi_events@12 {

			status = "disabled";

		};



		mhi_events@13 {

			status = "disabled";

		};



		mhi_events@14 {

			status = "disabled";

		};

	};

};

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

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,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>;
@@ -71,7 +71,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>;
@@ -81,7 +81,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>;