From patchwork Thu Mar 30 03:26:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 745041 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vtqn00hsKz9s4s for ; Thu, 30 Mar 2017 14:27:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="aHeAv6GL"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755293AbdC3D0o (ORCPT ); Wed, 29 Mar 2017 23:26:44 -0400 Received: from mail-pg0-f45.google.com ([74.125.83.45]:36528 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755509AbdC3D0b (ORCPT ); Wed, 29 Mar 2017 23:26:31 -0400 Received: by mail-pg0-f45.google.com with SMTP id g2so25417127pge.3 for ; Wed, 29 Mar 2017 20:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=X2h9CFp1KMr0Arl/vll3NJADNpw6tvf9pd1KfuxLmrE=; b=aHeAv6GL9/LR2hR0H/hbYmNdBQ4t8zLX5PP8FWmQ+gH60Xz4pkNG0FG81WvTT2AXcM UMeojI7wC6IL848phQBYsv6hkAXVMIxTY6Ha33WEzB3uG2U12zvqYAbmne8JM7Wht+dF mJXekdhNGJywc3OlfLcdx87PMshVeMQhPPwfs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=X2h9CFp1KMr0Arl/vll3NJADNpw6tvf9pd1KfuxLmrE=; b=nIP+DSTXCgxJLzmsWusDFZyVOSG2gOBEUNL293rvmybMrU+3jU3WNVRGnRkSYB53ks a8PiIZcWy2yUNt7CjboUzh4XuPmqIZaNwTI77yVEpxLTGsU6OMwmTKu1Rc4C8HuKlJD2 KeCzApzLe20G9qQgIoJz1qJeASPtr45kEBhbbEYbQ6qEEaGHjYo6u/Cw15UaCSeIFIFi Rj9T4Dekm6iFcOMFvEkZJ9TuwriBXw+DtoVFCDLO0kntzN/CkY1gHXUqevJYNYTqEdET ZPk0VZjPkdFho2B7g+npkIv0MFk9wkGvxU5u3OYiQNK/FwFY5y/sWHPy4GmQ/dTU2mrw Ow+A== X-Gm-Message-State: AFeK/H3x27GZMRybJp6tyvGzltJ4peAiwMH2SHZBhFasdROG1dbxV3DEN+HXCtNWTUe5izJV X-Received: by 10.98.67.89 with SMTP id q86mr3646021pfa.237.1490844384864; Wed, 29 Mar 2017 20:26:24 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id b80sm824862pfe.87.2017.03.29.20.26.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Mar 2017 20:26:23 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Jarkko Nikula , Andy Shevchenko , Mika Westerberg , Wolfram Sang , linux-i2c@vger.kernel.org Subject: [RESEND][PATCH v2] i2c: designwear: Fix clk warning on suspend/resume Date: Wed, 29 Mar 2017 20:26:17 -0700 Message-Id: <1490844377-32182-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org On my HiKey board, I'm seeing clk warnings on suspend/resume, which seem to be caused by runtime pm suspending the device, then the same suspend hook being called again on suspend time. This patch fixes this by setting the SYSTEM_SLEEP_PM_OPS to using pm_runtime_force_suspend and pm_runtime_force_resume. Cc: Jarkko Nikula Cc: Andy Shevchenko Cc: Mika Westerberg Cc: Wolfram Sang Cc: linux-i2c@vger.kernel.org Suggested-by: Jarkko Nikula Signed-off-by: John Stultz --- v2: Switch to suggested fix by Jarkko. --- drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 79c4b4e..286447c 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -382,7 +382,7 @@ static int dw_i2c_plat_resume(struct device *dev) static const struct dev_pm_ops dw_i2c_dev_pm_ops = { .prepare = dw_i2c_plat_prepare, .complete = dw_i2c_plat_complete, - SET_SYSTEM_SLEEP_PM_OPS(dw_i2c_plat_suspend, dw_i2c_plat_resume) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) SET_RUNTIME_PM_OPS(dw_i2c_plat_suspend, dw_i2c_plat_resume, NULL) };