From patchwork Mon Jun 19 08:41:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H. Nikolaus Schaller" X-Patchwork-Id: 9795499 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 07CE8603F6 for ; Mon, 19 Jun 2017 08:42:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D125327F95 for ; Mon, 19 Jun 2017 08:42:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5E6E28066; Mon, 19 Jun 2017 08:42:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FB0D27F95 for ; Mon, 19 Jun 2017 08:42:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753696AbdFSImS (ORCPT ); Mon, 19 Jun 2017 04:42:18 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.162]:33263 "EHLO mo4-p00-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753590AbdFSImR (ORCPT ); Mon, 19 Jun 2017 04:42:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1497861715; l=1744; s=domk; d=goldelico.com; h=References:In-Reply-To:References:In-Reply-To:Date:Subject:Cc:To: From; bh=T/4C0IVR3UUClF3oUdknrR0YACV2WdjXX/eDxYcnNRc=; b=q4euX5gLVisoH4eCHeGUrH9P7ZY4Qj1Lb/SYUSOJfKCOMJurMD84tzUzEEoMWXu/fS LshLBnKwEWM1Do8+5Quug8TAsVBgqvnn68LwoQJL8xb5RkiGCzpqGgP22NHC8efUsTnQ O2yTsHW/n1QFm0IqzYFFgWH89Dr0RlKXw8t5Q= X-RZG-AUTH: :JGIXVUS7cutRB/49FwqZ7WcecEarQROEYabkiUo6mSAGQ+qKIDYoJ4et X-RZG-CLASS-ID: mo00 Received: from localhost.localdomain (p57AE083B.dip0.t-ipconnect.de [87.174.8.59]) by smtp.strato.de (RZmta 40.9 DYNA|AUTH) with ESMTPSA id j03c2at5J8fli5Y (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Mon, 19 Jun 2017 10:41:47 +0200 (CEST) From: "H. Nikolaus Schaller" To: Grygorii Strashko , NeilBrown , Rob Herring , Mark Rutland , Russell King , Sebastian Reichel , Marek Belisko , "H. Nikolaus Schaller" Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-pm@vger.kernel.org, letux-kernel@openphoenux.org, notasas@gmail.com, linux-omap@vger.kernel.org Subject: [PATCH v7 2/2] power: supply: twl4030-charger: add deferred probing for phy and iio Date: Mon, 19 Jun 2017 10:41:46 +0200 Message-Id: <63d2c2c5bfb1bb8ec006c1991bbd01e8d102c341.1497861705.git.hns@goldelico.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes an issue if both this twl4030_charger driver and phy-twl4030-usb are compiled as modules and loaded in random order. It has been observed on GTA04 and OpenPandora devices that in worst case the boot process hangs and in best case the AC detection fails with a warning. Therefore we add deferred probing checks for the usb_phy and the iio channel for AC detection. Signed-off-by: H. Nikolaus Schaller --- drivers/power/supply/twl4030_charger.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c index 9d974f1e3957..0d2125e4f735 100644 --- a/drivers/power/supply/twl4030_charger.c +++ b/drivers/power/supply/twl4030_charger.c @@ -989,8 +989,12 @@ static int twl4030_bci_probe(struct platform_device *pdev) bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac"); if (IS_ERR(bci->channel_vac)) { + ret = PTR_ERR(bci->channel_vac); + if (ret == -EPROBE_DEFER) + return ret; /* iio not ready */ + dev_warn(&pdev->dev, "could not request vac iio channel (%d)", + ret); bci->channel_vac = NULL; - dev_warn(&pdev->dev, "could not request vac iio channel"); } if (bci->dev->of_node) { @@ -1002,6 +1006,14 @@ static int twl4030_bci_probe(struct platform_device *pdev) bci->transceiver = devm_usb_get_phy_by_node( bci->dev, phynode, &bci->usb_nb); bci->usb_nb.notifier_call = twl4030_bci_usb_ncb; + if (IS_ERR(bci->transceiver)) { + ret = PTR_ERR(bci->transceiver); + if (ret == -EPROBE_DEFER) + return ret; /* phy not ready */ + dev_warn(&pdev->dev, "could not request transceiver (%d)", + ret); + bci->transceiver = NULL; + } } }