Skip to content

Commit 682e1c4

Browse files
thierryredingthierryreding
committed
arm64: tegra: Drop I2C iommus and dma-coherent properties
Drop the iommus and dma-coherent properties for the I2C controller device tree nodes. These are only needed for the device tree nodes that represent the GPC DMA controller, since that is the device performing the direct memory accesses. Signed-off-by: Thierry Reding <treding@nvidia.com>
1 parent 361238c commit 682e1c4

File tree

3 files changed

+0
-48
lines changed

3 files changed

+0
-48
lines changed

‎arch/arm64/boot/dts/nvidia/tegra186.dtsi‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -674,8 +674,6 @@
674674
clock-names = "div-clk";
675675
resets = <&bpmp TEGRA186_RESET_I2C1>;
676676
reset-names = "i2c";
677-
iommus = <&smmu TEGRA186_SID_GPCDMA_0>;
678-
dma-coherent;
679677
dmas = <&gpcdma 21>, <&gpcdma 21>;
680678
dma-names = "rx", "tx";
681679
status = "disabled";
@@ -691,8 +689,6 @@
691689
clock-names = "div-clk";
692690
resets = <&bpmp TEGRA186_RESET_I2C3>;
693691
reset-names = "i2c";
694-
iommus = <&smmu TEGRA186_SID_GPCDMA_0>;
695-
dma-coherent;
696692
dmas = <&gpcdma 23>, <&gpcdma 23>;
697693
dma-names = "rx", "tx";
698694
status = "disabled";
@@ -712,8 +708,6 @@
712708
pinctrl-names = "default", "idle";
713709
pinctrl-0 = <&state_dpaux1_i2c>;
714710
pinctrl-1 = <&state_dpaux1_off>;
715-
iommus = <&smmu TEGRA186_SID_GPCDMA_0>;
716-
dma-coherent;
717711
dmas = <&gpcdma 26>, <&gpcdma 26>;
718712
dma-names = "rx", "tx";
719713
status = "disabled";
@@ -747,8 +741,6 @@
747741
pinctrl-names = "default", "idle";
748742
pinctrl-0 = <&state_dpaux_i2c>;
749743
pinctrl-1 = <&state_dpaux_off>;
750-
iommus = <&smmu TEGRA186_SID_GPCDMA_0>;
751-
dma-coherent;
752744
dmas = <&gpcdma 30>, <&gpcdma 30>;
753745
dma-names = "rx", "tx";
754746
status = "disabled";
@@ -764,8 +756,6 @@
764756
clock-names = "div-clk";
765757
resets = <&bpmp TEGRA186_RESET_I2C7>;
766758
reset-names = "i2c";
767-
iommus = <&smmu TEGRA186_SID_GPCDMA_0>;
768-
dma-coherent;
769759
dmas = <&gpcdma 27>, <&gpcdma 27>;
770760
dma-names = "rx", "tx";
771761
status = "disabled";
@@ -781,8 +771,6 @@
781771
clock-names = "div-clk";
782772
resets = <&bpmp TEGRA186_RESET_I2C9>;
783773
reset-names = "i2c";
784-
iommus = <&smmu TEGRA186_SID_GPCDMA_0>;
785-
dma-coherent;
786774
dmas = <&gpcdma 31>, <&gpcdma 31>;
787775
dma-names = "rx", "tx";
788776
status = "disabled";
@@ -1223,8 +1211,6 @@
12231211
clock-names = "div-clk";
12241212
resets = <&bpmp TEGRA186_RESET_I2C2>;
12251213
reset-names = "i2c";
1226-
iommus = <&smmu TEGRA186_SID_GPCDMA_0>;
1227-
dma-coherent;
12281214
dmas = <&gpcdma 22>, <&gpcdma 22>;
12291215
dma-names = "rx", "tx";
12301216
status = "disabled";
@@ -1240,8 +1226,6 @@
12401226
clock-names = "div-clk";
12411227
resets = <&bpmp TEGRA186_RESET_I2C8>;
12421228
reset-names = "i2c";
1243-
iommus = <&smmu TEGRA186_SID_GPCDMA_0>;
1244-
dma-coherent;
12451229
dmas = <&gpcdma 0>, <&gpcdma 0>;
12461230
dma-names = "rx", "tx";
12471231
status = "disabled";

‎arch/arm64/boot/dts/nvidia/tegra194.dtsi‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -809,8 +809,6 @@
809809
clock-names = "div-clk";
810810
resets = <&bpmp TEGRA194_RESET_I2C1>;
811811
reset-names = "i2c";
812-
iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
813-
dma-coherent;
814812
dmas = <&gpcdma 21>, <&gpcdma 21>;
815813
dma-names = "rx", "tx";
816814
status = "disabled";
@@ -838,8 +836,6 @@
838836
clock-names = "div-clk";
839837
resets = <&bpmp TEGRA194_RESET_I2C3>;
840838
reset-names = "i2c";
841-
iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
842-
dma-coherent;
843839
dmas = <&gpcdma 23>, <&gpcdma 23>;
844840
dma-names = "rx", "tx";
845841
status = "disabled";
@@ -859,8 +855,6 @@
859855
pinctrl-0 = <&state_dpaux1_i2c>;
860856
pinctrl-1 = <&state_dpaux1_off>;
861857
pinctrl-names = "default", "idle";
862-
iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
863-
dma-coherent;
864858
dmas = <&gpcdma 26>, <&gpcdma 26>;
865859
dma-names = "rx", "tx";
866860
status = "disabled";
@@ -880,8 +874,6 @@
880874
pinctrl-0 = <&state_dpaux0_i2c>;
881875
pinctrl-1 = <&state_dpaux0_off>;
882876
pinctrl-names = "default", "idle";
883-
iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
884-
dma-coherent;
885877
dmas = <&gpcdma 30>, <&gpcdma 30>;
886878
dma-names = "rx", "tx";
887879
status = "disabled";
@@ -901,8 +893,6 @@
901893
pinctrl-0 = <&state_dpaux2_i2c>;
902894
pinctrl-1 = <&state_dpaux2_off>;
903895
pinctrl-names = "default", "idle";
904-
iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
905-
dma-coherent;
906896
dmas = <&gpcdma 27>, <&gpcdma 27>;
907897
dma-names = "rx", "tx";
908898
status = "disabled";
@@ -922,8 +912,6 @@
922912
pinctrl-0 = <&state_dpaux3_i2c>;
923913
pinctrl-1 = <&state_dpaux3_off>;
924914
pinctrl-names = "default", "idle";
925-
iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
926-
dma-coherent;
927915
dmas = <&gpcdma 31>, <&gpcdma 31>;
928916
dma-names = "rx", "tx";
929917
status = "disabled";
@@ -1605,8 +1593,6 @@
16051593
clock-names = "div-clk";
16061594
resets = <&bpmp TEGRA194_RESET_I2C2>;
16071595
reset-names = "i2c";
1608-
iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
1609-
dma-coherent;
16101596
dmas = <&gpcdma 22>, <&gpcdma 22>;
16111597
dma-names = "rx", "tx";
16121598
status = "disabled";
@@ -1622,8 +1608,6 @@
16221608
clock-names = "div-clk";
16231609
resets = <&bpmp TEGRA194_RESET_I2C8>;
16241610
reset-names = "i2c";
1625-
iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
1626-
dma-coherent;
16271611
dmas = <&gpcdma 0>, <&gpcdma 0>;
16281612
dma-names = "rx", "tx";
16291613
status = "disabled";

‎arch/arm64/boot/dts/nvidia/tegra234.dtsi‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,6 @@
697697
clock-names = "div-clk", "parent";
698698
resets = <&bpmp TEGRA234_RESET_I2C1>;
699699
reset-names = "i2c";
700-
iommus = <&smmu_niso0 TEGRA234_SID_GPCDMA>;
701-
dma-coherent;
702700
dmas = <&gpcdma 21>, <&gpcdma 21>;
703701
dma-names = "rx", "tx";
704702
};
@@ -718,8 +716,6 @@
718716
clock-names = "div-clk", "parent";
719717
resets = <&bpmp TEGRA234_RESET_I2C3>;
720718
reset-names = "i2c";
721-
iommus = <&smmu_niso0 TEGRA234_SID_GPCDMA>;
722-
dma-coherent;
723719
dmas = <&gpcdma 23>, <&gpcdma 23>;
724720
dma-names = "rx", "tx";
725721
};
@@ -739,8 +735,6 @@
739735
clock-names = "div-clk", "parent";
740736
resets = <&bpmp TEGRA234_RESET_I2C4>;
741737
reset-names = "i2c";
742-
iommus = <&smmu_niso0 TEGRA234_SID_GPCDMA>;
743-
dma-coherent;
744738
dmas = <&gpcdma 26>, <&gpcdma 26>;
745739
dma-names = "rx", "tx";
746740
};
@@ -760,8 +754,6 @@
760754
clock-names = "div-clk", "parent";
761755
resets = <&bpmp TEGRA234_RESET_I2C6>;
762756
reset-names = "i2c";
763-
iommus = <&smmu_niso0 TEGRA234_SID_GPCDMA>;
764-
dma-coherent;
765757
dmas = <&gpcdma 30>, <&gpcdma 30>;
766758
dma-names = "rx", "tx";
767759
};
@@ -781,8 +773,6 @@
781773
clock-names = "div-clk", "parent";
782774
resets = <&bpmp TEGRA234_RESET_I2C7>;
783775
reset-names = "i2c";
784-
iommus = <&smmu_niso0 TEGRA234_SID_GPCDMA>;
785-
dma-coherent;
786776
dmas = <&gpcdma 27>, <&gpcdma 27>;
787777
dma-names = "rx", "tx";
788778
};
@@ -809,8 +799,6 @@
809799
clock-names = "div-clk", "parent";
810800
resets = <&bpmp TEGRA234_RESET_I2C9>;
811801
reset-names = "i2c";
812-
iommus = <&smmu_niso0 TEGRA234_SID_GPCDMA>;
813-
dma-coherent;
814802
dmas = <&gpcdma 31>, <&gpcdma 31>;
815803
dma-names = "rx", "tx";
816804
};
@@ -1700,8 +1688,6 @@
17001688
assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>;
17011689
resets = <&bpmp TEGRA234_RESET_I2C2>;
17021690
reset-names = "i2c";
1703-
iommus = <&smmu_niso0 TEGRA234_SID_GPCDMA>;
1704-
dma-coherent;
17051691
dmas = <&gpcdma 22>, <&gpcdma 22>;
17061692
dma-names = "rx", "tx";
17071693
};
@@ -1721,8 +1707,6 @@
17211707
assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>;
17221708
resets = <&bpmp TEGRA234_RESET_I2C8>;
17231709
reset-names = "i2c";
1724-
iommus = <&smmu_niso0 TEGRA234_SID_GPCDMA>;
1725-
dma-coherent;
17261710
dmas = <&gpcdma 0>, <&gpcdma 0>;
17271711
dma-names = "rx", "tx";
17281712
};

0 commit comments

Comments
 (0)