From 630b7395a366ace88585d7c1e669bd434fcac1a6 Mon Sep 17 00:00:00 2001 From: Ramneek Mehresh Date: Wed, 19 Nov 2014 19:51:35 +0530 Subject: drivers:usb:pm: Fix usb wake-up issue in rcpm drv fsl_set_power_except() checks only for fman node. For all other ips, it doesn't program rcpm register, and goes to err handling code. Hence, a check for usb is put so that fman code only runs for fman ip Signed-off-by: Ramneek Mehresh Change-Id: Ia8b2280cbcd16b7935032c72fcc49dadcd2f263c Reviewed-on: http://git.am.freescale.net:8181/23989 Reviewed-by: Nikhil Badola Tested-by: Review Code-CDREVIEW Reviewed-by: Matthew Weigel diff --git a/arch/powerpc/platforms/85xx/qoriq_pm.c b/arch/powerpc/platforms/85xx/qoriq_pm.c index f1ec1bd..58b6cce 100644 --- a/arch/powerpc/platforms/85xx/qoriq_pm.c +++ b/arch/powerpc/platforms/85xx/qoriq_pm.c @@ -43,7 +43,8 @@ void fsl_set_power_except(struct device *dev, int on) int ret; ret = of_property_read_u32_array(dev->of_node, "sleep", value, 2); - if (ret) { + + if (ret && !strncmp(dev_name(dev), "usb", 3)) { /* search fman mac node */ phandle_prop = of_get_property(dev->of_node, "fsl,fman-mac", NULL); @@ -62,7 +63,6 @@ void fsl_set_power_except(struct device *dev, int on) qoriq_pm_ops->set_ip_power(on, pw_mask); return; - err: dev_err(dev, "Can not set wakeup sources\n"); return; -- cgit v0.10.2