Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06132ee9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-domains' 

* pm-domains:
  PM / Domains: Make it possible to add devices to inactive domains
parents 351520a9 ca1d72f0

drivers/base/power/domain.c

+21 −6
Original line number Diff line number Diff line
@@ -1263,11 +1263,6 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, 


	genpd_acquire_lock(genpd);



	if (genpd->status == GPD_STATE_POWER_OFF) {

		ret = -EINVAL;

		goto out;

	}



	if (genpd->prepared_count > 0) {

		ret = -EAGAIN;

		goto out;
@@ -1290,7 +1285,7 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, 
	dev->power.subsys_data->domain_data = &gpd_data->base;

	gpd_data->base.dev = dev;

	list_add_tail(&gpd_data->base.list_node, &genpd->dev_list);

	gpd_data->need_restore = false;

	gpd_data->need_restore = genpd->status == GPD_STATE_POWER_OFF;

	if (td)

		gpd_data->td = *td;
@@ -1417,6 +1412,26 @@ void pm_genpd_dev_always_on(struct device *dev, bool val) 
}

EXPORT_SYMBOL_GPL(pm_genpd_dev_always_on);



/**

 * pm_genpd_dev_need_restore - Set/unset the device's "need restore" flag.

 * @dev: Device to set/unset the flag for.

 * @val: The new value of the device's "need restore" flag.

 */

void pm_genpd_dev_need_restore(struct device *dev, bool val)

{

	struct pm_subsys_data *psd;

	unsigned long flags;



	spin_lock_irqsave(&dev->power.lock, flags);



	psd = dev_to_psd(dev);

	if (psd && psd->domain_data)

		to_gpd_data(psd->domain_data)->need_restore = val;



	spin_unlock_irqrestore(&dev->power.lock, flags);

}

EXPORT_SYMBOL_GPL(pm_genpd_dev_need_restore);



/**

 * pm_genpd_add_subdomain - Add a subdomain to an I/O PM domain.

 * @genpd: Master PM domain to add the subdomain to.

include/linux/pm_domain.h

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static inline int pm_genpd_of_add_device(struct device_node *genpd_node, 
extern int pm_genpd_remove_device(struct generic_pm_domain *genpd,

				  struct device *dev);

extern void pm_genpd_dev_always_on(struct device *dev, bool val);

extern void pm_genpd_dev_need_restore(struct device *dev, bool val);

extern int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,

				  struct generic_pm_domain *new_subdomain);

extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
@@ -189,6 +190,7 @@ static inline int pm_genpd_remove_device(struct generic_pm_domain *genpd, 
	return -ENOSYS;

}

static inline void pm_genpd_dev_always_on(struct device *dev, bool val) {}

static inline void pm_genpd_dev_need_restore(struct device *dev, bool val) {}

static inline int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,

					 struct generic_pm_domain *new_sd)

{