From patchwork Sat Oct 11 15:41:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 5069141 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B4DFEC11AC for ; Sat, 11 Oct 2014 15:44:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA3592018E for ; Sat, 11 Oct 2014 15:44:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1ECBA20165 for ; Sat, 11 Oct 2014 15:44:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xcynr-0008UY-38; Sat, 11 Oct 2014 15:41:55 +0000 Received: from mail-wg0-x232.google.com ([2a00:1450:400c:c00::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xcynf-0008Q9-SY for linux-arm-kernel@lists.infradead.org; Sat, 11 Oct 2014 15:41:45 +0000 Received: by mail-wg0-f50.google.com with SMTP id a1so5981077wgh.9 for ; Sat, 11 Oct 2014 08:41:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-type:content-transfer-encoding; bh=bJjNlathSi6KKFy16xW/ZQ/JNfetcX0Jijn6tQHx/sM=; b=jh2RKNNojzVW8eJWYWNIVebOxqkF/GEVBWVV4n6Xyjvy4qXRMPntEaPzrpOUjraQOh jTlBitlRbuuetADZMh3TMnnFS6edwFlXqlrs3EkC0GWQftG1Lf+xM+kH2odhVWyn5e7c DaAxssKzw2kDyWxW+KsWJXtHDWO7tzH1vwkc+UhdLEthUhwSfc6tQvFs0UsHH12xBlCK sH7QnVBbZMDz3Cen9buRwEcR3Bl2dKYvqHYi0fzVqETgihgm5R66oD5KoemPPwkVULK0 pj4wUYeKdp4YVa+GwrI/5MoPL5Ypqi7u5g/Y9jBw8Nq+ZHp+pjTd6kdOlHwqjEqqcwi/ RT7g== X-Received: by 10.194.202.138 with SMTP id ki10mr10945882wjc.68.1413042081091; Sat, 11 Oct 2014 08:41:21 -0700 (PDT) Received: from topkick.lan (f052024004.adsl.alicedsl.de. [78.52.24.4]) by mx.google.com with ESMTPSA id f9sm4610593wib.3.2014.10.11.08.41.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Oct 2014 08:41:19 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 2/5] phy: berlin-sata: Add support for BG2 SATA PHY Date: Sat, 11 Oct 2014 17:41:10 +0200 Message-Id: <1413042073-14253-3-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1413042073-14253-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1413042073-14253-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141011_084144_070350_22096FAF X-CRM114-Status: GOOD ( 12.09 ) X-Spam-Score: -0.8 (/) Cc: devicetree@vger.kernel.org, =?UTF-8?q?Antoine=20T=C3=A9nart?= , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kishon Vijay Abraham I X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Berlin BG2 also has a SATA PHY compatible with the current driver except different PHY_BASE. Add a new compatible to the driver reflecting the different PHY_BASE. Signed-off-by: Sebastian Hesselbarth --- Cc: Kishon Vijay Abraham I Cc: "Antoine Ténart" Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/phy/phy-berlin-sata.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/phy/phy-berlin-sata.c b/drivers/phy/phy-berlin-sata.c index 9682b0f66177..71568f5444ac 100644 --- a/drivers/phy/phy-berlin-sata.c +++ b/drivers/phy/phy-berlin-sata.c @@ -30,6 +30,7 @@ #define MBUS_WRITE_REQUEST_SIZE_128 (BIT(2) << 16) #define MBUS_READ_REQUEST_SIZE_128 (BIT(2) << 19) +#define BG2_PHY_BASE 0x080 #define BG2Q_PHY_BASE 0x200 /* register 0x01 */ @@ -186,10 +187,15 @@ static u32 phy_berlin_power_down_bits[] = { POWER_DOWN_PHY1, }; +static u32 bg2_sata_phy_base = BG2_PHY_BASE; static u32 bg2q_sata_phy_base = BG2Q_PHY_BASE; static const struct of_device_id phy_berlin_sata_of_match[] = { { + .compatible = "marvell,berlin2-sata-phy", + .data = &bg2_sata_phy_base, + }, + { .compatible = "marvell,berlin2q-sata-phy", .data = &bg2q_sata_phy_base, },