From patchwork Sat Oct 7 22:36:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 115155 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1040014qgn; Sat, 7 Oct 2017 15:54:25 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCtD9455X2BdQIDIndWA/zP++rQglKbK+OHenBDiLefV9Z5iO5c1dMRXkwZ4vIrTgdXljQR X-Received: by 10.99.146.85 with SMTP id s21mr5727825pgn.109.1507416865070; Sat, 07 Oct 2017 15:54:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507416865; cv=none; d=google.com; s=arc-20160816; b=pKou89sSnrx/8swDwEkI9WpHVP2FfxcoUUnHai/CsJbwYwU3P4RD4O2tnWc3emZSE/ eMxr4pHEq4IAdfD7J8PrGYf8QbRVu4sbIjA6TsL2lmc484HLiqAx+8f5eCsPguxv9OY3 l2BV5uS7Ca0v0/b0U7IpOqI8Be+vQg52BYPRCgQ3KnRuLjODsuqOvrC02npQbfqZpXA9 KwucTuUFYdEM2oSXO4Mlgbxzp9F/Ce0s1V85tyIc0QIstX8yxSisDYExyGRpxa1VlNYD cYbz60jUu1MZ8UQtwFr+sPPGZFbFcO011fnoDniusmXR1wf5Tb9RtgRVj60ylY6il8ar O3rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:to:dkim-signature :dkim-signature:cc:from:dkim-signature:arc-authentication-results; bh=6eQ55m4ZNa/CgPZRXlIck/3Cai/LYGP3gZrr3Lgvv6I=; b=O9jTJDsCL1pOda6CFhfc3XYPUZuAKVF9K1EXzVmG7BZ9aZYNs2MJA6j7S2OsFYJK6g CeIh2OrQ9bwSBoLpwLuvUi6tgbUCFKr66G+/jEg40VHY+XjJqyXld5FrUHCygo4z79ka 4G+UO2rVDvwDev0BBCAXJIFQBERkguadXMzsCRjpYJfoBjG2CVXBPTacNMLgQNSFKZD9 CG7DCnSrLqhCHAbTQQQORbOZ4v0aUavkLJE00l/+PettAh6JReRuR3CGXVVcznHsxMGA 7UxEFllt522HXJcqaN8vvzfl4wsmWBY0dJqMexNgnxP4J7Dg6hZMyIRvmxWKYmks6cmQ JisQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@verizon.com header.s=corp header.b=YOKKwjlN; dkim=fail header.i=@verizon.com header.s=corp header.b=FkVyJpV0; dkim=fail header.i=@verizon.com header.s=corp header.b=FkVyJpV0; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i6si3788078plt.103.2017.10.07.15.54.24; Sat, 07 Oct 2017 15:54:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@verizon.com header.s=corp header.b=YOKKwjlN; dkim=fail header.i=@verizon.com header.s=corp header.b=FkVyJpV0; dkim=fail header.i=@verizon.com header.s=corp header.b=FkVyJpV0; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753501AbdJGWyX (ORCPT + 8 others); Sat, 7 Oct 2017 18:54:23 -0400 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:57302 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753351AbdJGWh4 (ORCPT ); Sat, 7 Oct 2017 18:37:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1507415876; x=1538951876; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=8gEVN2Fk3NmjctE52AQGvDZwakhApyptnNZtpCLm6Fk=; b=YOKKwjlN8AAeFR4EWvvcEsc4EGKrlwDu1cFlu7NGbFqm9p/RUmLuroVJ qNciQEyMrKkpcg586LVC6GiwCUJT7qBZKadBc7dFwVlZrt0mWkwObLh2j UqOljQEpRcEmTbyUV9y9MNQrpZp0hJzeW80S349x64LEa+9Mcds9Mc/SC o=; Received: from unknown (HELO fldsmtpi01.verizon.com) ([166.68.71.143]) by fldsmtpe03.verizon.com with ESMTP; 07 Oct 2017 22:37:47 +0000 From: "Levin, Alexander (Sasha Levin)" Cc: Linus Walleij , Lee Jones , "Levin, Alexander (Sasha Levin)" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO apollo.verizonwireless.com) ([10.255.192.101]) by fldsmtpi01.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Oct 2017 22:36:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1507415812; x=1538951812; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=8gEVN2Fk3NmjctE52AQGvDZwakhApyptnNZtpCLm6Fk=; b=FkVyJpV0oLVwSZRle+i4ZP1kCFJu9SlETaXe0wEKFh0d/onw+7/OyXZN nvHw1jCpQGVHe1M1LmHIDK1ogrLLNNUoQuiDlwSM/qNG/1rohVn9q74Id mrR/5Lz2ZFFwZdDXv69vvIkUJMhtPIuhCcLcI3EJL6K3uWlauCSvQFYqB 8=; Received: from surveyor.tdc.vzwcorp.com (HELO eris.verizonwireless.com) ([10.254.88.83]) by apollo.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Oct 2017 18:36:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1507415812; x=1538951812; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=8gEVN2Fk3NmjctE52AQGvDZwakhApyptnNZtpCLm6Fk=; b=FkVyJpV0oLVwSZRle+i4ZP1kCFJu9SlETaXe0wEKFh0d/onw+7/OyXZN nvHw1jCpQGVHe1M1LmHIDK1ogrLLNNUoQuiDlwSM/qNG/1rohVn9q74Id mrR/5Lz2ZFFwZdDXv69vvIkUJMhtPIuhCcLcI3EJL6K3uWlauCSvQFYqB 8=; X-Host: surveyor.tdc.vzwcorp.com Received: from ohtwi1exh003.uswin.ad.vzwcorp.com ([10.144.218.45]) by eris.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 07 Oct 2017 22:36:52 +0000 Received: from tbwexch02apd.uswin.ad.vzwcorp.com (153.114.162.26) by OHTWI1EXH003.uswin.ad.vzwcorp.com (10.144.218.45) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sat, 7 Oct 2017 18:36:52 -0400 Received: from OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) by tbwexch02apd.uswin.ad.vzwcorp.com (153.114.162.26) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sat, 7 Oct 2017 18:36:51 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sat, 7 Oct 2017 17:36:50 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Sat, 7 Oct 2017 17:36:50 -0500 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH review for 4.9 08/50] mfd: ab8500-sysctrl: Handle probe deferral Thread-Topic: [PATCH review for 4.9 08/50] mfd: ab8500-sysctrl: Handle probe deferral Thread-Index: AQHTP7zCr5J1e+SJsUyrQpjAQEJygg== Date: Sat, 7 Oct 2017 22:36:48 +0000 Message-ID: <20171007223636.24797-8-alexander.levin@verizon.com> References: <20171007223636.24797-1-alexander.levin@verizon.com> In-Reply-To: <20171007223636.24797-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit 7e9c40c63933a643908d686bd89dfc2315e8c70a ] In the current boot, clients making use of the AB8500 sysctrl may be probed before the ab8500-sysctrl driver. This gives them -EINVAL, but should rather give -EPROBE_DEFER. Before this, the abx500 clock driver didn't probe properly, and as a result the codec driver in turn using the clocks did not probe properly. After this patch, everything probes properly. Also add OF compatible-string probing. This driver is all device tree, so let's just make a drive-by-fix of that as well. Signed-off-by: Linus Walleij Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/ab8500-sysctrl.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- 2.11.0 diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c index 207cc497958a..8062d37b4ba4 100644 --- a/drivers/mfd/ab8500-sysctrl.c +++ b/drivers/mfd/ab8500-sysctrl.c @@ -98,7 +98,7 @@ int ab8500_sysctrl_read(u16 reg, u8 *value) u8 bank; if (sysctrl_dev == NULL) - return -EINVAL; + return -EPROBE_DEFER; bank = (reg >> 8); if (!valid_bank(bank)) @@ -114,11 +114,13 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value) u8 bank; if (sysctrl_dev == NULL) - return -EINVAL; + return -EPROBE_DEFER; bank = (reg >> 8); - if (!valid_bank(bank)) + if (!valid_bank(bank)) { + pr_err("invalid bank\n"); return -EINVAL; + } return abx500_mask_and_set_register_interruptible(sysctrl_dev, bank, (u8)(reg & 0xFF), mask, value); @@ -145,9 +147,15 @@ static int ab8500_sysctrl_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id ab8500_sysctrl_match[] = { + { .compatible = "stericsson,ab8500-sysctrl", }, + {} +}; + static struct platform_driver ab8500_sysctrl_driver = { .driver = { .name = "ab8500-sysctrl", + .of_match_table = ab8500_sysctrl_match, }, .probe = ab8500_sysctrl_probe, .remove = ab8500_sysctrl_remove,