From patchwork Thu Apr 12 02:16:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10337739 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 461CE60153 for ; Thu, 12 Apr 2018 02:17:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FBBE2852D for ; Thu, 12 Apr 2018 02:17:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FFC02852E; Thu, 12 Apr 2018 02:17: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_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 EA11028643 for ; Thu, 12 Apr 2018 02:17:32 +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: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:In-Reply-To: References:List-Owner; bh=9xYMuq7HWSLmko9XhtKDxxs9ng3TFGEHernQF/W5Slc=; b=sBT GyF4doJZ7C4obqh9ZOY6+sk6KKp0jp4guPqwckeqX2tPHsjT9pRpOAN0K3ctqZ+ZjJvkHK3G7ldPY pwPUM318Gx23At+keyAvC2G5zuu+e0T/n8KIQjENv3Bm/bvS5QTDRZPA9km7Eu49BUAYcMWweU0O0 gr4FxDvNafSHVEItjGFcG0T/3w9HKLX5Ku1/KX2B1YPnEjBFZzfoi6KtDiJjcGkU51LaEMb/0LuU5 HQxm8/O4K09yo2nBv1GGtNFYNZtk8XYCzp3J+IWvJLzKwron+FEPK/+IdoeFHrZQS0kTl6HGPT/+0 obMxpGMKRRMn6fAF6JzTLpLfoODA1EQ==; 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 1f6Rnh-0002Iq-U9; Thu, 12 Apr 2018 02:17:25 +0000 Received: from conuserg-09.nifty.com ([210.131.2.76]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Rne-0002HD-Eo for linux-arm-kernel@lists.infradead.org; Thu, 12 Apr 2018 02:17:24 +0000 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w3C2GP9O020821; Thu, 12 Apr 2018 11:16:26 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w3C2GP9O020821 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1523499386; bh=N4FzS6fuZiYKTW4SCF0UsKnFtAWF3e8EhBKClCpH1NI=; h=From:To:Cc:Subject:Date:From; b=jvaWNPXjp0ybF+SeKyZ1mfwL88ShyiN1dXnw1PJl9rkYQDfVvd18iBQQv7j4Y9rpG xQpi1kAndCq9jlQYE6AWgv46K8q8XbhoyJhgyrGtoqA23ZSLyzSwK2j/U6e49PwMAt O8NKz0k6b9sMGF9RbYJaKiFo8kPamubB9vlRBEBEQoOU+ZUmYcJ2vDNxg468x7rzQy 1XNwG9jdHBBq/YF7ayVxu95yHONphJTK3tWJa8wqQ157nGHImezswYw6UAbTv3kNtO KTEVo4Nr70C9b97k3B+UDxndZfurNDu+CwsiYK6m+AjEYqiuaWHuJlEdJXyhaEjGyT 9IsqTmNwNTzsA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Philipp Zabel Subject: [PATCH] reset: uniphier: fix USB clock line for LD20 Date: Thu, 12 Apr 2018 11:16:10 +0900 Message-Id: <1523499370-17757-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180411_191722_857265_50D3832F X-CRM114-Status: GOOD ( 10.60 ) 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: Kunihiko Hayashi , Masahiro Yamada , linux-kernel@vger.kernel.org, Jassi Brar , Masami Hiramatsu , linux-arm-kernel@lists.infradead.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 For LD20, the bit 5 of the offset 0x200c turned out to be a USB3 reset. The hardware document says it is the GIO reset despite LD20 has no GIO bus, confusingly. Also, fix confusing comments for PXs3. Signed-off-by: Masahiro Yamada --- drivers/reset/reset-uniphier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c index 360e06b..ac18f2f 100644 --- a/drivers/reset/reset-uniphier.c +++ b/drivers/reset/reset-uniphier.c @@ -110,7 +110,7 @@ static const struct uniphier_reset_data uniphier_ld20_sys_reset_data[] = { UNIPHIER_RESETX(4, 0x200c, 2), /* eMMC */ UNIPHIER_RESETX(6, 0x200c, 6), /* Ether */ UNIPHIER_RESETX(8, 0x200c, 8), /* STDMAC (HSC) */ - UNIPHIER_RESETX(12, 0x200c, 5), /* GIO (PCIe, USB3) */ + UNIPHIER_RESETX(14, 0x200c, 5), /* USB30 */ UNIPHIER_RESETX(16, 0x200c, 12), /* USB30-PHY0 */ UNIPHIER_RESETX(17, 0x200c, 13), /* USB30-PHY1 */ UNIPHIER_RESETX(18, 0x200c, 14), /* USB30-PHY2 */ @@ -127,8 +127,8 @@ static const struct uniphier_reset_data uniphier_pxs3_sys_reset_data[] = { UNIPHIER_RESETX(6, 0x200c, 9), /* Ether0 */ UNIPHIER_RESETX(7, 0x200c, 10), /* Ether1 */ UNIPHIER_RESETX(8, 0x200c, 12), /* STDMAC */ - UNIPHIER_RESETX(12, 0x200c, 4), /* USB30 link (GIO0) */ - UNIPHIER_RESETX(13, 0x200c, 5), /* USB31 link (GIO1) */ + UNIPHIER_RESETX(12, 0x200c, 4), /* USB30 link */ + UNIPHIER_RESETX(13, 0x200c, 5), /* USB31 link */ UNIPHIER_RESETX(16, 0x200c, 16), /* USB30-PHY0 */ UNIPHIER_RESETX(17, 0x200c, 18), /* USB30-PHY1 */ UNIPHIER_RESETX(18, 0x200c, 20), /* USB30-PHY2 */