From patchwork Thu Aug 30 19:01:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582703 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00D8D13AC for ; Thu, 30 Aug 2018 19:05:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E55DD2C250 for ; Thu, 30 Aug 2018 19:05:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D93EC2C404; Thu, 30 Aug 2018 19:05:01 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6518E2C40A for ; Thu, 30 Aug 2018 19:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8Vyd0Pxy3YhdmWVtxSWXAKQjNZf5ovNhgG4+xlAW6lM=; b=T+Dsly+FFQTBGf44BVpIhQs9lo Gq+ErK3XNfUgtON4fkZuCPbFR6JXorTTbd+cL3K3l3o1vi7hjXbOU4EmVJxKFRzepTVotQNjiVp/f xErPIefJuXlz4IabUNEfj07vuXCJ6IWIUCGp0YJDiY+ng0h1eVnnHdkOCjhWCKVNI8Q1waFGxgvVu 5xQb5K61vpG3dZPzNcpHPPDQZGQNUTQHTTe/66nccNL+nBZbn80Ru79RJ1n19PFRoPOiBTnGDZY0G UvTAqp7fTSXSgNPziqAj0S2BtFpEjP+/KzWLO4ldASEu3NWtoqs/027HP1w/EVVXZf2NEQVcngOiT OJMvBxpg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSFQ-0003XE-LF; Thu, 30 Aug 2018 19:04:52 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCN-0001k9-Hy for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:02:07 +0000 Received: by mail-wm0-x244.google.com with SMTP id s12-v6so2998720wmc.0 for ; Thu, 30 Aug 2018 12:01:32 -0700 (PDT) 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=k6iCbW8J+KgHVaSl644rAO8j84rXqhGHUryoNJ+DbzA=; b=fubLOn3Kg3eBkI2XnydjEzDLAle1z7QmrP+9bU5aYuE3KmiHF3pP0dvRvZdHe3w1sh 8bpdl7fCulAbIX5DMD01i8LoWKyYmYJPXWZ/ZR+RGelz6SMps8GFfKE/eSM8php6clJl iBtVhBFXDqfzafEONPqgQRlzwlXARd3297VXecs4JggJMs91Xndbs5aDLTzh5GV2ajDp q1oyEPaCDBi1Kul5wGr8aQWRkQUPWOh8fM6ZcnHFW0gq0ayrnqk4hs27oR0sXdzV4xeH f+LUno5MHljvWtihgn9bAwZ/mf8E8dc9tl+58mTS202pMcC/N9+Miq10DTyOw79wP3tp 7POQ== 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=k6iCbW8J+KgHVaSl644rAO8j84rXqhGHUryoNJ+DbzA=; b=g+L+ezImeyt1dOPlEQP+F6NQRuoGZDkJKl1594Rh0JcTQzKPJ2yk+Me1U3A/laeaaY YSW8RTzZpIKMUEYdo0RWVRF1VmdMwYg0VwmMPyd9C60aXJSFbhnyw29z3ABMAEQET5TN 4vO7bFH2PvELIC/Rm7/QQUOf1jx/zfUxkAIiHvOZCYTXGZCvJ8C2+miMbEDL7BeufAVZ 2Yb5DCsKG0Zs5ZVAb57NZXJCszRrWRFAik5U0fJ0sEjHchqFRBoc05IrP5nALondNrln VbLrAsfXCrVUtwdSInKcRbA+UcjbDhavodlxmO7Kx9NNH7RkCURr/lKyTvVENdSQQWUQ gbdA== X-Gm-Message-State: APzg51Bt5/uL6usQk5bboHxmcNMfxlQWvq322SE2YdaKxacid74zC6yO Cf/iCohVs7pnxP+CKbMg5ro= X-Google-Smtp-Source: ANB0VdbtZTB+/Dr2RzC4ZnRmfxLvuGKtiigCJh7ajuLdogWVY1RUZp+N6dGnIXqCbcLBV8cmp7Vqmw== X-Received: by 2002:a1c:8145:: with SMTP id c66-v6mr2749219wmd.139.1535655689957; Thu, 30 Aug 2018 12:01:29 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:29 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 01/13] dt-bindings: ata: ahci-platform: fix indentation of target-supply Date: Thu, 30 Aug 2018 21:01:08 +0200 Message-Id: <20180830190120.722-2-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_120143_681936_67BC12E9 X-CRM114-Status: GOOD ( 13.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fix the indentation of target-supply's ':'. Signed-off-by: Corentin Labbe --- Documentation/devicetree/bindings/ata/ahci-platform.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt index 5d5bd456d9d9..b88820b4c01e 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -47,7 +47,7 @@ Sub-nodes required properties: - reg : the port number And at least one of the following properties: - phys : reference to the SATA PHY node -- target-supply : regulator for SATA target power +- target-supply : regulator for SATA target power Examples: sata@ffe08000 { From patchwork Thu Aug 30 19:01:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582723 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6C9EF14BD for ; Thu, 30 Aug 2018 19:14:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C18628726 for ; Thu, 30 Aug 2018 19:14:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E11C2C453; Thu, 30 Aug 2018 19:14:11 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EC4F428726 for ; Thu, 30 Aug 2018 19:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=TIP5RejUcvXXBSt3+PAt52Ykhoi1X4JBli+2a3xeEoM=; b=BFv1GuWuoGVRa2DbzoqRCUxWx5 OVM19LKh5+3PpfaXgMF199OetFfB70sVnJkaf2IUxTmxuffnY/DT4ajI3LnsrlOace/INf6n8n++F vOVxLNEKTFGBtmh9tSDwbrarRczCUvpLs+MuI2O2Fr889xQNwffaAiuDYhNTOdmMlY9zjH+D5Cyb+ 6UkTufIpIZo2TqW+MhzMzCrgYQgHEzk132wl3Aylf8uH1hJBBe5OkQ1A0ciqNjyBpSmCWHyKuTjK1 R6W+fBAVsNFuRrraAT3ZWOge5/N54AdgYNwu29Mcya4ouyvFiyVvijKfTP66S3mos+/K2v1NhA0yK BCyawJww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSOH-0000z2-HF; Thu, 30 Aug 2018 19:14:01 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSKn-0006KM-GL for linux-arm-kernel@bombadil.infradead.org; Thu, 30 Aug 2018 19:10:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=t7Yy96h1CNLQsmpPB+gBtt+3MwMJX3o+4LyGaKYq94s=; b=BpZ2q8WLfAbe0NCXDqbC/TFq6 qIG3FGExZX/P7BlT2ZxZoFV1tlvMUr00w1CipvVZ/6q8xVSJ+F1okjZTxK5fPn4QiQ122zegeg1+N ofZI3GqB0NTHex+Qk2/MBAtUDNtKTkShwpcdxuscw3VzQWmAK7m9clEQCFkoAI2d5T6+pw2jwUZU0 IZH8oI19Bsd1wXvD1YzntwBbJSQzL1ITwaRaEOTtUhga1FPBohAd8/VeC/xxFu1p1VigYcrV8IWsH M8vjXJyqk5SwC5AeuKaqbYiY24rRitPWf/gZR3HR98OZC1qY6NAdARHkOoxMZm3h5IDMuSpFNMFq3 u06du8UEg==; Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCN-0000IX-P1 for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:01:45 +0000 Received: by mail-wm0-x242.google.com with SMTP id o18-v6so3084849wmc.0 for ; Thu, 30 Aug 2018 12:01:33 -0700 (PDT) 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=t7Yy96h1CNLQsmpPB+gBtt+3MwMJX3o+4LyGaKYq94s=; b=Ovh2DSFQ3Cs6oLBB67ht6cSz4HYmGF8Wha89mOyuDPXkA1DktCSvtOe9hN5rJM0COS BqdbmOs3DP96TKpkimSVj+KN7d2D3YrtcPABUwXb7VS+YIshG7m0D0X9qlXfWUE5WPzQ fumVRD+JDD/7qTg9FPB+lWDdNyQSuT2/aERQEzH34edKn8K+oLj+6uX49dMym8abrtMS 5auJyHSU4SL8rfQCcfSL/B77phx64zqXzdkX+1ZlG5PSW+jGUVvUSOAiG9/QcA2gNIlQ 4cfntFdChWp7ZXQNx0uxZIJQoWDez6a8xLhtUG6/YweucdqC+/Gp+iLOg7i2Vr2fkqKp 7FCA== 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=t7Yy96h1CNLQsmpPB+gBtt+3MwMJX3o+4LyGaKYq94s=; b=dlEdcAxeSziZkpcvzF7JUyAoQEXNzvNVmOce58JdSRXkGnFMWW9Vnehbz8Q+A1kaos JxdOIZDE60jXONxaY58HWwDxLVf3d1OOoRSQeOG8mMZ5NTuTVC12UO+mH1u5GNJI23g+ 5R0u1rOTvP2mF+2jMPMqtWgGYERL6pyJsx/4I4z4akAxuVJ2zzw1oXBOL181+leT+WMp ehXdbgViXMFxAiGNR3fvskO7ff1ak9SXoKqt7SJvjLxuaYPzfNWmw7PKZeXc2OgtJSRH VmRlKcpUIRBMsQ57a3wvUjElUUPMNuXiGzdciHXRnLrhIP+8zwPhEuoodynB+dh+h9AZ TXZg== X-Gm-Message-State: APzg51DmTboQqsKqryec4wafquH6hajxGEHODac10bhJDEFsyghJ1dhY k3KFLrn9wML+vOwBAynLJKvQhShh X-Google-Smtp-Source: ANB0Vdb6vrLVv1tUQqsKvf3EK6v9rGI3K/xY72jlBe/Kj2psPEnGdHTISywO0PI3hRnsWYx3Asqzew== X-Received: by 2002:a1c:908b:: with SMTP id s133-v6mr2706797wmd.69.1535655691915; Thu, 30 Aug 2018 12:01:31 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:30 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 02/13] ata: ahci_platform: add support for AHCI controller regulator Date: Thu, 30 Aug 2018 21:01:09 +0200 Message-Id: <20180830190120.722-3-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_200143_812199_FCDC67B6 X-CRM114-Status: GOOD ( 24.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The SoC R40 AHCI controller need a regulator to work. So this patch add a way to add an optional regulator on AHCI controller. Signed-off-by: Corentin Labbe --- drivers/ata/ahci.h | 1 + drivers/ata/libahci_platform.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 6a1515f0da40..1415f1012de5 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -352,6 +352,7 @@ struct ahci_host_priv { struct clk *clks[AHCI_MAX_CLKS]; /* Optional */ struct reset_control *rsts; /* Optional */ struct regulator **target_pwrs; /* Optional */ + struct regulator *ahci_regulator;/* Optional */ /* * If platform uses PHYs. There is a 1:1 relation between the port number and * the PHY position in this array. diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index c92c10d55374..a886b61476a3 100644 --- a/drivers/ata/libahci_platform.c +++ b/drivers/ata/libahci_platform.c @@ -139,7 +139,7 @@ EXPORT_SYMBOL_GPL(ahci_platform_disable_clks); * ahci_platform_enable_regulators - Enable regulators * @hpriv: host private area to store config values * - * This function enables all the regulators found in + * This function enables all the regulators found in controller and * hpriv->target_pwrs, if any. If a regulator fails to be enabled, it * disables all the regulators already enabled in reverse order and * returns an error. @@ -151,6 +151,12 @@ int ahci_platform_enable_regulators(struct ahci_host_priv *hpriv) { int rc, i; + if (hpriv->ahci_regulator) { + rc = regulator_enable(hpriv->ahci_regulator); + if (rc) + return rc; + } + for (i = 0; i < hpriv->nports; i++) { if (!hpriv->target_pwrs[i]) continue; @@ -167,6 +173,8 @@ int ahci_platform_enable_regulators(struct ahci_host_priv *hpriv) if (hpriv->target_pwrs[i]) regulator_disable(hpriv->target_pwrs[i]); + if (hpriv->ahci_regulator) + regulator_disable(hpriv->ahci_regulator); return rc; } EXPORT_SYMBOL_GPL(ahci_platform_enable_regulators); @@ -175,7 +183,8 @@ EXPORT_SYMBOL_GPL(ahci_platform_enable_regulators); * ahci_platform_disable_regulators - Disable regulators * @hpriv: host private area to store config values * - * This function disables all regulators found in hpriv->target_pwrs. + * This function disables all regulators found in hpriv->target_pwrs and + * AHCI controller. */ void ahci_platform_disable_regulators(struct ahci_host_priv *hpriv) { @@ -186,6 +195,9 @@ void ahci_platform_disable_regulators(struct ahci_host_priv *hpriv) continue; regulator_disable(hpriv->target_pwrs[i]); } + + if (hpriv->ahci_regulator) + regulator_disable(hpriv->ahci_regulator); } EXPORT_SYMBOL_GPL(ahci_platform_disable_regulators); /** @@ -351,6 +363,7 @@ static int ahci_platform_get_regulator(struct ahci_host_priv *hpriv, u32 port, * * 1) mmio registers (IORESOURCE_MEM 0, mandatory) * 2) regulator for controlling the targets power (optional) + * regulator for controlling the AHCI controller (optional) * 3) 0 - AHCI_MAX_CLKS clocks, as specified in the devs devicetree node, * or for non devicetree enabled platforms a single clock * 4) resets, if flags has AHCI_PLATFORM_GET_RESETS (optional) @@ -408,6 +421,15 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, hpriv->clks[i] = clk; } + hpriv->ahci_regulator = devm_regulator_get_optional(dev, "ahci"); + if (IS_ERR(hpriv->ahci_regulator)) { + rc = PTR_ERR(hpriv->ahci_regulator); + if (rc == -EPROBE_DEFER) + goto err_out; + rc = 0; + hpriv->ahci_regulator = NULL; + } + if (flags & AHCI_PLATFORM_GET_RESETS) { hpriv->rsts = devm_reset_control_array_get_optional_shared(dev); if (IS_ERR(hpriv->rsts)) { From patchwork Thu Aug 30 19:01:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582699 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6525B13AC for ; Thu, 30 Aug 2018 19:03:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 464DA2C26E for ; Thu, 30 Aug 2018 19:03:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3800B2C3D5; Thu, 30 Aug 2018 19:03:36 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BC9522C26E for ; Thu, 30 Aug 2018 19:03:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=KUT7WohEVIEzdcHRxg6hmurWE3ji7Ahj7qIMhT8K3go=; b=LwQMUbyMlYbhnkblQZ0pYiCwbC jViVFXzaahXyiUp+KmqtVQvaPGPdha/2JPMLXuJ9+IdlTkjVcpjiyvVkVe8SIDCjfUFBH9SeUAkWJ r/rbJbHFnzHSFFelMqV4oK9uUQxXgxyqhR40uVQkA498pKpkl6gO6xcCunQ/YH4zBzMVrKrOcevOt z+p2Uo4FOZ3VyA2EU1B/96ye3Cpjf66/RcHvsXG4fPOLOwRlmfU9mjbLuNgorYdlAF097npJf+vmp eievvJi8hiMohl7x0SMVl5ZM/d91FQ+GkxGC0QcwfbEUa5M9Elb8Q68uEVN8qtCLAXVwm8GsXGb0r pe4iO/hg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSE2-0002R2-Gr; Thu, 30 Aug 2018 19:03:26 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCU-0001sJ-PY for linux-arm-kernel@bombadil.infradead.org; Thu, 30 Aug 2018 19:01:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=/+HNfr3I0MzGHGd7Aj3LN1rm33wfTbHxswxtDehlIDw=; b=GJ7j0myifzrzYEiI9agavr2te UvzWbGWTFpRd5m+Tv0lML99jvpp0QUXPI40o52N607MM9MEXpVwWp7BIoTcuQrr4pRC0pWLtSC3E4 0MErgxP2L53W67eTCFHyBNh6+/9I4mtC8OqThkNuZG2y4yQD5Hb+8CHvsIvz3PZx8xbPfMaw+ajzn 5TXlW26uFrOf1ilJ0uDLFaxCGnuAPSJVjmyxKoVqZUdCKM3Lvqu1tzBneE7XwyNOr+EnfKSisDxPG 2JnIhjMH7Xhc3I7hBEAfqCKqKTBvbxU3wwmtxh83mu00azQEJi+aVJ+LMhCupxp8UH9GRaCgNH+Bo RoeE+BwOA==; Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCR-0002cj-W6 for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:01:48 +0000 Received: by mail-wr1-x441.google.com with SMTP id z96-v6so9014946wrb.8 for ; Thu, 30 Aug 2018 12:01:35 -0700 (PDT) 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=/+HNfr3I0MzGHGd7Aj3LN1rm33wfTbHxswxtDehlIDw=; b=PThgoGAPiljUk94JizmwB6pajpMFObk5uy970nta1s1e70QjLBSghpncln7/h8OklD 7cFkrrNca7sHbPDLGTeA2yaALPF++Syt4fhIbxUuG8rol66lXMQ5FrBCtzjJaugUenFK 7VdHho6Z7Nqd28SbUJY/qVafGEC5amkUfipD77lY4EUw7NZXYr4X+cyPq2pUJ0fE6wIe 4nhl/lsQJtNEnnNgvNFvh7140iLwhKbKF0x09SM7QflYTL8dk1DPcVJYB0moE5LFDtE/ CSKAvOQyvDreFuCGEkmNtBgVAe+pYIjKMRe6UI9nNSCn+wC72DBQ0BmguzOT5cO8IA+P dVZQ== 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=/+HNfr3I0MzGHGd7Aj3LN1rm33wfTbHxswxtDehlIDw=; b=sPOZJ7o/c0D3FFxqMQvp4jKp4O1Y/xzhAEn3cpYZdiTbpf6WNqi9osSTsmAG6y2Xys YmObMHTc1/JS6jy1E1nAGy9Fme5pNVrW8hkECtHga2RtqgSjr6pMfQv+HbmwwVmK0GZ7 i+ffSzxitLizfubcI4BBRGf9x+PpVA230w3cNpQprUw1UYPOW0pu7M0B6XyMMBZreXuU X8y/OlDEOW3BlHI5KHy88Km2LG4BUwjLahjeTbskzNegn1cERHagwrIqW4l4R7pqv2GD BGBAG1QOdEsb3WGw8xepr5whhp0yxDjwDaLUo2eYmZ+0yTXtTo7cHNjlmPWysRkq8mOJ ohXw== X-Gm-Message-State: APzg51Ch+fTCF7tvkQV4sbE2vaAn+aIZ/oxPyHxc9OIQGqm8v9cHZeeU 3w9xXTQNvCEocr9E+CwHkGw= X-Google-Smtp-Source: ANB0VdaalCsRbYx/Q0GUikEdPntcQpegLLgk7pWIb70v2qIy7lkr8MQIPvRy+o1VDT1E4fhFUQlZgw== X-Received: by 2002:adf:fc44:: with SMTP id e4-v6mr8826662wrs.9.1535655693376; Thu, 30 Aug 2018 12:01:33 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:32 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 03/13] dt-bindings: ata: ahci-platform: document ahci-supply Date: Thu, 30 Aug 2018 21:01:10 +0200 Message-Id: <20180830190120.722-4-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_150148_050940_9584BAE9 X-CRM114-Status: GOOD ( 14.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch document the new optional ahci-supply. Signed-off-by: Corentin Labbe Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/ata/ahci-platform.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt index b88820b4c01e..f495774c8af9 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -33,6 +33,7 @@ Optional properties: - target-supply : regulator for SATA target power - phys : reference to the SATA PHY node - phy-names : must be "sata-phy" +- ahci-supply : regulator for AHCI controller - ports-implemented : Mask that indicates which ports that the HBA supports are available for software to use. Useful if PORTS_IMPL is not programmed by the BIOS, which is true with From patchwork Thu Aug 30 19:01:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582765 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4D37920 for ; Thu, 30 Aug 2018 19:53:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C184B2C390 for ; Thu, 30 Aug 2018 19:53:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B13072C39A; Thu, 30 Aug 2018 19:53: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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0681D2C390 for ; Thu, 30 Aug 2018 19:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=7nHBJKD8wFYiCGooQyWELq5m5FRoqHkLdaNj+nlJu9s=; b=U+Ht2ucHzISJ30AFfV9z8QuwDk 1g9OTOgboOpSA9xVtXq5HwygPE9XjG15R1S8bon34hxIByLEiNWKSdPwwbXfW+Q6vHdW3fjnWYUSX NjCDNVlCpHK3P4pFaRW5Q+h4UhJSTufPXoFfjPuyQfyJ3V9YxumDLCSDH8U7o+q7yOBQ88QTxdQ29 4l13WwnZm6yuX+qLJlOygAmslfKKah2mMIz37W3nxHvQbmLmW+mwwKHfm+VzgXjxpwOuN6605YHla h8o7LZhvJnnF9imfh9YORK6G61fZXTBb4iTk0gVtaH1W0EEjfl1pGJ6/8BqZ3CdgW+VNe0HDTQalS LEzEeYvg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvT0U-0000OC-47; Thu, 30 Aug 2018 19:53:30 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvT0P-0000D9-9K for linux-arm-kernel@bombadil.infradead.org; Thu, 30 Aug 2018 19:53:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=GPqWwkBc6SB1eOqyKrvhdVyUaIv1/LBWgMacY2beA4k=; b=COc27e7zlKbxA53ruqDxKnTTI hr86cluwQL65JvXyhqxN3QJjV7QPRLIeqcAaxyDd87WFegCu0ZBJcJxSGWYGewAnmq9xylZDOp18M Ahh0OhayFKF5z98ZgV5NnaqHzIHoZRWFVl29+1FCveN4/7IzMojc+adDrLiQKhPaPmNi1fKyGPmRz IHCY+HZ1GLg+WLE2u0gSt5oml3jomN0fTCwT9LoMOY2OX3tHHglDXkYUjueDci3BqlIflQphx2BRH luxw2QiE7g6Mq3XGNvsFBkmPUxx0Cfv3z4lQqt74hcoEBcuPIQ2MRxecU5tsTKHSxB+sLv6sj9b6h eyGvqHhXQ==; Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCT-0002co-Bi for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:01:50 +0000 Received: by mail-wr1-x444.google.com with SMTP id n2-v6so9012491wrw.7 for ; Thu, 30 Aug 2018 12:01:37 -0700 (PDT) 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=GPqWwkBc6SB1eOqyKrvhdVyUaIv1/LBWgMacY2beA4k=; b=e33jDqjBqltsU4Qoc+sIfGuHVCcABdY8ZzsqBVo0ibrabbz37R2KbdfbVs6EkQJxcf BilT0djIxAVsV3UDxyDCH+utaGetfODCTY+qQghW43uRBjQSzyoGBXplg16gDjbQL3sB 7KmmMcykRcJXIW5+7hSmZYQpzoG3JNBkt0iWscpuKzhnCP9Ur9e2+upntCbrvBPP/d8J NHdfpdtwJEuzam0M3HhcVLmdwa4nL5MMskzPDPnkSjJT6eQhtPbDSFRm5Oc2t64TR23c eWLfSfKrScQe/SnMuSVgRdFgp/W9972F5b3D3Wvxpp62H8DB9V8Yh5thlqXx5NHkIlIs 60fA== 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=GPqWwkBc6SB1eOqyKrvhdVyUaIv1/LBWgMacY2beA4k=; b=thd3mT/5/jJzJxDuyCmlS6BqTfZxoEinIb4wF2CxabdKMQ+b8zxVUIjww0tQ1aMUH8 tzlwBcPZzsNvHY9+FfSuS4B3Bm2hYGgsUR/pnHIBNjdvWORHDhj2PKOu+2scRtVxaXyZ AmExevtsRrkOyHfOBhg9CECKZPKQC+sQikvY40O4SvWDIJJYn9leSs02kCPkWy1z1AMV Df1VbihhZtzFLwtGnDvIsE4mK0p8dh8sooc87adTkN82F6XbXkzLd2ytHFV08obPlf4O YYawl47msG6EdF/yyVpbEbmwxfNCXhRW0Pma+RWBFoheK4qvM4+iuOT3ZutAaLpCSFSU mZNg== X-Gm-Message-State: APzg51DoFQSR+fLXi5mSGBRPHQ+IHUnRlDq3/rWw5jEZ8KV3nMeuPl38 FariI8o0X6/g6DR8DDBqGkE= X-Google-Smtp-Source: ANB0VdYT4x2g3AeQRnQmTGXZDf/QiZ5rwEPb0SVHiGbNM2J85VDF3a7lWls4/EV8GeX2mtPm2aZHtg== X-Received: by 2002:a5d:6aca:: with SMTP id u10-v6mr8746074wrw.44.1535655695118; Thu, 30 Aug 2018 12:01:35 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:34 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 04/13] phy: Add sun4i-a10-phy-sata driver Date: Thu, 30 Aug 2018 21:01:11 +0200 Message-Id: <20180830190120.722-5-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_150149_435188_C2106EE2 X-CRM114-Status: GOOD ( 25.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch create a PHY SATA driver for allwinner SoC A10/A20/R40. The code is taken from drivers/ata/ahci_sunxi.c but cannot be removed from it yet, since we need to finish the transition to new binding with the PHY usage. Signed-off-by: Corentin Labbe --- drivers/phy/allwinner/Kconfig | 7 ++ drivers/phy/allwinner/Makefile | 1 + drivers/phy/allwinner/phy-sun4i-sata.c | 208 +++++++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+) create mode 100644 drivers/phy/allwinner/phy-sun4i-sata.c diff --git a/drivers/phy/allwinner/Kconfig b/drivers/phy/allwinner/Kconfig index cdc1e745ba47..ef6fa389389a 100644 --- a/drivers/phy/allwinner/Kconfig +++ b/drivers/phy/allwinner/Kconfig @@ -1,6 +1,13 @@ # # Phy drivers for Allwinner platforms # +config PHY_SUN4I_SATA + tristate "Allwinner sunxi SoC SATA PHY driver" + depends on ARCH_SUNXI && HAS_IOMEM && OF + select GENERIC_PHY + help + Enable this to support the SATA PHY present on A10/A20/R40. + config PHY_SUN4I_USB tristate "Allwinner sunxi SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF diff --git a/drivers/phy/allwinner/Makefile b/drivers/phy/allwinner/Makefile index 8605529c01a1..73ef882edb53 100644 --- a/drivers/phy/allwinner/Makefile +++ b/drivers/phy/allwinner/Makefile @@ -1,2 +1,3 @@ +obj-$(CONFIG_PHY_SUN4I_SATA) += phy-sun4i-sata.o obj-$(CONFIG_PHY_SUN4I_USB) += phy-sun4i-usb.o obj-$(CONFIG_PHY_SUN9I_USB) += phy-sun9i-usb.o diff --git a/drivers/phy/allwinner/phy-sun4i-sata.c b/drivers/phy/allwinner/phy-sun4i-sata.c new file mode 100644 index 000000000000..93e29f99d26c --- /dev/null +++ b/drivers/phy/allwinner/phy-sun4i-sata.c @@ -0,0 +1,208 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Allwinner sun4i SATA phy driver + * Copyright (C) 2018 Corentin Labbe + * + * PHY init code taken from drivers/ahci/ahci_sunxi.c + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define AHCI_PHYCS0R 0x0000 +#define AHCI_PHYCS1R 0x0004 +#define AHCI_PHYCS2R 0x0008 +#define AHCI_TIMER1MS 0x0020 +#define AHCI_GPARAM1R 0x0028 +#define AHCI_GPARAM2R 0x002c +#define AHCI_PPARAMR 0x0030 +#define AHCI_TESTR 0x0034 +#define AHCI_VERSIONR 0x0038 +#define AHCI_IDR 0x003c +#define AHCI_RWCR 0x003c +#define AHCI_P0DMACR 0x00b0 +#define AHCI_P0PHYCR 0x00b8 +#define AHCI_P0PHYSR 0x00bc + +struct sun4i_sata_phy_data { + struct phy *phy; + struct device *dev; + void __iomem *base; +}; + +static void sunxi_clrbits(void __iomem *reg, u32 clr_val) +{ + u32 reg_val; + + reg_val = readl(reg); + reg_val &= ~(clr_val); + writel(reg_val, reg); +} + +static void sunxi_setbits(void __iomem *reg, u32 set_val) +{ + u32 reg_val; + + reg_val = readl(reg); + reg_val |= set_val; + writel(reg_val, reg); +} + +static void sunxi_clrsetbits(void __iomem *reg, u32 clr_val, u32 set_val) +{ + u32 reg_val; + + reg_val = readl(reg); + reg_val &= ~(clr_val); + reg_val |= set_val; + writel(reg_val, reg); +} + +static u32 sunxi_getbits(void __iomem *reg, u8 mask, u8 shift) +{ + return (readl(reg) >> shift) & mask; +} + +static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base) +{ + u32 reg_val; + int timeout; + + /* This magic is from the original code */ + writel(0, reg_base + AHCI_RWCR); + msleep(5); + + sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(19)); + sunxi_clrsetbits(reg_base + AHCI_PHYCS0R, (0x7 << 24), + (0x5 << 24) | BIT(23) | BIT(18)); + sunxi_clrsetbits(reg_base + AHCI_PHYCS1R, + (0x3 << 16) | (0x1f << 8) | (0x3 << 6), + (0x2 << 16) | (0x6 << 8) | (0x2 << 6)); + sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(28) | BIT(15)); + sunxi_clrbits(reg_base + AHCI_PHYCS1R, BIT(19)); + sunxi_clrsetbits(reg_base + AHCI_PHYCS0R, (0x7 << 20), (0x3 << 20)); + sunxi_clrsetbits(reg_base + AHCI_PHYCS2R, (0x1f << 5), (0x19 << 5)); + msleep(5); + + sunxi_setbits(reg_base + AHCI_PHYCS0R, (0x1 << 19)); + + timeout = 250; /* Power up takes aprox 50 us */ + do { + reg_val = sunxi_getbits(reg_base + AHCI_PHYCS0R, 0x7, 28); + if (reg_val == 0x02) + break; + + if (--timeout == 0) { + dev_err(dev, "PHY power up failed.\n"); + return -EIO; + } + udelay(1); + } while (1); + + sunxi_setbits(reg_base + AHCI_PHYCS2R, (0x1 << 24)); + + timeout = 100; /* Calibration takes aprox 10 us */ + do { + reg_val = sunxi_getbits(reg_base + AHCI_PHYCS2R, 0x1, 24); + if (reg_val == 0x00) + break; + + if (--timeout == 0) { + dev_err(dev, "PHY calibration failed.\n"); + return -EIO; + } + udelay(1); + } while (1); + + msleep(15); + + writel(0x7, reg_base + AHCI_RWCR); + + return 0; +} + +static int sun4i_sata_phy_power_on(struct phy *_phy) +{ + struct sun4i_sata_phy_data *data = phy_get_drvdata(_phy); + + dev_info(data->dev, "%s\n", __func__); + return ahci_sunxi_phy_init(data->dev, data->base); +} + +static const struct phy_ops sun4i_sata_phy_ops = { + .power_on = sun4i_sata_phy_power_on, + .owner = THIS_MODULE, +}; + +static int sun4i_sata_phy_remove(struct platform_device *pdev) +{ + return 0; +} + +static int sun4i_sata_phy_probe(struct platform_device *pdev) +{ + struct sun4i_sata_phy_data *data; + struct device *dev = &pdev->dev; + struct phy_provider *phy_provider; + struct resource *res; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -EINVAL; + + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + dev_set_drvdata(dev, data); + data->dev = dev; + + data->base = devm_ioremap(dev, res->start, resource_size(res)); + if (!data->base) + return -ENOMEM; + + data->phy = devm_phy_create(dev, NULL, &sun4i_sata_phy_ops); + if (IS_ERR(data->phy)) { + dev_err(dev, "failed to create PHY\n"); + return PTR_ERR(data->phy); + } + phy_set_drvdata(data->phy, data); + + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); + if (IS_ERR(phy_provider)) + return PTR_ERR(phy_provider); + + dev_info(dev, "successfully loaded\n"); + + return 0; +} + +static const struct of_device_id sun4i_sata_phy_of_match[] = { + { .compatible = "allwinner,sun4i-a10-sata-phy", }, + { .compatible = "allwinner,sun8i-r40-sata-phy", }, + { }, +}; +MODULE_DEVICE_TABLE(of, sun4i_sata_phy_of_match); + +static struct platform_driver sun4i_sata_phy_driver = { + .probe = sun4i_sata_phy_probe, + .remove = sun4i_sata_phy_remove, + .driver = { + .of_match_table = sun4i_sata_phy_of_match, + .name = "sun4i-a10-sata-phy", + } +}; +module_platform_driver(sun4i_sata_phy_driver); + +MODULE_DESCRIPTION("sun4i SATA PHY driver"); +MODULE_AUTHOR("Corentin LABBE "); +MODULE_LICENSE("GPL v2"); From patchwork Thu Aug 30 19:01:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582717 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A4B913AC for ; Thu, 30 Aug 2018 19:12:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC60E2C435 for ; Thu, 30 Aug 2018 19:12:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE60F2C43E; Thu, 30 Aug 2018 19:12:02 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 529E12C435 for ; Thu, 30 Aug 2018 19:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=G8rS0nr6Oss+Lfl9AtWtZDFuSB4PsmKuKHUuLnXAjns=; b=WwhyTVz6GM95ueRsz0/VOOH41F aswrAydHff99BxDJHSQTDUNisUovDciwXHrtNNEXXUwN4UDciwTmgFDZDTq8mn89UAJw81I8ky5y1 wCJNXlS06uygF/vGQqZf+38PotBB5HhtiN4Igl/hnkRyIxPljSl0qRUnR/Nplmmbnd8NQVTbjtJ47 UyNY/d3akfTBwlsuSV1Tb+tI+htxer7bJor0yfgIavEKnDM2Pj4APHIq8vriuS8E7Z6yTVlMQIptd D841pHzC1dn4MdA7VZuk1a9WuzK7QENz+JZ6hZu0HP5Lujx40Ls0GOT7DVO2fjYpPpg1eMbOLuTZk et34Sr9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSM8-0008UV-5c; Thu, 30 Aug 2018 19:11:48 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSKk-0006OJ-PY for linux-arm-kernel@bombadil.infradead.org; Thu, 30 Aug 2018 19:10:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=sraoSY6qZjrZRIfeRh62DTHFySBoXzTSH2FTf7JXmOs=; b=PX1w2XGIUN4gfzF9yr3jb0sJs gS68z7Sg6YLRjOdvUITeue3H2FOhx1XRJzxdPmab1m2sME8NtHwKQpHxsg032NCICzxw+2+URnXVl HUpO1M3Kjj/tv0PETJRipiFtJQpA6qtsa5xfw4UjStPR5ifMFPcMzMu/EvLBTCyyhqhUmrItin4vl OY6/ZA39K+sijLi/y9yYxdCm7ffgV/vtlpMrtJ9bcW8AiiyQn2B+YtCmstkFE87So7+y9hzkPfMgC vWTha3UY5GnskpjxojQJfEWndB0S5D0O3/8UuP91tsUCfGPa6TMwjGpc0TyVr69a2fi4v0PEDLush 3GF1XOk2Q==; Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCS-0000JF-9G for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:01:49 +0000 Received: by mail-wr1-x444.google.com with SMTP id k5-v6so9005401wre.10 for ; Thu, 30 Aug 2018 12:01:38 -0700 (PDT) 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=sraoSY6qZjrZRIfeRh62DTHFySBoXzTSH2FTf7JXmOs=; b=W3gwxVG6IISFkXvk50OeRiiIKJA6zOn/hELmx9a7gjYunq70QBl9w6xb9/XbQDuTaI sTxImBCJZ7a7cOIOxQt3ApwJMphWPsnh+/SA44zC5g5TelXPhAjiOvg0vGPJ/VWuDyVm Ez3ennhJ9LOkawNrfmbHUKgcc0qmD7VPai4AInAhdt0sCj0LRLafCcoHna7se4SO8X6T 7REyZjl44Scu0fUKk25nmMW5v7Nuw/ccYotp83wb0abHc0xEHh3YoQkcuNK9Dp4dautw R+NgL700rFtUoh7w52ApupxdXqDCc8ziCynD81jIebVVOqku3yepzzPVkOYNZBzhm1vQ ZE7g== 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=sraoSY6qZjrZRIfeRh62DTHFySBoXzTSH2FTf7JXmOs=; b=SZbkGSxCTMW9Gv9jYRQp44fgadtlWaLGTEEKFbgjlxWXhegZewJ8JmjeXXByzTDIUI hmpUi07sRM9a8DUXLzXG5iH/+js6iKgLPFToCUFyBNBS5aYALUUjumJiIegyijunwlme rQiKQ5SHbQgSF5ZGbxl8INSbf8dQlwLicLK7IZBEU1K+EIHGvyOOI4lBZTMIu6pcxG9x +fx/pgBM5NFLaWLoZkC5KvXA9f0tviLW2ny/9090Wp/60hLdmvZXRVnNkY/pRhz+UZ4O eHKwiMrBVAtti4rVAcwrqZpBfu28J5vMvpYTwZo+v/+4kQyehQ7qi5JxquYhMBD7Ko5y HzUw== X-Gm-Message-State: APzg51DNAZadb9xh+9uVwse5yG0OGotudImeih6xI9w047Mz3kzneNNL gBPdKN7iH0/7frFJyJ4/rVw= X-Google-Smtp-Source: ANB0VdYq5m6QUBe0qXoMff/xa6xeZAMyVi3hjE5Bm4I9MaXpBsy3diZ+NRb/7qwi6Y5erix7EOZ3nw== X-Received: by 2002:a5d:6103:: with SMTP id v3-v6mr8719102wrt.265.1535655696549; Thu, 30 Aug 2018 12:01:36 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:35 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 05/13] dt-bindings: phy: document sun4i-a10-sata-phy Date: Thu, 30 Aug 2018 21:01:12 +0200 Message-Id: <20180830190120.722-6-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_200148_356965_4A1B6359 X-CRM114-Status: GOOD ( 15.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch document the sun4i-a10-sata-phy bindings. Signed-off-by: Corentin Labbe --- .../devicetree/bindings/phy/sun4i-sata-phy.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/sun4i-sata-phy.txt diff --git a/Documentation/devicetree/bindings/phy/sun4i-sata-phy.txt b/Documentation/devicetree/bindings/phy/sun4i-sata-phy.txt new file mode 100644 index 000000000000..f031542717c1 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/sun4i-sata-phy.txt @@ -0,0 +1,20 @@ +Allwinner sun4i SATA PHY +----------------------- + +Required properties: +- compatible : should be one of + * allwinner,sun4i-a10-sata-phy + * allwinner,sun8i-r40-sata-phy +- reg : a list of offset + length pairs +- #phy-cells : from the generic phy bindings, must be 0 + +Optional properties: +- phy-supply : from the generic phy bindings, a phandle to a regulator that + provides power to the PHY. + +Example: + sata_phy0: sata-phy@a01800 { + compatible = "allwinner,sun8i-r40-sata-phy"; + reg = <0x00a01800 0x4>; + #phy-cells = <0>; + }; From patchwork Thu Aug 30 19:01:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582705 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 986D413AC for ; Thu, 30 Aug 2018 19:05:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 860DE2C250 for ; Thu, 30 Aug 2018 19:05:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 778342C404; Thu, 30 Aug 2018 19:05:52 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 140182C250 for ; Thu, 30 Aug 2018 19:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=cm0tT8UoKYWo6xMV+jfFnwYnmPxHEtw7rEYV97SZz8Y=; b=RBv39Kwp68BHblvjz4GdSweQF9 RdCwph6yZm273YYZ2mtMjBzORszlO51esbxxXAjZoyL2/fHwCVRrq9AqLr8ne/0zdRahMf3WL77Df 6v5oupciJ8tlJb1HNcf1op8a7jy2gukRB2NhfYp8TODg3fQqTqxLXfbsjpmcKVfWHAJJQZIZuI15a PlC/1HyQGOSjy70yau4eep9OIJVcCNbjV0uivTcX28hJAEFHUhZFlDNKwdaU6UAFwvKlN1+h6NQpO KP43AzmIcNpOYDdf4bIFs9fIpGjDAkO/MCVyNMWQzmjxgRmFBeZkHklvjQuafK9QmP/LwRXSerZSV T5FqlC+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSGC-00052C-01; Thu, 30 Aug 2018 19:05:40 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCT-0001nW-Ub for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:02:10 +0000 Received: by mail-wr1-x441.google.com with SMTP id g33-v6so9039122wrd.1 for ; Thu, 30 Aug 2018 12:01:39 -0700 (PDT) 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=nCUvOR+CglPRSFcIRVKkyPtD7xDCE0J9tFyuoHtZ2Wc=; b=jUo/q3lBYvtwb49VFJf1fEWD56fDG6pi1fggtWxF1H58WqXQiec8vqxqK6EwpY2JRM naXFPqVAn+bu9OzpsJLzZxGYVHEI0JTtI1I+eSD7stUSFTlEhkhvVEddbKmDZ3IMFuf9 Ig/IxeWOmJWnHyXhv6jZdhqEmp+xb25kaGn+PqOLu5U8rvURudZDclAQ1SUQjGy069D0 Y0F9p14WxKq5qKwtV8dNDbfo8hZv5sK5qQ9rGQYlUVq7cYoxoxzp8AKmQ2SWslMzA31M hZojWGvS01Kvum0aAVVLoabiFzbqNqbbudJf28IRqqG2AW4ReUQ6KKcOza+YRKhxM8la 8lgw== 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=nCUvOR+CglPRSFcIRVKkyPtD7xDCE0J9tFyuoHtZ2Wc=; b=hbtYcTFBoWYG/2GPkEEwKwhC7xoGcKydlEd6zzMYVh6rTkN0Gja5YBW5MbWH9N43n0 SzZX1JNamphiLQQ3yf2kSm3tI1kIimAa8i6nSZWnwjkPrn4ul1zQ55D2fzPzsyJJB7ho /T9O/TuB8n0UoLAyeS53lE2YkONW7EcxqzANo8L1exsxQQ6ZTMnTw6nhGEElSoDQV5pr QHZ9E9gXwMEb/aiY+ud0PSomHfbpGjuBX37rv1hawoPVriJfw87ntiK2ZH9hPVnD8GzG BDtjo/TDLSD80u4RjSPOXie/7AxLKfwIeY+HNIJSDJgqaODlmwU41bVwctI+q115WuP1 e8nQ== X-Gm-Message-State: APzg51AvApFOSEqiJWu8E2zr4EYz44Qbqcq1O49LGUT1+cqE76G1IC0o urueEw/HxaAW6BwEhvtli4A= X-Google-Smtp-Source: ANB0VdZVFBQIDF4PNrNuD2s4+/LohiAX78RgmjttsDQ8W0DLQUYufhjzOI2rIWuKQbgjhe5fJCUoHg== X-Received: by 2002:a5d:488c:: with SMTP id g12-v6mr8636307wrq.0.1535655698019; Thu, 30 Aug 2018 12:01:38 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:37 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 06/13] dt-bindings: ata: update ahci_sunxi bindings Date: Thu, 30 Aug 2018 21:01:13 +0200 Message-Id: <20180830190120.722-7-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_120150_006881_B54F081C X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since phy code is moved from ahci_sunxi to a dedicated driver, the binding need to be updated with the new phy node requirement. Signed-off-by: Corentin Labbe --- Documentation/devicetree/bindings/ata/ahci-platform.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt index f495774c8af9..aa6f4c745097 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -50,6 +50,14 @@ And at least one of the following properties: - phys : reference to the SATA PHY node - target-supply : regulator for SATA target power +Required properties for: +* allwinner,sun4i-a10-ahci +* allwinner,sun8i-r40-ahci +A port sub-node must be present and linked to a sata_phy. + +Required properties for allwinner,sun8i-r40-ahci +The reset and ahci-supply properties must be present. + Examples: sata@ffe08000 { compatible = "snps,spear-ahci"; From patchwork Thu Aug 30 19:01:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582721 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0CC4F13AC for ; Thu, 30 Aug 2018 19:13:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0D1628726 for ; Thu, 30 Aug 2018 19:13:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E40F22C453; Thu, 30 Aug 2018 19:13:34 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 81A6228726 for ; Thu, 30 Aug 2018 19:13:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=EEcOFxWoQD0SnKYX9s24h6JBmdYKMNtAdBautU5XsEY=; b=qbjYkchibrRc87RNpABkOGRs38 EaO4jO0pn4zPPObwdtWngRmQAzE3Msfg+QWkaaTi/z6roe0th92FftzDYs7dm17h23KG9n2NZHSTK mC8VXxdFVg/r06j1quVt0zHbz85DCff8SyAGmALfMpXuNodf0265QzUlPIQqq+XsZ1ZbkEnm2DvQC 46may1Za3B6iVzSjL24BMamo7V3pSHaC5XN7awsbuPhXP2vvQ9npLR4Evg7QwKpfzX8kCIYnJ6edT WrNEklf7pS4N/KE8UFy9oZsc7GWepK2JitVeeF1Z43VOwq6eSBOrFQhmmzi+djiGxkcz1FfP+bXjH emIOAgEw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSNe-0000gf-6A; Thu, 30 Aug 2018 19:13:22 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSKk-0006KM-5Y for linux-arm-kernel@bombadil.infradead.org; Thu, 30 Aug 2018 19:10:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=I+V9O+J09+ESFMr1dY4PF7vqVL3mWhx37+fApLNutyc=; b=Q1w84XFd+WaNNhDPUGh3FLMT4 /m5n5/oBgNPYwX1v4PX0AbldDNM9jCj4K1hTzRdOnHUlIS3a/wpLMvGdRRGuZ8xMVZYdRagQdYJKN P540gNFsJz5uVMYHg2F0Z+aB47ydefyXFYmUxdk38IzihxdskXKK9B9Qu+e84gUme4sdT8X8PQ4rn 708d+x4c8TK+Z9P8+kXJXGlVXWwc1BqI8GY8rsxlgwvMWT8bOLp0jTfg7Z+PHNgvOmBgy3m55n8eB gn3+J0eJrDBzXQh6RuWT7DQ91nY2wi1P9T7uNrt9ajSJGudvonAT/PsVh496Busap9A4PATP/LiRL UaQaD/iRQ==; Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCU-0000Jo-Ha for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:01:52 +0000 Received: by mail-wr1-x443.google.com with SMTP id 20-v6so9000118wrb.12 for ; Thu, 30 Aug 2018 12:01:40 -0700 (PDT) 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=I+V9O+J09+ESFMr1dY4PF7vqVL3mWhx37+fApLNutyc=; b=fx03mtGoum4+HwhhL/qhLqWiMq2R3CtQ7TeNNIDZbgOClIfZjN6In/lQFO4q8v2Dx4 jHy+JTHn1DcGr0fkWTXr1AtZdxhgPOuZItd66P/9T8rrft3xH6RDlLBGnCeq5g6Cu5NU jI9MbHnAXSTK9CLI72ms/8qk/Mw/DhfqGJPjUoR5uNew2tHoL5kcKNBUXuC3m0O2M8yQ 4QrvnQMWRONF2vI11Ngv+i/1LoF7+Q+koYCS6KJvc2lTENxT2ubMwnBoJyjL3qYkrSvb Cwzxz34Q0Sndhb1djxVkEDfU9qCmQIx7EIm1PVqZ37KUWL+tULALWe5pVAEuWsyzezXl uXkw== 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=I+V9O+J09+ESFMr1dY4PF7vqVL3mWhx37+fApLNutyc=; b=ZANNaPOtOaSo8ZyaM26K2IAU3Ko56f/E20lySgAHyLou27NBNogPA9hqPBcl84E22X d90eUrempoPih4xbg8BSUpT4BZN1P8SMG2H848jlItXYHWszNmCAwfprAby61/M5ATE9 biiUeIjLkZq7By1TkzxjqGwWidmI8E1zXy2gDT7aAVMRpGbqvsnP5j63VXXXMmGh11iL S6S3l/A2jGesnT3/1d5pEs5/0UBq9AsZSGOrSnWK/mlwkD3hhpdMJGcQzARynrC2MrFI ard/qo3K5tqmtEpvtOzEo5OZvUMZAvpLNMf6EuZR4ivEG4oNr1MlurdtWM/CFz7Sq6Hs MJ8w== X-Gm-Message-State: APzg51AgHzRXMZcE7TQmqZu/yStBcCDwiDQUWBRA+qZoiSm89r2l4g09 PVwx+4lGlxuosqfa/TbOqA0= X-Google-Smtp-Source: ANB0VdYy02/TiJd1eUIVRP4PxJdOxSOUfmya8Rk5fScvfNvg6tGJ5IwdWX2GOCkGyH+D4ibJw67fdg== X-Received: by 2002:adf:f24e:: with SMTP id b14-v6mr7929996wrp.184.1535655699445; Thu, 30 Aug 2018 12:01:39 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:38 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 07/13] ata: ahci_sunxi: Bypass PHY init when using the new binding Date: Thu, 30 Aug 2018 21:01:14 +0200 Message-Id: <20180830190120.722-8-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_200150_576930_02464144 X-CRM114-Status: GOOD ( 17.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The new binding split sata in two (ahci + PHY). ahci_sunxi must not mess with PHY when the new binding is in use. So when we detect sub-nodes, bypass the PHY init code. This is a temporarly workaround for the period where DT and ata code will be merged from separate tree. When both new binding and PHY driver will be merged, a new patch which remove all PHY code from ahci_sunxi.c will be sent. Signed-off-by: Corentin Labbe --- drivers/ata/ahci_sunxi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c index 631610b72aa5..a09d189c6dda 100644 --- a/drivers/ata/ahci_sunxi.c +++ b/drivers/ata/ahci_sunxi.c @@ -96,6 +96,15 @@ static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base) u32 reg_val; int timeout; + /* + * When using the new binding, the presence of a sata port node + * means that PHY is handled by the PHY driver. + * */ + if (of_get_child_count(dev->of_node)) { + dev_info(dev, "Bypassing PHY init\n"); + return 0; + } + /* This magic is from the original code */ writel(0, reg_base + AHCI_RWCR); msleep(5); From patchwork Thu Aug 30 19:01:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582715 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 424BE14BD for ; Thu, 30 Aug 2018 19:11:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32B012C457 for ; Thu, 30 Aug 2018 19:11:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30D8A2C47A; Thu, 30 Aug 2018 19:11:16 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D0FEA2C45E for ; Thu, 30 Aug 2018 19:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GY1QUTZyWSm7M+vnkQrCRbRNqx7ywGm7FaMZMFPSVAg=; b=gFQfpL6/5qHNWzt730Kh29afSh g9xF/wRGu3QU2AIuGw+ifbv3kGVtSICoiG1q/2vJoURlhCxmolIlOQFfC8fyY6rCx1lAMCVMG0R2A DJvgt1rJMBOqcyB9lmMGLSzRbGov89kwvyKACkhe1M8W8ltTeHn3rH4r6v9v/CVJ/USGYKv2D3jel xAVlJMFRumVpeSJFbgguspEV/9++BQXhObvmqiIUJKcYK5PJYGgEmEvOXhxGnFj/hM3nUXtcfhBi8 j+JurfminKHLImUSrzOSZO3QE2XtR6H0MtcR3K77buI4pPWkrqdGhFLxhowaGA55H4umk+trNH99w nGaiJfxA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSLP-0008BK-U9; Thu, 30 Aug 2018 19:11:03 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSKh-0006OJ-Ay for linux-arm-kernel@bombadil.infradead.org; Thu, 30 Aug 2018 19:10:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=uNj/VFnQ8ClUwahEmW/nsQHB3Tb5wCIwIO0nNsAKcxw=; b=UoAiLOhHcuyBRUXg4SUT/6MGl jV8Bhd1QrEDUdTMW/OHH3XbagFxw9bZ8JcB/Ki7M2iIJ+YlqfLUqafIkJBY2QgOzDNi0Y4dZxN5RA Jrva8Glojf7Tnme3Tn27tJLZIL6g6m6eXrTQ1TewsBLd1lZij6XWAqMRhiiYLrXX01ijgExN8YmF1 AL4ScZBETecggtFw9lxlfedy48n3GSE+ij+KmVssaLXHqT9XNYIoFAvYNjFwtnwxGE6swegFir0jk mDDRZXkr/nGs9aksozp0MpqMv1Y7x2xHlWGlHAUhoFftUxCZsKjOuyZeSTwF9eyHQLgo74ziFtw49 NSinE/bjg==; Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCX-0000K1-OT for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:01:55 +0000 Received: by mail-wr1-x441.google.com with SMTP id u12-v6so9003380wrr.4 for ; Thu, 30 Aug 2018 12:01:43 -0700 (PDT) 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=uNj/VFnQ8ClUwahEmW/nsQHB3Tb5wCIwIO0nNsAKcxw=; b=FEZwUB3Mxqu3I2HveWXbgjeeLpkCRzAfpH7tKqoRBFDxUFALUdOmJ4mWYpohlzglL1 NtEPtxVQfhGjdM/CgpeFwYO8ZSDEvUsU9Z1hJhzfnruafzx8KtC55j1PbodUkPaxxyio //Erxs96nnV61D7JlMgLX601RDgoZ8V0wxuQKdPpX4/C9EUoXS5ByDyyLDnBZwH/Z8pR w16fSJ2+B4KZnXxPHHlKVSbF/D62UlGX12D9upR2ERu+VDYV5hkMxM329J8KOujbGLN/ maPOvYaQRyk0huvmRJe2crxeM4aCoNkW3CRCJWN/FhdC6x+/eUakkoRCY1N/mABWU9h0 8oUQ== 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=uNj/VFnQ8ClUwahEmW/nsQHB3Tb5wCIwIO0nNsAKcxw=; b=Rg9EC7sBPrvhuGRTglpf7XfxRfjAZIuVS/fwiqM4p0nk7zq+k1Y6wz1PSvnigw/rx9 D8m89lO7CNyhhpCXKUtZijdo8MY+JHMylidUE40nBV6X4HS2eh7wW3lrJBBVLdbJJbQO 8WDaPm1H5sMpouaH7nxyX4eu+qJuAQUVcoYjdUNzVNaTp/Ei8SKePZnHX0zILthjAXXm Amng/h4eRrfY3tR6fMQE/LRl0f9EfdhJYyhIUaXnxC7kUG7gIFuiHVDyYIj5wJxAqbjn 7o7QOMOCzLd/rcj0BOC2FbP0EDcLUUalo/XvonyOdeN9c926nDufH94yjG1rzOWxPi1Y 0a2w== X-Gm-Message-State: APzg51DUbteggEORll8f5wpWvtYVBBk6HfB51eLfa+BhOfl7xbvr9CT/ cFHIiV+hTJgL+qxC6kclPuo= X-Google-Smtp-Source: ANB0VdZRAwHfUOZ48d6y6t7O+JRXtmhQU2Kqy9ynLpQWcvfu3YVYEUEfuBNXyRXgKBV5PiWn6SVLkQ== X-Received: by 2002:adf:a602:: with SMTP id k2-v6mr7952700wrc.181.1535655701025; Thu, 30 Aug 2018 12:01:41 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:40 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 08/13] ata: ahci_sunxi: add support for r40 Date: Thu, 30 Aug 2018 21:01:15 +0200 Message-Id: <20180830190120.722-9-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_200154_277116_7277FBC4 X-CRM114-Status: GOOD ( 16.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch add the r40 compatible to the ahci_sunxi's supported list of compatible. Since R40 need ahci_platform to handle the reset controller, we also add the new AHCI_PLATFORM_GET_RESETS flag for ahci_platform_get_resources(). This has no consequence for older platform (a10, a20) since the reset is optional. Signed-off-by: Corentin Labbe --- drivers/ata/ahci_sunxi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c index a09d189c6dda..b8cf3a1be80b 100644 --- a/drivers/ata/ahci_sunxi.c +++ b/drivers/ata/ahci_sunxi.c @@ -190,7 +190,7 @@ static int ahci_sunxi_probe(struct platform_device *pdev) struct ahci_host_priv *hpriv; int rc; - hpriv = ahci_platform_get_resources(pdev, 0); + hpriv = ahci_platform_get_resources(pdev, AHCI_PLATFORM_GET_RESETS); if (IS_ERR(hpriv)) return PTR_ERR(hpriv); @@ -259,6 +259,7 @@ static SIMPLE_DEV_PM_OPS(ahci_sunxi_pm_ops, ahci_platform_suspend, static const struct of_device_id ahci_sunxi_of_match[] = { { .compatible = "allwinner,sun4i-a10-ahci", }, + { .compatible = "allwinner,sun8i-r40-ahci", }, { }, }; MODULE_DEVICE_TABLE(of, ahci_sunxi_of_match); From patchwork Thu Aug 30 19:01:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582707 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 174D413AC for ; Thu, 30 Aug 2018 19:06:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0618B2C41E for ; Thu, 30 Aug 2018 19:06:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE02B2C420; Thu, 30 Aug 2018 19:06:30 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 800A52C41A for ; Thu, 30 Aug 2018 19:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=OB6r6ZA7RUUh2oBmvHyByrPB0obdJzpizwefVoQQGSY=; b=IrCeF6V+ZBlUMDWYsh3wARzzY5 H+pUqYtbKINvNI4jA3RyC54aW9jfSUNVdy/jbIV7Kwhiv5BDoTRifkjpzqGemRguExiypqrqL6LHQ 1LUkZlEyHDCl67ymw2jyY5VRy68Se5ocBhxieCAC3v8d9sJHuXiHFjQ/G7IzeLxBQEXPNV5nkAp/4 nFRBkry7FksMTxts8Oh4QrXx3eK3GEydkbVth/Ks5OjUVM+V2fOlhKbAw7p6jzhuZz0WWxp1CoroZ vzGvdVu324bvMIm0OpWpDsPO7oFGF6RDZXDIJevT7osV+zqcGQ8DFcCj5V53bqhZGjA0Zfm/YhXWL 1O3qAw9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSGr-0005Ig-1G; Thu, 30 Aug 2018 19:06:21 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCY-0001pj-6C for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:02:13 +0000 Received: by mail-wm0-x243.google.com with SMTP id y139-v6so2973357wmc.2 for ; Thu, 30 Aug 2018 12:01:43 -0700 (PDT) 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=qpn+V0z5TaoK+rCQvEV6gj7EtBpctPHnnDY7C6IV55A=; b=MKu/E/VKoTesFb4kDZjoXvEWLAK1SkUckVuiZ0xKt1zIFShbUEFE8aXAGfqIMlUeAq vsDkhu7VV9xNPStOe5WBw52JEN51Jy6u/0X7neLjIqRNfzElirChtpRQwZgogweYjLME 3r/ktmQC5RSh3lidLvcKbCL7d+IKD1KRGnKOPa7faD/wI1COTLegDW1XjIKa8tUrwp48 Yc6Mx0DLWNWBSKeplX956Om2LAem1kozSaBVRGaOkeFUQzQuLVpWc93Hd5rLuJ69R5bp DcrOMRjzhUulVPVQmIdE/ygC91NvzHT6HUj1dxf2G2Flqh6+v6k4CNAitJ/3U0Ce+kxe XlEg== 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=qpn+V0z5TaoK+rCQvEV6gj7EtBpctPHnnDY7C6IV55A=; b=n7guGkB2LqUL4ttnEqKDNo0Hs4wS9J3YjvtB2h1B8hwemvUBHugVe8s/w545vqXPew dZw4KjOrthlGEIoy72MyrN7Ence/Txaj1gh6xO90KIsc0TzfugDpFq3ExeCGH29MOfNR OazMCMbCU4rjMkpalNhnILPNCsTdP6F8Qxpmt2pjJSL3/p8ajcgO3NdZad34EtAWG6Ah xGNvU+hoGDhY5QJwaVGZvESTzf+q3DUxKy439314rIYRhfc2kP74+PxkX/peMbcTkPAq 9vGpuYUBgksFKouGTXyxlagY/EAMHF35a4KPQqrdC3dQ46XL+tzTFJb7bV1st0Ojw/Oe XPlg== X-Gm-Message-State: APzg51D4tM2x/xrum99C0kUsv172UYVkHUblum1sGuOyzhet6fvFmta2 pS5dHVGh0UlE1vpQS6M/pcw= X-Google-Smtp-Source: ANB0VdYRpTWwjGPy1ljIZrGwfeUuszBJDlGgN8Nhb2D2j7sxFbEyan8HkdEw/5rYJ3pTZ7pMyhOkFA== X-Received: by 2002:a1c:a401:: with SMTP id n1-v6mr2828082wme.125.1535655702588; Thu, 30 Aug 2018 12:01:42 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:41 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 09/13] ARM: dts: sun8i: r40: add sata node Date: Thu, 30 Aug 2018 21:01:16 +0200 Message-Id: <20180830190120.722-10-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_120154_323458_9D29FB2B X-CRM114-Status: GOOD ( 12.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-sunxi@googlegroups.com, linux-arm-kernel@lists.infradead.org, Icenowy Zheng MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP R40 have a sata controller which is the same as A20. This patch adds a DT node for it. Signed-off-by: Icenowy Zheng Signed-off-by: Corentin Labbe --- arch/arm/boot/dts/sun8i-r40.dtsi | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi index 852c2ccc3268..d6b5820da850 100644 --- a/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/sun8i-r40.dtsi @@ -550,6 +550,29 @@ #size-cells = <0>; }; + ahci: sata@1c18000 { + compatible = "allwinner,sun8i-r40-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = ; + clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>; + resets = <&ccu RST_BUS_SATA>; + resets-name = "ahci"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + sata_port: sata-port@0 { + reg = <0>; + phys = <&sata_phy>; + }; + }; + + sata_phy: sata-phy@1c180c0 { + compatible = "allwinner,sun8i-r40-sata-phy"; + reg = <0x1c180c0 0x200>; + #phy-cells = <0>; + }; + gmac: ethernet@1c50000 { compatible = "allwinner,sun8i-r40-gmac"; syscon = <&ccu>; From patchwork Thu Aug 30 19:01:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582713 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2593A13AC for ; Thu, 30 Aug 2018 19:10:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1569A2C457 for ; Thu, 30 Aug 2018 19:10:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 128822C464; Thu, 30 Aug 2018 19:10:32 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2E9B52C457 for ; Thu, 30 Aug 2018 19:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=h7XcMwUhQLpflYtgJd4vDoKav2M3WXqBljKXqtzN2sY=; b=o6CoYdLgTRvd5hMD52XCalamKk yJ/NIebdII2kuOU1odM7tNP5qX8RluhLFHdZx/UIpoIZ0hkjGp+TVtCRWbOTAnxrpbKjIf/dU0BsL 7heWti8VuALzp2euBOeAu8gC11lgxglGSY5IuzK6egf0NkWUjU8dbTOaSDsnsr2qJF0x3p5P7L/AF JoVpZHN2TqNHypcEUPYNEi5dOova5dZoCZEswSNP+MoVZ6PnfsFK7y+MpFDaJ9UPi90cOVWGfJVFE 4lvaG2i4yoWznf8Da7ukuakdSIEON5pvYeLJJpjseoPm/W+5lhDeaIvENLWwBctAhMxDVBglpkqt0 ab8tBWsQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSKi-0007NJ-80; Thu, 30 Aug 2018 19:10:20 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSKg-0006KM-QG for linux-arm-kernel@bombadil.infradead.org; Thu, 30 Aug 2018 19:10:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=fVq+dyrEA8MCEaUSG6+R2JFZagictW0kEMK0uBAAtGE=; b=NFCwMAogMBepuz/0dWohHl7DS WKNKPNukg93pcBU57LiZnafNCqtuxO5TuA+5A/299O6hGqHrGWG+Eb10UMWiTLezk5NG7Zo/m7gpj 9EAkE0vV7JEtEKyHO/J6ZUfy9uCbc2yskjOJhhCUv2dyEgVOyxi/Z8fCumfAf7VpNekc1pe8ndLLP LS/4lvuoSyG7n5MB3EnjuaI0VJBCxhIBEyfSvQ0N8sAaBeq+88jLTZkYdd7olzGFy2BzbKcD4L4bi 7SLrewPvXs38rguCZq73gqRHy2xLpep7DMQ38rWHQ5+1nIvj/AF5ujGELYwPflhNt7h4cTDuETRf3 mQI1Uzhrw==; Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCZ-0000KM-9k for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:01:56 +0000 Received: by mail-wm0-x242.google.com with SMTP id q8-v6so3067792wmq.4 for ; Thu, 30 Aug 2018 12:01:45 -0700 (PDT) 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=fVq+dyrEA8MCEaUSG6+R2JFZagictW0kEMK0uBAAtGE=; b=Is3j/umswbTely8NDeJXc6Ld/wz3HS6kpUDJMjL5/S6IgkLNI25iAb45sJojElciI8 1WdteNhHdUipNPzgpvijNRX40X+ooAhYRxfRKKxLFLyd8JwvqA1XZ2oNb7uZdVY+1xXI i4vX6TWqMbi1dGAh7xY8ttM+ZK+JzQ7VjFkbdpyki4PLUZHbBP4eChr6irZkg4kW+vFK 3HAl3LXdHxEYtfq7ToE17kDSdvkTtltuBxEmIJdCRvtJiEzLdZvCmxzkErDAI8byCW8t Kg7ChUAfILeMdZN/Axr8QgiP2EHi9IxrBvWK7YRl/n8DpB5WsLVQmHKGPp2/olT7n2he 2LOA== 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=fVq+dyrEA8MCEaUSG6+R2JFZagictW0kEMK0uBAAtGE=; b=iUGUo8j8STxOAwbBwL1apNt+6QdbQvf9k5WQVJcjqz66Y+OafBzqXUFkKKKOPj6XJ9 mx26f3HL88dpg/GmTvnKCi+zuH+Fl76ZgTFjYKsoDDWsd0ZbVFDEZ7KJ0sHilGJ7f3Pq vNeyVkUXi33gOC0hrBCsiF3keV+V11wuMHTvZp6D7jjvtvKw+d/hnij584nX2Ub4Kgat jPEXaagnYvbyU5eYi/ntKOfsrrwOLv4nC3iiVm0IPndSre8FxUJtAWzJhDBem9igWfes PNTsH+Rq89FG9NTukUXr3W1vex4QRxJ5ClO70EzD4jPp+2nWxg+jq792an98kHBWnINI 5YLw== X-Gm-Message-State: APzg51BkgHsk90EjFqaRuehhb9KYhsij+iq0XWNCZc2OwlAJXRMheEdy l8A0fwtyka19x8tOwsFYWHU= X-Google-Smtp-Source: ANB0Vdbq2eOt//DRVHk9YbeHWig/yUK59pYYUnP6O+3/hkUVTHq3d2XAdxyIKgnA3JARSkZHuV3sAw== X-Received: by 2002:a1c:c7c3:: with SMTP id x186-v6mr2653722wmf.109.1535655704028; Thu, 30 Aug 2018 12:01:44 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:43 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 10/13] ARM: dts: sun8i: sun8i-r40-bananapi-m2-ultra: enable AHCI Date: Thu, 30 Aug 2018 21:01:17 +0200 Message-Id: <20180830190120.722-11-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_200155_337477_DEF39C4F X-CRM114-Status: GOOD ( 13.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch enable the AHCI controller. Since this controller need two regulator, this patch add them. Signed-off-by: Corentin Labbe --- arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts index a891a387e8f1..b991b635c07d 100644 --- a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts +++ b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts @@ -105,6 +105,11 @@ }; }; +&ahci { + ahci-supply = <®_dldo4>; + status = "okay"; +}; + &de { status = "okay"; }; @@ -250,6 +255,22 @@ regulator-name = "vcc-wifi"; }; +®_dldo4 { + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-name = "vdd2v5-sata"; +}; + +®_eldo3 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-name = "vdd1v2-sata"; +}; + +&sata_phy { + phy-supply = <®_eldo3>; +}; + &tcon_tv0 { status = "okay"; }; From patchwork Thu Aug 30 19:01:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582719 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D69A613AC for ; Thu, 30 Aug 2018 19:12:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C62F52C449 for ; Thu, 30 Aug 2018 19:12:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9F2B2C453; Thu, 30 Aug 2018 19:12:38 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5364D2C449 for ; Thu, 30 Aug 2018 19:12:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=yRn/seDui7BKQNxK+R5W3UEBn3BScoDqrL5AglS90us=; b=fL314bbz7kvqKXBm4WdlGnhfkW X9JDwLHZBN+j9YSOWtCTMXvbTt+F7UXknbABWTmtQ5HDG9Lrge4KnFN4u1ifq6qfijl4NcNS97jgD D1d8BTw1RfYRsjH1bLeUsHSNr0+8KhYKqzasKXHPfBX5Vh2cMR4sLtalOBvMVg4asqmBD6q8x/gud zjKJP8uh/lWWiCtsMPG20zT0ELCurgcQDur4HBMaGDnISbzgRHrwsg9j1GPM6kw33wkJ6KcqdyL47 DjcXnyDjuWtMHR/yDZywGdrConnn98nvgi+YYKQbCJW+M8J9GSbAcIFKksvL8OvMxY+6vARe5hCKI VOarazdQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSMo-0000L8-J8; Thu, 30 Aug 2018 19:12:30 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSKj-0006OJ-Kl for linux-arm-kernel@bombadil.infradead.org; Thu, 30 Aug 2018 19:10:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=lYF4vw+H13TqDhRHDPAO494ldTC/en088YlLmd8H0Lk=; b=o6PSeFVKvg9CmNEeyVP6avNw7 S9AVNxiLMasSE0zYR6bpirWr5wT4ROquCISG8zWbN3A4dLCfsdVE0gFIC9Zv6l+f5JFVBwm47J8b2 +p2ojUFRWOL3ayGpS1S1j3nNP4QAgVwxc6py/BnxtzAHwLVJEqcC84Z3/+y8TiWK6oxDCGg/tmq/g LQHg8FOF1MgOBE3WpUawrTQGrzH1tAFI9F/A35D8Td4cHDBnYs01nhbtpdvhD6vEm9uM/WwjDjn/a uWVPw6f7M8bWkpgPupg/pX+6zz4QekRQ6Yc/DSjSuALBbAlJkm/SjzF++VsCy73VmM/A20dxcl0RX rpjK+WIAg==; Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCU-0000KR-He for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:01:52 +0000 Received: by mail-wr1-x443.google.com with SMTP id u12-v6so9003494wrr.4 for ; Thu, 30 Aug 2018 12:01:46 -0700 (PDT) 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=lYF4vw+H13TqDhRHDPAO494ldTC/en088YlLmd8H0Lk=; b=qi9dUqFQ0tN5DJbV79V9Kio4t1mQfMyfMCviV1Nr9GRk51JH8S21uNzT+UoVRXvK7S EdG2YCFNWtMJ01um9n/4TztLeqdxY//dsKd+1m17PNIH1pRQLBW60hjQVRC/dnyHMf/I pzWhHymJLuimSDBzx4o7s/GHCXojDNuXzwgo2eI+7+RJsj+VnaRP8w/FiQwexS7AfXVM cTUXI8MWvmumb4CfwwmRVbDBQbwgtV6LihGBELT4NreQLhK1wwdIJueXwK2lef7zxe0J 0Tgccu6YnV6W1WGwiZzD0PGfL2Fuwji+zu6rhLxGF69tzdtyW9TQsRKDvrbTnalgIXkY K3Ug== 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=lYF4vw+H13TqDhRHDPAO494ldTC/en088YlLmd8H0Lk=; b=sRJjrmJLIqFs7310J6Y4l7RPTfqZV0VduEzZMmVQtVhFi8oHmB3BTU8Scb1++rtkHm kTVBulwg4Eq1+zyTXJk0MTys3mcIDkOP1KC/+enzlgEB03bfnHx5pC51InVV+AigMvL/ Cyx4dK525anZli5uzyIkU/MTQJ2QZur/cgNdadkttk921rEkXmBi8nwTm3Rj37SOFFLY /DX6jAJwmfxHZGSj54nQAnycMQ2ECBgD5wYj1rlW6+Xo3/c32KpP0XLR7OiHBarrtydp eA4pr515oAm4VFbisM7WKzM3T2MMcli4aPL9jpyDZ/6QgRk2ZJA9j5UMM2LLklaBM01O ox6A== X-Gm-Message-State: APzg51CmWv0OTLRnqMc0hNsFeLTPuVmU6Rgb8o0r1FIjz2e3uQRGLb+E dSjr14bl3ERMNqSbMVky7P0= X-Google-Smtp-Source: ANB0VdZkBUeh5YNoWk6eGEk0v4LP31uLIqZhjPS/6SCQwo6hXW7TvNRnTwspikAs8Unuhl84TlTbwg== X-Received: by 2002:adf:9e06:: with SMTP id u6-v6mr8392154wre.51.1535655705436; Thu, 30 Aug 2018 12:01:45 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:44 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 11/13] ARM: dts: sun7i: a20: add sata-port/sata-phy nodes Date: Thu, 30 Aug 2018 21:01:18 +0200 Message-Id: <20180830190120.722-12-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_200150_577898_A559B7FC X-CRM114-Status: GOOD ( 13.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch convert sun7i-a20 sata to the new binding which use a sata phy node. Signed-off-by: Corentin Labbe --- arch/arm/boot/dts/sun7i-a20.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 8f7e1e29841f..8ff28f7afa85 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -667,6 +667,19 @@ interrupts = ; clocks = <&ccu CLK_AHB_SATA>, <&ccu CLK_SATA>; status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + + sata_port: sata-port@0 { + reg = <0>; + phys = <&sata_phy>; + }; + }; + + sata_phy: sata-phy@1c180c0 { + compatible = "allwinner,sun4i-a10-sata-phy"; + reg = <0x1c180c0 0x200>; + #phy-cells = <0>; }; ehci1: usb@1c1c000 { From patchwork Thu Aug 30 19:01:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15AD114BD for ; Thu, 30 Aug 2018 19:07:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 024D72C40A for ; Thu, 30 Aug 2018 19:07:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8EC52C41E; Thu, 30 Aug 2018 19:07:07 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 83A832C40A for ; Thu, 30 Aug 2018 19:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=nMPQn3IoAsVVp9geHon4QenbYJOWKyLX1XhFY6XH95I=; b=VCGRPBi/9IqCg9NMi96aNBRmhT hqntjTb9hDtdr0g3/G49XVLB2snNZs7ebWaYYbaz/c7b0SYr/sNfktj/1tUpt4i4QNbKS+BtHekBa ArUigWKViQBzHugRKHgt8zeAJcFpmIwhiw32+l4v2JqOwQCUzWpNz1mZEpIZw/HZ/btJuMmBSZUQp n+AgVlOUvH9vfs8nG3AG0SLAVzdnNAgZVO/xBlhoANaIXgMi/z51SxLyOsUV8flYKf6oeRuFJkcvy OZNh+PKIEYvalEz6Pu9SYA0QwAGXjh9/yAkxEqyqmjl3GL8XNut2iFFX1dDlYB28OoQHihdGhucNl VlmVNddg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSHV-0005an-Ot; Thu, 30 Aug 2018 19:07:01 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCc-0001rd-KG for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:02:14 +0000 Received: by mail-wr1-x442.google.com with SMTP id v17-v6so9022941wrr.9 for ; Thu, 30 Aug 2018 12:01:48 -0700 (PDT) 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=/Tdxgkt9CvsMDffYgLZwCBYAMe31gzmLe/ZAbH0KQ5c=; b=bdVcOQBhDKg1YU7EuaVN50ehxdx8lwubQ6N2NC1qOENkXiSnFjX6M95te/1JvU+DLc 5a9zj1tpIOzhcGIo5rcHAANACJN2T/0abHljawknikpjNiZgqrWwDVVTvjszntiMm5BD nr8TFwV78fCiJ5XJYEKzG+ImdbIFI+lvLnad2pQb3LUcrxMiYkvB1lreOe3CENHZi6G9 QqmxA1JB9od6d39rAQG/4G0ZJpRZy333jdIGKxYUOjvTU7oWQ3H9q1eiY34H7VlyWRge zZXsH+vXL5OPCSozU+fiM8uHaw5Mssn9TGjoA6q+dcu6eeqG9hvyg5gBhnXY9mCGMCoV LlIw== 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=/Tdxgkt9CvsMDffYgLZwCBYAMe31gzmLe/ZAbH0KQ5c=; b=VbdafYk/AIXxMIqoAG8jVlfQOnHMG/DLqxuTWFSAPElCS3aX10TqkDEBjcBinQiLZl 9Tfm5TPHqo+x+rny0u3WMsn04TYs9HiHLM0rF8GeqnUkiqZoTMkCtn+2jgdpXVZAK54q rHL6e/CXqcMJrtprHSSf9kdspO1koe5hitgLlZn9I5HhvAY9KuM+paS0jzLK40UYM4xr H9VtPbucoLjqVEFFNo8MhyZWEFwQERzrjmAl7GsbnvA5QxGUNu7TX2Py6CxYgqLYO+8C hMJgBVngGydxAzFqu7qNe3BZv+5Z/6XNHwJ1QXvfS4sQU7j/zDm0CMfKQKZOEFs9OcAk yaQw== X-Gm-Message-State: APzg51B+mnpjZlj55IAjl/K4t1uo/z7JwdZt4yeTB3lphOgXt/OeTku9 iClg82UUhjXts8Hpk4S2Bnc= X-Google-Smtp-Source: ANB0VdY554aIbbCMKkMrXU/yoUgm3k/luqENql/oBTCw8GdNQKmtOgEY6Ei2iKI5hSiQBHo6DpxJ2Q== X-Received: by 2002:adf:dcc1:: with SMTP id x1-v6mr8674417wrm.21.1535655706835; Thu, 30 Aug 2018 12:01:46 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:46 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 12/13] ARM: dts: sun4i: a10: add sata-port/sata-phy nodes Date: Thu, 30 Aug 2018 21:01:19 +0200 Message-Id: <20180830190120.722-13-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_120158_799218_7C91F979 X-CRM114-Status: GOOD ( 11.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch convert sun4i-a10 sata to the new binding which use a sata phy node. Signed-off-by: Corentin Labbe --- arch/arm/boot/dts/sun4i-a10.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 3d62a8950720..52d5c2e79499 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -556,7 +556,20 @@ reg = <0x01c18000 0x1000>; interrupts = <56>; clocks = <&ccu CLK_AHB_SATA>, <&ccu CLK_SATA>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; + + sata_port: sata-port@0 { + reg = <0>; + phys = <&sata_phy>; + }; + }; + + sata_phy: sata_phy@1c180c0 { + compatible = "allwinner,sun4i-a10-sata-phy"; + reg = <0x01c180c0 0x200>; + #phy-cells = <0>; }; ehci1: usb@1c1c000 { From patchwork Thu Aug 30 19:01:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10582711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7108613AC for ; Thu, 30 Aug 2018 19:07:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E1D82C427 for ; Thu, 30 Aug 2018 19:07:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E85F2C42F; Thu, 30 Aug 2018 19:07:53 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8042E2C424 for ; Thu, 30 Aug 2018 19:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=tB/v02lHa2OkaRFfGaw/sQpe2nkOUM+GH1sIhjqhzxo=; b=Z1HgG8hMf8P1E06xsCnW2Dwl+B P41z/0cNcYrYX9fbkdlblpWBh5yfLQrtfna5GvzrmfGbUhj34LiAtyKxeROFGOqh0F7U0BKf4S2Pq 4i9Z83fVgXYFtjgxb/bKt4eltcgOg0+O65c9qFswHJZ6k/vlGVn7gLBuInKWI+w2/KnuKBW3n+H9c UISubp/Yr692gdO3J3Q31kHbThvHaggJmRLd4DRw6DbAdIZN/mqef9PV8kmg1mpPmCWz5R+lFh/9M vPGOqDXZ4W3sQaxAPIs4Si8D22KOViHSOHqIYcXdKjbf2rKnGrct4Sni5/LzANL1N6nuMa0Hh03HS FfXJHfAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSIA-0005pu-6B; Thu, 30 Aug 2018 19:07:42 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvSCe-0001sT-MS for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 19:02:17 +0000 Received: by mail-wm0-x242.google.com with SMTP id j25-v6so1611473wmc.1 for ; Thu, 30 Aug 2018 12:01:50 -0700 (PDT) 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=oe7h7xIfk8wXHX/0FC9e1cxcaJIngJnxvR4UbXqmMVg=; b=q9uev1PIjkWXxvAYB+XuPf9jmG/C5rOPO9UbUFkMk9LC1q7c00OERutFya7Ett7dCK b8felrkiQocDePiPHvzM8eVOQQGdeB+QHz6z61192uXqDGdQsxNzXlWylLM/ZVVt2qBI SfKEMDy7Y06yF+6n+4I9hzJjV4Pi1BKUqLg2YZE8vWxANnv4b9nxApH3P1i7NDWXErTX /xDlAIaJzNOAjzD/I9ZJXYpyCYN+L1asSoLDJNKSV6mCg6BDN6aeDf56vStIyqWx1CWe BDgcBKU/A2MAq0ZMMRP59BIvsw+v0LBeK06bArreMF8lgXl+j5ndwLJdNc1WGDvUpp1k kJ3Q== 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=oe7h7xIfk8wXHX/0FC9e1cxcaJIngJnxvR4UbXqmMVg=; b=g9mAVT4BrntMZBAw6kAiaz4xeeo1xhejD8v6vRvqZqJera/1lYe5QdKgfkrFQdYmsD QbFgNnXrpftapC2XiAl4Q+ka05K8MndJIvMtq5EAVTnqxmIe3E7/wJZo2IVV7IACwE69 1arCgqqPzOtwCeZTtBvg3fWvDFDMhlCwPI8ssMKnAM6rD8J4T9Pr8xODUv4RbZJ0/5jm UbhPBneGLSpBMHEF9B9NM6j3IM9wGlL/M0pDVYOHLfvQhjVljq2LB+d3g/byrCuBf1UM QuT4WDUxfo1dlqVTd/5IoU/pwC183HrwrIHMV38w/WRRAcdF98xxThlNX7BNguvWPszF HJcQ== X-Gm-Message-State: APzg51ChGjB9ZJhRZUwas94G8y9DSB3sojNw+R5PMQ2b/rQ8cXQpNVah KdKhibCGE3ZyBWJ9ugEV6bE= X-Google-Smtp-Source: ANB0VdZEluVefV/6s3f5uSVg3ODg+tNOUFKWcNJeVcxI9utgBCGm1zIV3IsZYyB9D0beZnASM514Ww== X-Received: by 2002:a1c:dc8b:: with SMTP id t133-v6mr2583188wmg.108.1535655708335; Thu, 30 Aug 2018 12:01:48 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w17-v6sm2937095wmc.43.2018.08.30.12.01.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 12:01:47 -0700 (PDT) From: Corentin Labbe To: axboe@kernel.dk, hdegoede@redhat.com, kishon@ti.com, mark.rutland@arm.com, maxime.ripard@bootlin.com, robh+dt@kernel.org, wens@csie.org, clabbe.montjoie@gmail.com Subject: [PATCH v4 13/13 DONOTMERGE] ata: ahci_sunxi: remove PHY code Date: Thu, 30 Aug 2018 21:01:20 +0200 Message-Id: <20180830190120.722-14-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180830190120.722-1-clabbe.montjoie@gmail.com> References: <20180830190120.722-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_120200_889458_FD05C720 X-CRM114-Status: GOOD ( 16.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since PHY code is now handled by sun4i-a10-sata-phy, the code in ahci_sunxi is useless, remove it. Signed-off-by: Corentin Labbe --- drivers/ata/ahci_sunxi.c | 93 ------------------------------------------------ 1 file changed, 93 deletions(-) diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c index b8cf3a1be80b..af17f8ce65b2 100644 --- a/drivers/ata/ahci_sunxi.c +++ b/drivers/ata/ahci_sunxi.c @@ -58,15 +58,6 @@ MODULE_PARM_DESC(enable_pmp, #define AHCI_P0PHYCR 0x0178 #define AHCI_P0PHYSR 0x017c -static void sunxi_clrbits(void __iomem *reg, u32 clr_val) -{ - u32 reg_val; - - reg_val = readl(reg); - reg_val &= ~(clr_val); - writel(reg_val, reg); -} - static void sunxi_setbits(void __iomem *reg, u32 set_val) { u32 reg_val; @@ -86,81 +77,6 @@ static void sunxi_clrsetbits(void __iomem *reg, u32 clr_val, u32 set_val) writel(reg_val, reg); } -static u32 sunxi_getbits(void __iomem *reg, u8 mask, u8 shift) -{ - return (readl(reg) >> shift) & mask; -} - -static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base) -{ - u32 reg_val; - int timeout; - - /* - * When using the new binding, the presence of a sata port node - * means that PHY is handled by the PHY driver. - * */ - if (of_get_child_count(dev->of_node)) { - dev_info(dev, "Bypassing PHY init\n"); - return 0; - } - - /* This magic is from the original code */ - writel(0, reg_base + AHCI_RWCR); - msleep(5); - - sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(19)); - sunxi_clrsetbits(reg_base + AHCI_PHYCS0R, - (0x7 << 24), - (0x5 << 24) | BIT(23) | BIT(18)); - sunxi_clrsetbits(reg_base + AHCI_PHYCS1R, - (0x3 << 16) | (0x1f << 8) | (0x3 << 6), - (0x2 << 16) | (0x6 << 8) | (0x2 << 6)); - sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(28) | BIT(15)); - sunxi_clrbits(reg_base + AHCI_PHYCS1R, BIT(19)); - sunxi_clrsetbits(reg_base + AHCI_PHYCS0R, - (0x7 << 20), (0x3 << 20)); - sunxi_clrsetbits(reg_base + AHCI_PHYCS2R, - (0x1f << 5), (0x19 << 5)); - msleep(5); - - sunxi_setbits(reg_base + AHCI_PHYCS0R, (0x1 << 19)); - - timeout = 250; /* Power up takes aprox 50 us */ - do { - reg_val = sunxi_getbits(reg_base + AHCI_PHYCS0R, 0x7, 28); - if (reg_val == 0x02) - break; - - if (--timeout == 0) { - dev_err(dev, "PHY power up failed.\n"); - return -EIO; - } - udelay(1); - } while (1); - - sunxi_setbits(reg_base + AHCI_PHYCS2R, (0x1 << 24)); - - timeout = 100; /* Calibration takes aprox 10 us */ - do { - reg_val = sunxi_getbits(reg_base + AHCI_PHYCS2R, 0x1, 24); - if (reg_val == 0x00) - break; - - if (--timeout == 0) { - dev_err(dev, "PHY calibration failed.\n"); - return -EIO; - } - udelay(1); - } while (1); - - msleep(15); - - writel(0x7, reg_base + AHCI_RWCR); - - return 0; -} - static void ahci_sunxi_start_engine(struct ata_port *ap) { void __iomem *port_mmio = ahci_port_base(ap); @@ -186,7 +102,6 @@ static struct scsi_host_template ahci_platform_sht = { static int ahci_sunxi_probe(struct platform_device *pdev) { - struct device *dev = &pdev->dev; struct ahci_host_priv *hpriv; int rc; @@ -200,10 +115,6 @@ static int ahci_sunxi_probe(struct platform_device *pdev) if (rc) return rc; - rc = ahci_sunxi_phy_init(dev, hpriv->mmio); - if (rc) - goto disable_resources; - hpriv->flags = AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI | AHCI_HFLAG_YES_NCQ; @@ -238,10 +149,6 @@ static int ahci_sunxi_resume(struct device *dev) if (rc) return rc; - rc = ahci_sunxi_phy_init(dev, hpriv->mmio); - if (rc) - goto disable_resources; - rc = ahci_platform_resume_host(dev); if (rc) goto disable_resources;