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

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

Merge "ARM: dts: msm: update MHI configuration for sm8150-sdxprairie modem"

parents 8fe0116e 4c0aab46

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

+241 −14
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, 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
@@ -21,7 +21,7 @@ 
		qcom,smmu-cfg = <0x3>;



		/* mhi bus specific settings */

		mhi,max-channels = <106>;

		mhi,max-channels = <110>;

		mhi,timeout = <2000>;



		#address-cells = <1>;
@@ -328,11 +328,33 @@ 
				mhi,num-elements = <512>;

				mhi,event-ring = <5>;

				mhi,chan-dir = <2>;

				mhi,data-type = <1>;

				mhi,data-type = <4>;

				mhi,doorbell-mode = <3>;

				mhi,ee = <0x4>;

			};



			mhi_chan@102 {

				reg = <102>;

				label = "IP_HW_ADPL";

				mhi,event-ring = <6>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;

				mhi,offload-chan;

				mhi,lpm-notify;

			};



			mhi_chan@103 {

				reg = <103>;

				label = "IP_HW_QDSS";

				mhi,num-elements = <128>;

				mhi,event-ring = <7>;

				mhi,chan-dir = <2>;

				mhi,data-type = <0>;

				mhi,doorbell-mode = <2>;

				mhi,ee = <0x4>;

			};



			mhi_chan@104 {

				reg = <104>;

				label = "IP_HW_OFFLOAD_0";
@@ -340,7 +362,6 @@ 
				mhi,chan-dir = <1>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;

				mhi,offload-chan;

			};



			mhi_chan@105 {
@@ -353,6 +374,27 @@ 
				mhi,offload-chan;

				mhi,lpm-notify;

			};



			mhi_chan@107 {

				reg = <107>;

				label = "IP_HW_MHIP_1";

				mhi,event-ring = <10>;

				mhi,chan-dir = <1>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;

				mhi,offload-chan;

			};



			mhi_chan@108 {

				reg = <108>;

				label = "IP_HW_MHIP_1";

				mhi,event-ring = <11>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;

				mhi,offload-chan;

				mhi,lpm-notify;

			};

		};



		mhi_events {
@@ -409,6 +451,76 @@ 
				mhi,hw-ev;

				mhi,client-manage;

			};



			mhi_event@6 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <7>;

				mhi,chan = <102>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@7 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <8>;

				mhi,chan = <103>;

				mhi,priority = <1>;

				mhi,brstmode = <2>;

				mhi,hw-ev;

			};



			mhi_event@8 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <9>;

				mhi,chan = <105>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@9 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <10>;

				mhi,chan = <106>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@10 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <11>;

				mhi,chan = <107>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@11 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <12>;

				mhi,chan = <108>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};

		};



		mhi_devices {
@@ -417,13 +529,14 @@ 
				mhi,chan = "IP_HW0";

				mhi,interface-name = "rmnet_mhi";

				mhi,mru = <0x4000>;

				mhi,chan-skb;

			};



			mhi_netdev_1: mhi_rmnet@1 {

			mhi_rmnet@1 {

				reg = <0x1>;

				mhi,chan = "IP_HW_ADPL";

				mhi,interface-name = "rmnet_mhi";

				mhi,mru = <0x4000>;

				mhi,chan = "IP_HW0_RSC";

				mhi,mru = <0x8000>;

				mhi,rsc-parent = <&mhi_netdev_0>;

			};

		};

	};
@@ -445,7 +558,7 @@ 
			<45 512 1200000000 650000000>;



		/* mhi bus specific settings */

		mhi,max-channels = <106>;

		mhi,max-channels = <110>;

		mhi,timeout = <2000>;



		#address-cells = <1>;
@@ -752,11 +865,33 @@ 
				mhi,num-elements = <512>;

				mhi,event-ring = <5>;

				mhi,chan-dir = <2>;

				mhi,data-type = <1>;

				mhi,data-type = <4>;

				mhi,doorbell-mode = <3>;

				mhi,ee = <0x4>;

			};



			mhi_chan@102 {

				reg = <102>;

				label = "IP_HW_ADPL";

				mhi,event-ring = <6>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;

				mhi,offload-chan;

				mhi,lpm-notify;

			};



			mhi_chan@103 {

				reg = <103>;

				label = "IP_HW_QDSS";

				mhi,num-elements = <128>;

				mhi,event-ring = <7>;

				mhi,chan-dir = <2>;

				mhi,data-type = <0>;

				mhi,doorbell-mode = <2>;

				mhi,ee = <0x4>;

			};



			mhi_chan@104 {

				reg = <104>;

				label = "IP_HW_OFFLOAD_0";
@@ -777,6 +912,27 @@ 
				mhi,offload-chan;

				mhi,lpm-notify;

			};



			mhi_chan@107 {

				reg = <107>;

				label = "IP_HW_MHIP_1";

				mhi,event-ring = <10>;

				mhi,chan-dir = <1>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;

				mhi,offload-chan;

			};



			mhi_chan@108 {

				reg = <108>;

				label = "IP_HW_MHIP_1";

				mhi,event-ring = <11>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <0x4>;

				mhi,offload-chan;

				mhi,lpm-notify;

			};

		};



		mhi_events {
@@ -833,6 +989,76 @@ 
				mhi,hw-ev;

				mhi,client-manage;

			};



			mhi_event@6 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <7>;

				mhi,chan = <102>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@7 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <8>;

				mhi,chan = <103>;

				mhi,priority = <1>;

				mhi,brstmode = <2>;

				mhi,hw-ev;

			};



			mhi_event@8 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <9>;

				mhi,chan = <105>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@9 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <10>;

				mhi,chan = <106>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@10 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <11>;

				mhi,chan = <107>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};



			mhi_event@11 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <12>;

				mhi,chan = <108>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

				mhi,offload;

			};

		};



		mhi_devices {
@@ -841,13 +1067,14 @@ 
				mhi,chan = "IP_HW0";

				mhi,interface-name = "rmnet_mhi";

				mhi,mru = <0x4000>;

				mhi,chan-skb;

			};



			mhi_netdev_3: mhi_rmnet@1 {

			mhi_rmnet@1 {

				reg = <0x1>;

				mhi,chan = "IP_HW_ADPL";

				mhi,interface-name = "rmnet_mhi";

				mhi,mru = <0x4000>;

				mhi,chan = "IP_HW0_RSC";

				mhi,mru = <0x8000>;

				mhi,rsc-parent = <&mhi_netdev_0>;

			};

		};

	};

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

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

/* Copyright (c) 2018-2019, 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
@@ -48,6 +48,26 @@ 
		mhi_chan@101 {

			status = "disabled";

		};



		mhi_chan@102 {

			status = "disabled";

		};



		mhi_chan@103 {

			status = "disabled";

		};



		mhi_chan@104 {

			mhi,offload-chan;

		};



		mhi_chan@107 {

			status = "disabled";

		};



		mhi_chan@108 {

			status = "disabled";

		};

	};



	mhi_events {
@@ -74,6 +94,30 @@ 
			mhi,client-manage;

			mhi,offload;

		};



		mhi_events@6 {

			status = "disabled";

		};



		mhi_events@7 {

			status = "disabled";

		};



		mhi_events@8 {

			status = "disabled";

		};



		mhi_events@9 {

			status = "disabled";

		};



		mhi_events@10 {

			status = "disabled";

		};



		mhi_events@11 {

			status = "disabled";

		};

	};

};
@@ -98,6 +142,22 @@ 
		mhi_chan@101 {

			status = "disabled";

		};



		mhi_chan@102 {

			status = "disabled";

		};



		mhi_chan@103 {

			status = "disabled";

		};



		mhi_chan@107 {

			status = "disabled";

		};



		mhi_chan@108 {

			status = "disabled";

		};

	};



	mhi_events {
@@ -124,6 +184,30 @@ 
			mhi,client-manage;

			mhi,offload;

		};



		mhi_events@6 {

			status = "disabled";

		};



		mhi_events@7 {

			status = "disabled";

		};



		mhi_events@8 {

			status = "disabled";

		};



		mhi_events@9 {

			status = "disabled";

		};



		mhi_events@10 {

			status = "disabled";

		};



		mhi_events@11 {

			status = "disabled";

		};

	};

};

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

+44 −9
Original line number Diff line number Diff line
@@ -21,22 +21,57 @@ 
	qcom,proxy-reg-names = "vdd_cx";

};



&mhi_1 {

&mhi_0 {

	esoc-names = "mdm";

	esoc-0 = <&mdm3>;

	qcom,smmu-cfg = <0x1d>;

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



	mhi_channels {

		mhi_chan@25 {

			status = "disabled";

		};



		mhi_chan@80 {

			reg = <80>;

			label = "AUDIO_VOICE_0";

			mhi,event-ring = <0>;

			mhi,chan-dir = <0>;

			mhi,ee = <0x4>;

			mhi,data-type = <3>;

			mhi,offload-chan;

			status = "ok";

		};



		mhi_chan@104 {

		status = "disabled";

			label = "IP_HW0_RSC";

			mhi,num-elements = <512>;

			mhi,event-ring = <5>;

			mhi,chan-dir = <2>;

			mhi,data-type = <5>;

			mhi,doorbell-mode = <3>;

			mhi,chan-type = <3>;

		};



		mhi_chan@105 {

		status = "disabled";

			label = "IP_HW_MHIP_0";

			mhi,event-ring = <8>;

			mhi,chan-dir = <1>;

			mhi,data-type = <3>;

			mhi,ee = <0x4>;

			mhi,offload-chan;

		};



		mhi_chan@106 {

			reg = <106>;

			label = "IP_HW_MHIP_0";

			mhi,event-ring = <9>;

			mhi,chan-dir = <2>;

			mhi,data-type = <3>;

			mhi,ee = <0x4>;

			mhi,offload-chan;

			mhi,lpm-notify;

		};

	};



	mhi_devices {

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

+0 −2
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ 
		mhi0 = &mhi_0;

		mhi1 = &mhi_1;

		mhi_netdev0 = &mhi_netdev_0;

		mhi_netdev1 = &mhi_netdev_1;

		mhi_netdev2 = &mhi_netdev_2;

		mhi_netdev3 = &mhi_netdev_3;

	};



	aliases {

drivers/bus/mhi/devices/mhi_netdev.c

+0 −1
Original line number Diff line number Diff line
@@ -917,7 +917,6 @@ static int mhi_netdev_probe(struct mhi_device *mhi_dev, 


static const struct mhi_device_id mhi_netdev_match_table[] = {

	{ .chan = "IP_HW0" },

	{ .chan = "IP_HW_ADPL" },

	{ .chan = "IP_HW0_RSC" },

	{},

};