gpu: gpu@b00000 {
                        compatible = "qcom,adreno-530.2", "qcom,adreno";
-                       #stream-id-cells = <16>;
 
                        reg = <0x00b00000 0x3f000>;
                        reg-names = "kgsl_3d0_reg_memory";
 
                        iommus = <&adreno_smmu 0>;
                        operating-points-v2 = <&gpu_opp_table>;
                        power-domains = <&rpmpd MSM8998_VDDMX>;
-                       #stream-id-cells = <16>;
                        status = "disabled";
 
                        gpu_opp_table: opp-table {
 
 
                gpu: gpu@5000000 {
                        compatible = "qcom,adreno-618.0", "qcom,adreno";
-                       #stream-id-cells = <16>;
                        reg = <0 0x05000000 0 0x40000>, <0 0x0509e000 0 0x1000>,
                                <0 0x05061000 0 0x800>;
                        reg-names = "kgsl_3d0_reg_memory", "cx_mem", "cx_dbgc";
 
 
                gpu: gpu@3d00000 {
                        compatible = "qcom,adreno-635.0", "qcom,adreno";
-                       #stream-id-cells = <16>;
                        reg = <0 0x03d00000 0 0x40000>,
                              <0 0x03d9e000 0 0x1000>,
                              <0 0x03d61000 0 0x800>;
 
 
                adreno_gpu: gpu@5000000 {
                        compatible = "qcom,adreno-508.0", "qcom,adreno";
-                       #stream-id-cells = <16>;
 
                        reg = <0x05000000 0x40000>;
                        reg-names = "kgsl_3d0_reg_memory";
 
 
                gpu: gpu@5000000 {
                        compatible = "qcom,adreno-630.2", "qcom,adreno";
-                       #stream-id-cells = <16>;
 
                        reg = <0 0x5000000 0 0x40000>, <0 0x509e000 0 0x10>;
                        reg-names = "kgsl_3d0_reg_memory", "cx_mem";
 
                        compatible = "qcom,adreno-640.1",
                                     "qcom,adreno",
                                     "amd,imageon";
-                       #stream-id-cells = <16>;
 
                        reg = <0 0x02c00000 0 0x40000>;
                        reg-names = "kgsl_3d0_reg_memory";
 
                gpu: gpu@3d00000 {
                        compatible = "qcom,adreno-650.2",
                                     "qcom,adreno";
-                       #stream-id-cells = <16>;
 
                        reg = <0 0x03d00000 0 0x40000>;
                        reg-names = "kgsl_3d0_reg_memory";