Revert "Revert "ARM64: dt: tegra210: remove nvidia,memory-clients""

This reverts commit ada4acb4cc456e9a22f8e75a04041a7093c7596a.

Change-Id: Iee51ebb3819df251404d44e9f2c780d004ba842c
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/451025
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>
Tested-by: Hiroshi Doyu <hdoyu@nvidia.com>

diff --git a/arch/arm64/boot/dts/tegra210-ers-e2190-1100-a00-00.dts b/arch/arm64/boot/dts/tegra210-ers-e2190-1100-a00-00.dts
index 235f6b20539aead9a7fd775471d493bc0adc8f5f..e9d4b82be8d51b34421847d466d9d1a0190bbc55 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-ers-e2190-1100-a00-00.dts
+++ b/arch/arm64/boot/dts/tegra210-ers-e2190-1100-a00-00.dts
@@ -113,7 +113,6 @@
        sound {
                compatible = "nvidia,tegra-audio-t210ref-mobile";
                nvidia,model = "tegra-snd-t210ref-mobile";
-               nvidia,memory-clients = <34>;
                nvidia,ldo-gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_HIGH>;
                nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
                nvidia,num-codec-link = <2>;

diff --git a/arch/arm64/boot/dts/tegra210-ers-e2220-1100-a00-00.dts b/arch/arm64/boot/dts/tegra210-ers-e2220-1100-a00-00.dts
index bab6293468774e03e0fb65871c468a7092e33046..a2d63b8a13e5a4dfe5b3aecd16df5527c77932c2 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-ers-e2220-1100-a00-00.dts
+++ b/arch/arm64/boot/dts/tegra210-ers-e2220-1100-a00-00.dts
@@ -138,7 +138,6 @@
        sound {
                compatible = "nvidia,tegra-audio-t210ref-mobile";
                nvidia,model = "tegra-snd-t210ref-mobile";
-               nvidia,memory-clients = <34>;
                nvidia,ldo-gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_HIGH>;
                nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
                nvidia,num-codec-link = <2>;

diff --git a/arch/arm64/boot/dts/tegra210-grenada.dts b/arch/arm64/boot/dts/tegra210-grenada.dts
index 52fdf4267e5cfeab8531f144554d4f9a04bc1ebe..bb644379f1191f3acf1c054108430994e7921195 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-grenada.dts
+++ b/arch/arm64/boot/dts/tegra210-grenada.dts
@@ -975,8 +975,7 @@
                        TDM_SLOT_MAP(0, 0, 0)
                        TDM_SLOT_MAP(3, 2, 0)
                        TDM_SLOT_MAP(3, 2, 1)>;
-               nvidia,memory-clients = <34>;
-               iommus = <&smmu TEGRA_SWGROUP_CELLS(APE) &ape_as>;
+
                nvidia,audio-routing =
                        "x Headphone",  "x OUT",
                        "y Headphone",  "y OUT",

diff --git a/arch/arm64/boot/dts/tegra210.dtsi b/arch/arm64/boot/dts/tegra210.dtsi
index 6e264ed09609c0df1c498b50c935910cd8864c7a..d01614e2d013d1faccd907cee045e334126c01ad 100644 (file)
--- a/arch/arm64/boot/dts/tegra210.dtsi
+++ b/arch/arm64/boot/dts/tegra210.dtsi
@@ -338,7 +338,6 @@
                 nvidia,dma-request-selector = <&apbdma 8>;
                 dmas = <&apbdma 8>, <&apbdma 8>;
                 dma-names = "rx", "tx";
-               nvidia,memory-clients = <14>;
                status = "disabled";
        };
 
@@ -351,7 +350,6 @@
                 nvidia,dma-request-selector = <&apbdma 9>;
                 dmas = <&apbdma 9>, <&apbdma 9>;
                 dma-names = "rx", "tx";
-               nvidia,memory-clients = <14>;
                status = "disabled";
        };
 
@@ -361,7 +359,6 @@
                reg-shift = <2>;
                interrupts = <0 46 0x04>;
                nvidia,dma-request-selector = <&apbdma 10>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                dmas = <&apbdma 10>, <&apbdma 10>;
                dma-names = "rx", "tx";
@@ -374,13 +371,16 @@
                reg-shift = <2>;
                interrupts = <0 90 0x04>;
                nvidia,dma-request-selector = <&apbdma 19>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                dmas = <&apbdma 19>, <&apbdma 19>;
                dma-names = "rx", "tx";
                status = "disabled";
        };
 
+       sound {
+               iommus = <&smmu TEGRA_SWGROUP_CELLS(APE) &ape_as>;
+       };
+
        tegra_pwm: pwm@7000a000 {
                compatible = "nvidia,tegra124-pwm";
                reg = <0x0 0x7000a000 0x0 0x100>;
@@ -393,7 +393,6 @@
                reg = <0x0 0x7000d400 0x0 0x200>;
                interrupts = <0 59 0x04>;
                nvidia,dma-request-selector = <&apbdma 15>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -407,7 +406,6 @@
                reg = <0x0 0x7000d600 0x0 0x200>;
                interrupts = <0 82 0x04>;
                nvidia,dma-request-selector = <&apbdma 16>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -421,7 +419,6 @@
                reg = <0x0 0x7000d800 0x0 0x200>;
                interrupts = <0 83 0x04>;
                nvidia,dma-request-selector = <&apbdma 17>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -435,7 +432,6 @@
                reg = <0x0 0x7000da00 0x0 0x200>;
                interrupts = <0 93 0x04>;
                nvidia,dma-request-selector = <&apbdma 18>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -449,7 +445,6 @@
                reg = <0x0 0x70410000 0x0 0x1000>;
                interrupts = <0 10 0x04>;
                nvidia,dma-request-selector = <&apbdma 5>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -461,7 +456,6 @@
                reg = <0x0 0x50000000 0x0 0x00034000>;
                interrupts = <0 65 0x04   /* mpcore syncpt */
                              0 67 0x04>; /* mpcore general */
-               nvidia,memory-clients = <6>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(HC) &common_as>;
 
                #address-cells = <1>;
@@ -473,7 +467,6 @@
                        compatible = "nvidia,tegra210-vi";
                        reg = <0x54080000 0x00040000>;
                        interrupts = <0 69 0x04>;
-                       nvidia,memory-clients = <18>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS(VI) &common_as>;
                };
 
@@ -481,7 +474,6 @@
                        compatible = "nvidia,tegra210-isp";
                        reg = <0x54600000 0x00040000>;
                        interrupts = <0 71 0x04>;
-                       nvidia,memory-clients = <8>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS(ISP) &common_as>;
                };
 
@@ -489,7 +481,6 @@
                        compatible = "nvidia,tegra210-isp";
                        reg = <0x54680000 0x00040000>;
                        interrupts = <0 72 0x04>;
-                       nvidia,memory-clients = <29>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS(ISP2B) &common_as>;
                };
 
@@ -497,7 +488,6 @@
                        compatible = "nvidia,tegra210-dc";
                        reg = <0x54200000 0x00040000>;
                        interrupts = <0 73 0x04>;
-                       nvidia,memory-clients = <2 3 10>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS3(DC, DCB, DC12) &dc_as>;
                        status = "disabled";
 
@@ -510,7 +500,6 @@
                        compatible = "nvidia,tegra210-dc";
                        reg = <0x54240000 0x00040000>;
                        interrupts = <0 74 0x04>;
-                       nvidia,memory-clients = <2 3 10>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS3(DC, DCB, DC12) &dc_as>;
                        status = "disabled";
 
@@ -529,42 +518,36 @@
                vic {
                        compatible = "nvidia,tegra210-vic";
                        reg = <0x54340000 0x00040000>;
-                       nvidia,memory-clients = <19>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS(VIC) &common_as>;
                };
 
                nvenc {
                        compatible = "nvidia,tegra210-nvenc";
                        reg = <0x544c0000 0x00040000>;
-                       nvidia,memory-clients = <11>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS(MPE) &common_as>;
                };
 
                tsec {
                        compatible = "nvidia,tegra210-tsec";
                        reg = <0x54500000 0x00040000>;
-                       nvidia,memory-clients = <23>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS(TSEC) &common_as>;
                };
 
                tsecb {
                        compatible = "nvidia,tegra210-tsec";
                        reg = <0x54100000 0x00040000>;
-                       nvidia,memory-clients = <41>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS(TSECB1) &common_as>;
                };
 
                nvdec {
                        compatible = "nvidia,tegra210-nvdec";
                        reg = <0x54480000 0x00040000>;
-                       nvidia,memory-clients = <33>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS(NVDEC) &common_as>;
                };
 
                nvjpg {
                        compatible = "nvidia,tegra210-nvjpg";
                        reg = <0x54380000 0x00040000>;
-                       nvidia,memory-clients = <36>;
                        iommus = <&smmu TEGRA_SWGROUP_CELLS(NVJPG) &common_as>;
                };
 
@@ -605,7 +588,6 @@
                    <0x0 0x538f0000 0x0 0x00001000>;
                    interrupts = <0 157 0x04
                            0 158 0x04>;
-               nvidia,memory-clients = <30 31>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS2(GPU, GPUB) &gpu_as>;
        };
 
@@ -925,7 +907,6 @@
 
        tegra_adsp_audio: adsp_audio {
                compatible = "nvidia,tegra210-adsp-audio";
-               nvidia,memory-clients = <34>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(APE) &ape_as>;
                status = "disabled";
        };
@@ -937,7 +918,6 @@
                   <0x0 0x702ee000 0x0 0x1000>, /* ABRIDGE */
                   <0x0 0x01000000 0x0 0x6f2c0000>, /* DRAM MAP1 */
                   <0x0 0x70300000 0x0 0x8fd00000>; /* DRAM MAP2 */
-            nvidia,memory-clients = <34>;
             iommus = <&smmu TEGRA_SWGROUP_CELLS(APE) &ape_as>;
             status = "disabled";
        };
@@ -1011,7 +991,6 @@
                compatible = "nvidia,tegra210-i2c";
                reg = <0x0 0x7000c000 0x0 0x100>;
                interrupts = <0 38 0x04>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                status = "okay";
                clock-frequency = <400000>;
@@ -1023,7 +1002,6 @@
                compatible = "nvidia,tegra210-i2c";
                reg = <0x0 0x7000c400 0x0 0x100>;
                interrupts = <0 84 0x04>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                status = "okay";
                clock-frequency = <100000>;
@@ -1035,7 +1013,6 @@
                compatible = "nvidia,tegra210-i2c";
                reg = <0x0 0x7000c500 0x0 0x100>;
                interrupts = <0 92 0x04>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                status = "okay";
                clock-frequency = <400000>;
@@ -1047,7 +1024,6 @@
                compatible = "nvidia,tegra210-i2c";
                reg = <0x0 0x7000c700 0x0 0x100>;
                interrupts = <0 120 0x04>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                status = "okay";
                clock-frequency = <100000>;
@@ -1060,7 +1036,6 @@
                reg = <0x0 0x7000d000 0x0 0x100>;
                interrupts = <0 53 0x04>;
                nvidia,require-cldvfs-clock;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                status = "okay";
                clock-frequency = <400000>;
@@ -1072,7 +1047,6 @@
                compatible = "nvidia,tegra210-i2c";
                reg = <0x0 0x7000d100 0x0 0x100>;
                interrupts = <0 63 0x04>;
-               nvidia,memory-clients = <14>;
                iommus = <&smmu TEGRA_SWGROUP_CELLS(PPCS) &ppcs_as>;
                status = "okay";
                clock-frequency = <400000>;
@@ -1082,7 +1056,6 @@
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0600 0x0 0x200>;
                interrupts = < 0 31 0x04 >;
-               nvidia,memory-clients = <28>;
                status = "disabled";
        };
 
@@ -1090,7 +1063,6 @@
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0400 0x0 0x200>;
                interrupts = < 0 19 0x04 >;
-               nvidia,memory-clients = <27>;
                status = "disabled";
        };
 
@@ -1098,7 +1070,6 @@
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0200 0x0 0x200>;
                interrupts = < 0 15 0x04 >;
-               nvidia,memory-clients = <26>;
                status = "disabled";
        };
 
@@ -1106,7 +1077,6 @@
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0000 0x0 0x200>;
                interrupts = < 0 14 0x04 >;
-               nvidia,memory-clients = <25>;
                status = "disabled";
        };