From patchwork Wed May 11 10:28:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 67508 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp145532qge; Wed, 11 May 2016 03:29:37 -0700 (PDT) X-Received: by 10.28.14.73 with SMTP id 70mr3326884wmo.15.1462962576986; Wed, 11 May 2016 03:29:36 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id k88si9015027wmh.15.2016.05.11.03.29.36; Wed, 11 May 2016 03:29:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 30F60A7606; Wed, 11 May 2016 12:28:51 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ge5fLuV7bRnD; Wed, 11 May 2016 12:28:51 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 899EBA7609; Wed, 11 May 2016 12:28:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 017974BB3B for ; Wed, 11 May 2016 12:28:00 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5Nd9eheX-oOk for ; Wed, 11 May 2016 12:27:59 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by theia.denx.de (Postfix) with ESMTPS id 89FD34BED0 for ; Wed, 11 May 2016 12:27:52 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id u4BARTS7013924; Wed, 11 May 2016 19:27:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com u4BARTS7013924 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1462962457; bh=neja5uayZX+555rv7lyCFFb3mt9PgPm6/Nu2lmZ5JEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XSaeGpedHQmNuU2+CwNkKMd6O14FOP45DfBQlkp+fWP2vs6C9x3ptgB4aiAqLNj8D CxX+VWhagZRrI9MScaVnM2cb7+qXIGNcbk2QvqZ15ldSSgTpxR54pz9JQQowNt8txr 2tVcGJOAoIOvkNjI1TGFnXMXxJyDDJt5/9vOEytu/0WqUM7lcKVtI0fGhT6MvXDlI8 mZ+uoJuUrOoUnUw9y2IIg7QAHcO+HoXc46OnQpY2jBev2veLg2tz9+aingnx8vufEH 101okok4XSRDbg04AyR3hgw5j2TbkQ7BCYTWTX8BFQrmk/NBEEQAw1RrYAvUqA+NWT bQOkEs88TkgoQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 11 May 2016 19:28:34 +0900 Message-Id: <1462962515-13181-10-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462962515-13181-1-git-send-email-yamada.masahiro@socionext.com> References: <1462962515-13181-1-git-send-email-yamada.masahiro@socionext.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH 09/10] ARM: dts: uniphier: add/update xHCI nodes X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Adjust xHCI nodes to use the DWC3 core and the SoC-specific glue layer for former SoCs. Signed-off-by: Masahiro Yamada --- arch/arm/dts/uniphier-ph1-ld20.dtsi | 17 +++++++++++++++++ arch/arm/dts/uniphier-ph1-pro4-ref.dts | 4 ++++ arch/arm/dts/uniphier-ph1-pro4.dtsi | 32 ++++++++++++++++++++++++-------- arch/arm/dts/uniphier-ph1-pro5.dtsi | 32 ++++++++++++++++++++++++-------- arch/arm/dts/uniphier-proxstream2.dtsi | 32 ++++++++++++++++++++++++-------- 5 files changed, 93 insertions(+), 24 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/arch/arm/dts/uniphier-ph1-ld20.dtsi b/arch/arm/dts/uniphier-ph1-ld20.dtsi index f9cc3c4..5e2b595 100644 --- a/arch/arm/dts/uniphier-ph1-ld20.dtsi +++ b/arch/arm/dts/uniphier-ph1-ld20.dtsi @@ -256,6 +256,23 @@ #interrupt-cells = <3>; interrupts = <1 9 4>; }; + + usb: usb@65b00000 { + compatible = "socionext,uniphier-ld20-dwc3"; + reg = <0x65b00000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb1>, + <&pinctrl_usb2>, <&pinctrl_usb3>; + dwc3@65a00000 { + compatible = "snps,dwc3"; + reg = <0x65a00000 0x10000>; + interrupts = <0 134 4>; + tx-fifo-resize; + }; + }; }; }; diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts b/arch/arm/dts/uniphier-ph1-pro4-ref.dts index 5be76e2..6cc5d1e 100644 --- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts +++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts @@ -71,6 +71,10 @@ status = "okay"; }; +&usb1 { + status = "okay"; +}; + &usb2 { status = "okay"; }; diff --git a/arch/arm/dts/uniphier-ph1-pro4.dtsi b/arch/arm/dts/uniphier-ph1-pro4.dtsi index d5767b6..7f42bc2 100644 --- a/arch/arm/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/dts/uniphier-ph1-pro4.dtsi @@ -400,22 +400,38 @@ clocks = <&mio 4>, <&mio 6>; }; - usb0: usb@65a00000 { - compatible = "socionext,uniphier-xhci", "generic-xhci"; + usb0: usb@65b00000 { + compatible = "socionext,uniphier-pro4-dwc3"; status = "disabled"; - reg = <0x65a00000 0x100>; - interrupts = <0 134 4>; + reg = <0x65b00000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0>; + dwc3@65a00000 { + compatible = "snps,dwc3"; + reg = <0x65a00000 0x10000>; + interrupts = <0 134 4>; + tx-fifo-resize; + }; }; - usb1: usb@65c00000 { - compatible = "socionext,uniphier-xhci", "generic-xhci"; + usb1: usb@65d00000 { + compatible = "socionext,uniphier-pro4-dwc3"; status = "disabled"; - reg = <0x65c00000 0x100>; - interrupts = <0 137 4>; + reg = <0x65d00000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1>; + dwc3@65c00000 { + compatible = "snps,dwc3"; + reg = <0x65c00000 0x10000>; + interrupts = <0 137 4>; + tx-fifo-resize; + }; }; }; diff --git a/arch/arm/dts/uniphier-ph1-pro5.dtsi b/arch/arm/dts/uniphier-ph1-pro5.dtsi index bd1b4b1..3036a76 100644 --- a/arch/arm/dts/uniphier-ph1-pro5.dtsi +++ b/arch/arm/dts/uniphier-ph1-pro5.dtsi @@ -379,22 +379,38 @@ bus-width = <4>; }; - usb0: usb@65a00000 { - compatible = "socionext,uniphier-xhci", "generic-xhci"; + usb0: usb@65b00000 { + compatible = "socionext,uniphier-pro5-dwc3"; status = "disabled"; - reg = <0x65a00000 0x100>; - interrupts = <0 134 4>; + reg = <0x65b00000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0>; + dwc3@65a00000 { + compatible = "snps,dwc3"; + reg = <0x65a00000 0x10000>; + interrupts = <0 134 4>; + tx-fifo-resize; + }; }; - usb1: usb@65c00000 { - compatible = "socionext,uniphier-xhci", "generic-xhci"; + usb1: usb@65d00000 { + compatible = "socionext,uniphier-pro5-dwc3"; status = "disabled"; - reg = <0x65c00000 0x100>; - interrupts = <0 137 4>; + reg = <0x65d00000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb2>; + dwc3@65c00000 { + compatible = "snps,dwc3"; + reg = <0x65c00000 0x10000>; + interrupts = <0 137 4>; + tx-fifo-resize; + }; }; }; diff --git a/arch/arm/dts/uniphier-proxstream2.dtsi b/arch/arm/dts/uniphier-proxstream2.dtsi index 12968bd..8cff09c 100644 --- a/arch/arm/dts/uniphier-proxstream2.dtsi +++ b/arch/arm/dts/uniphier-proxstream2.dtsi @@ -383,22 +383,38 @@ bus-width = <4>; }; - usb0: usb@65a00000 { - compatible = "socionext,uniphier-xhci", "generic-xhci"; + usb0: usb@65b00000 { + compatible = "socionext,uniphier-pxs2-dwc3"; status = "disabled"; - reg = <0x65a00000 0x100>; - interrupts = <0 134 4>; + reg = <0x65b00000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>; + dwc3@65a00000 { + compatible = "snps,dwc3"; + reg = <0x65a00000 0x10000>; + interrupts = <0 134 4>; + tx-fifo-resize; + }; }; - usb1: usb@65c00000 { - compatible = "socionext,uniphier-xhci", "generic-xhci"; + usb1: usb@65d00000 { + compatible = "socionext,uniphier-pxs2-dwc3"; status = "disabled"; - reg = <0x65c00000 0x100>; - interrupts = <0 137 4>; + reg = <0x65d00000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>; + dwc3@65c00000 { + compatible = "snps,dwc3"; + reg = <0x65c00000 0x10000>; + interrupts = <0 137 4>; + tx-fifo-resize; + }; }; };