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: 133176 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1221195ljb; Wed, 11 Apr 2018 19:17:51 -0700 (PDT) X-Google-Smtp-Source: AIpwx491ujVsM7nm8H6smBOP4nf6mawmATo+5K6F+Oc2R7urlH685n/O5LNSajsjK1wF1Qmfbu9Y X-Received: by 10.99.60.79 with SMTP id i15mr5110157pgn.399.1523499471312; Wed, 11 Apr 2018 19:17:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523499471; cv=none; d=google.com; s=arc-20160816; b=07hHV1AD+b1pw2mxHHWMAR4J5gUFQGdsJOUr9+kxyMnRkm758zHlyHty5EqRmRcKch imUHWN7MrVvU1kMyI5sqBq3wl4ch3WuzKsOMpQm9pIYdNQZWNEw/c9qHz2FtsoXPbwEm OtldE14p5Jf4X+45VJhlnPpyNxx1yi3VPECtDUU0jJ6jnZDkdhrB+aCS0LTeqvxdpscm OAon6mgVWo+r0gjXv/u2ume9ape7HkgxrNDRTwP0/rsvD3RwwRU4wJoNIBOurfNJ/qii lKR0+OfUORTHIHlW+Qaaj4HPsOlDZY9DHh0dMD8xPiz4AwejFjXTRG6ZBYscMZFfL7Q0 EnsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=N4FzS6fuZiYKTW4SCF0UsKnFtAWF3e8EhBKClCpH1NI=; b=qP0gUEH3hO6rDGE6aVIDEfKWqKDjlAeVgBcQyV0F6z+SYLA0jUbgNbebySUI+S8+Gm l74b1y8aoeTeau5EvQV+AqLp2w6nSX1oQRHp3kgqZnQuFeTvX9Cm5x/EQXNdWSd8VRic wiVBd4MLcllTpGg3g+FBTYL3HM3GgAOJi42Pd72NWgh6nOEu3+KgYBcQYevUTHvK1WmD Jw+UTXNp2zpcHIQGSzpk6NvRhjkljuhInRhgEJGJA38DcAyzhHcjuzd2Ajj6qV5EHVer vaCPHnUyX8YKlZY+m/KkF2Bzf+kU0RFgm6UIZ5bRHHwx3619UFphP1A/f+4hl0LL/QCV z92g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=jvaWNPXj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v192si1560079pgb.791.2018.04.11.19.17.51; Wed, 11 Apr 2018 19:17:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=jvaWNPXj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752470AbeDLCRq (ORCPT + 29 others); Wed, 11 Apr 2018 22:17:46 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:36459 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752341AbeDLCRp (ORCPT ); Wed, 11 Apr 2018 22:17:45 -0400 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 Cc: Masami Hiramatsu , Jassi Brar , Kunihiko Hayashi , Masahiro Yamada , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.7.4 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 */