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

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

Merge "ARM: dts: msm: iommu: Move implementation defined registers to DT"

parents 00121d91 8e7c9cc3

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

+10 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
				    0x2010

				    0x2014

				    0x2018

				    0x2000

				    0x201c>;



	qti,iommu-lpae-bfb-data = <0x7ffffff
@@ -90,6 +91,7 @@ 
				    0x0

				    0x0

				    0x0

				    0x3

				    0x0>;
@@ -172,6 +174,7 @@ 
				    0x22bc

				    0x2008

				    0x200c

				    0x2000

				    0x2010>;



	qti,iommu-lpae-bfb-data = <0x3fff
@@ -188,6 +191,7 @@ 
				    0x9614

				    0x0

				    0x0

				    0x3

				    0x0>;



};
@@ -248,6 +252,7 @@ 
				    0x200c

				    0x2010

				    0x2014

				    0x2000

				    0x2018>;



	qti,iommu-lpae-bfb-data = <0x7fffff
@@ -266,6 +271,7 @@ 
				    0x0

				    0x0

				    0x0

				    0x3

				    0x0>;



};
@@ -351,6 +357,7 @@ 
				    0x2620

				    0x2624

				    0x2628

				    0x2000

				    0x262c>;



	qti,iommu-lpae-bfb-data = <0x3
@@ -377,6 +384,7 @@ 
				    0x6c

				    0x0

				    0x8

				    0x3

				    0x10>;



};
@@ -444,6 +452,7 @@ 
				    0x2014

				    0x2018

				    0x201c

				    0x2000

				    0x2020>;



	qti,iommu-lpae-bfb-data = <0xffffffff
@@ -464,6 +473,7 @@ 
				    0x0

				    0x0

				    0x0

				    0x3

				    0x0>;



};

arch/arm/boot/dts/qti/msm-iommu-v1.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ 
					    0x2394

					    0x2414

					    0x2494

					    0x2000

					    0x2008>;



		qti,iommu-lpae-bfb-data = <0x3
@@ -637,6 +638,7 @@ 
					    0x0

					    0x40

					    0x44

					    0x3

					    0x0>;
@@ -796,6 +798,7 @@ 
					    0x2008

					    0x200c

					    0x2010

					    0x2000

					    0x2014>;



		qti,iommu-lpae-bfb-data = <0xffff
@@ -813,6 +816,7 @@ 
					    0x0

					    0x0

					    0x0

					    0x3

					    0x0>;
@@ -925,6 +929,7 @@ 
					    0x2394

					    0x2414

					    0x2494

					    0x2000

					    0x2008>;



		qti,iommu-lpae-bfb-data = <0x3
@@ -939,6 +944,7 @@ 
					    0x0

					    0x15e

					    0x19e

					    0x3

					    0x0>;
@@ -1058,6 +1064,7 @@ 
					    0x2394

					    0x2414

					    0x2494

					    0x2000

					    0x2008>;



		qti,iommu-lpae-bfb-data = <0x3
@@ -1072,6 +1079,7 @@ 
					    0x0

					    0x40

					    0x50

					    0x3

					    0x0>;

drivers/iommu/msm_iommu-v1.c

+0 −1
Original line number Diff line number Diff line
@@ -708,7 +708,6 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) 
				goto unlock;

			}

		}

		SET_MICRO_MMU_CTRL_RESERVED(iommu_drvdata->base, 0x3);

		program_iommu_bfb_settings(iommu_drvdata->base,

					   iommu_drvdata->bfb_settings);

		set_m2v = true;