From patchwork Mon Jan 6 18:58:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1218395 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tzVb/3I8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s4Yc51ftz9sPn for ; Tue, 7 Jan 2020 05:59:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727095AbgAFS7L (ORCPT ); Mon, 6 Jan 2020 13:59:11 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38536 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726891AbgAFS7H (ORCPT ); Mon, 6 Jan 2020 13:59:07 -0500 Received: by mail-pg1-f196.google.com with SMTP id a33so27272922pgm.5; Mon, 06 Jan 2020 10:59:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4kYkD+SUb7SbLPsbfnAVbKbyKDhqQnUCO7FuiijcfY4=; b=tzVb/3I8/4CKtN89hxjhvBviIKQciFr5Nbvt5jKget7U88m5ALpXQHLzLHamwK0Fiv MCMcKa21Txo5421c004jHlNdEZEZyZpSVxuw1BcFLUW9QlIrcxaB1qyQXz+Tg12qVhYP 1m7IT2WPLTgFQiXvLIf3jLseKVcDwIxBGjRIvkRIabXko3ulMYWo12QjtE3/xGC/2XnP 89uus8pEKfPIOk6A2K5iA7sf2iCJjJhP3vRMxfAbAh/bvl4Q9POCPEboqHWj0G+6V5m6 7j6UWzqRrYo8NtaJfb5awREZZ1f9p4+eSyd26zeIsMWL9irp5cH7IH6uMHUikA+Im0sY i3gQ== 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:in-reply-to :references; bh=4kYkD+SUb7SbLPsbfnAVbKbyKDhqQnUCO7FuiijcfY4=; b=OjKluz/Gb57uRAnBfWciatpfc0U2XKnM2HKjCnR0NN4sSi85FASa3oIgkekrORaowX CysMgwxwIaX6fV8ybsVrX4B3Bbd4QjuJvzrRtshN7Bwwc1LstgU14rp1x1CfWOvWdjVK pKqmIfLXMJJO2tvIPs6tZ+bk5jiqyuEjCeCNqsuXNdqySCg88j0l4hGlsQ3TqvJU0mu+ lQimIQVFpYjy7ToFh1JmcuPAGKhcY2xPpQe18FKRxXOOZ16feHXdBS+7nTx8LzRWu0IL vwAv8G0wh2G5tvhPfT+n2o+YOh69pQ6d++xK7ku5ZTZmYJhunIEztdvuGqNE7khrx+Jn 1zXg== X-Gm-Message-State: APjAAAVFKSxHN923KfUoekZQ8ogOHl2flQ47/WWxz/hebAxd07ChniR8 7vUGaYsjPcTdkX+rBCdTP7zN3mZo X-Google-Smtp-Source: APXvYqxPIhl0ekNXmxt/C80Lcr2AjjH07VjcWRE3VsTBU6VK2yv2D8+qucCRMZqokgfSQS17GW4coQ== X-Received: by 2002:a62:cece:: with SMTP id y197mr113645300pfg.9.1578337146668; Mon, 06 Jan 2020 10:59:06 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id 18sm71758718pfj.3.2020.01.06.10.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 10:59:06 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Jens Axboe , Rob Herring , Mark Rutland , Hans de Goede , Philipp Zabel , Tejun Heo , Jaedon Shin , linux-ide@vger.kernel.org (open list:LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS) Subject: [PATCH 2/2] ata: ahci_brcm: BCM7216 reset is self de-asserting Date: Mon, 6 Jan 2020 10:58:57 -0800 Message-Id: <20200106185857.11128-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200106185857.11128-1-f.fainelli@gmail.com> References: <20200106185857.11128-1-f.fainelli@gmail.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org The BCM7216 reset controller line is self-deasserting, unlike other platforms, so make use of reset_control_reset() instead of reset_control_deassert(). Signed-off-by: Florian Fainelli --- drivers/ata/ahci_brcm.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c index c3137ec9fb1c..5c9fcdb8df96 100644 --- a/drivers/ata/ahci_brcm.c +++ b/drivers/ata/ahci_brcm.c @@ -363,8 +363,12 @@ static int brcm_ahci_resume(struct device *dev) struct brcm_ahci_priv *priv = hpriv->plat_data; int ret = 0; - if (!IS_ERR_OR_NULL(priv->rcdev)) - ret = reset_control_deassert(priv->rcdev); + if (!IS_ERR_OR_NULL(priv->rcdev)) { + if (priv->version == BRCM_SATA_BCM7216) + ret = reset_control_reset(priv->rcdev); + else + ret = reset_control_deassert(priv->rcdev); + } if (ret) return ret; @@ -475,8 +479,12 @@ static int brcm_ahci_probe(struct platform_device *pdev) } priv->rcdev = devm_reset_control_get(&pdev->dev, reset_name); - if (!IS_ERR_OR_NULL(priv->rcdev)) - reset_control_deassert(priv->rcdev); + if (!IS_ERR_OR_NULL(priv->rcdev)) { + if (priv->version == BRCM_SATA_BCM7216) + reset_control_reset(priv->rcdev); + else + reset_control_deassert(priv->rcdev); + } ret = ahci_platform_enable_clks(hpriv); if (ret)