From: Joerg Roedel <jroedel@suse.de>
Date: Tue, 6 Dec 2016 16:32:16 +0000 (+0100)
Subject: Merge branches 'arm/mediatek', 'arm/smmu', 'x86/amd', 's390', 'core' and 'arm/exynos... 
X-Git-Tag: v4.10-rc1~95^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1465f481460cbfc60dc119873099d89a58f9be4f;p=platform%2Fkernel%2Flinux-exynos.git

Merge branches 'arm/mediatek', 'arm/smmu', 'x86/amd', 's390', 'core' and 'arm/exynos' into next
---

1465f481460cbfc60dc119873099d89a58f9be4f
diff --cc drivers/base/power/main.c
index 2932a5b,e44944f,2932a5b,e44944f,2932a5b,e44944f,04bcb11..252095e
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@@@@@@ -1040,6 -1038,8 -1040,6 -1038,8 -1040,6 -1038,8 -1096,8 +1098,8 @@@@@@@@ static int __device_suspend_noirq(struc
       	if (dev->power.syscore || dev->power.direct_complete)
       		goto Complete;
       
 - - - 	dpm_wait_for_children(dev, async);
++++++ 	dpm_wait_for_subordinate(dev, async);
+ + +  
       	if (dev->pm_domain) {
       		info = "noirq power domain ";
       		callback = pm_noirq_op(&dev->pm_domain->ops, state);
@@@@@@@@ -1187,6 -1185,8 -1187,6 -1185,8 -1187,6 -1185,8 -1243,8 +1247,8 @@@@@@@@ static int __device_suspend_late(struc
       	if (dev->power.syscore || dev->power.direct_complete)
       		goto Complete;
       
 - - - 	dpm_wait_for_children(dev, async);
++++++ 	dpm_wait_for_subordinate(dev, async);
+ + +  
       	if (dev->pm_domain) {
       		info = "late power domain ";
       		callback = pm_late_early_op(&dev->pm_domain->ops, state);
diff --cc drivers/iommu/arm-smmu.c
index 8f72814,c841eb7,41b67ce,c841eb7,8f72814,b85fa247,c841eb7..a60cded
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@@@@@@@ -1402,8 -1390,8 -1406,8 -1390,8 -1402,8 -1390,8 -1390,8 +1406,8 @@@@@@@@ static int arm_smmu_add_device(struct d
       		fwspec = dev->iommu_fwspec;
       		if (ret)
       			goto out_free;
 - - --	} else if (fwspec) {
 - - --		smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode));
 + + ++	} else if (fwspec && fwspec->ops == &arm_smmu_ops) {
-   -  		smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode));
++ ++++		smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
       	} else {
       		return -ENODEV;
       	}