Merge "iommu/arm-smmu: add support for dynamic stream IDs to DT parsing" into msm-4.8

				entry->node = master;

				list_add(&entry->list, &iommus);

			}

			if (iommuspec.args_count != 1) {

				dev_err(smmu->dev, "iommus property has wrong #iommu-cells");

				return -EINVAL;

			}

			switch (iommuspec.args_count) {

			case 0:

				/*

				 * For pci-e devices the SIDs are provided

				 * at device attach time.

				 */

				break;

			case 1:

				entry->num_sids++;

				entry->streamids[entry->num_sids - 1]

					= iommuspec.args[0];

				break;

			default:

				dev_err(smmu->dev, "iommus property has wrong #iommu-cells");

				return -EINVAL;

			}

			arg_ind++;

		}