From patchwork Thu Feb 27 23:05:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ren X-Patchwork-Id: 11411111 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1EA07138D for ; Thu, 27 Feb 2020 23:06:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E6AA024650 for ; Thu, 27 Feb 2020 23:06:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lPSlWkye"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HYWmfDre" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6AA024650 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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=sj3YSczszfIWyyiyMSfDtw4n1QePYFEG608HrW5+uo0=; b=lPSlWkyei4uH6vVWlu5c0O5/Hq 3hzQpoKHFvzLRfuQPg5P412eRSq9eLY5w07+dy25oTl0zUivE2Fjdem2okQSAvb5iegojREDbqM6V CLXhSUjUDJSc5I468Ivnp+WZMmkBuEBxYQ87S7TOaToN+xUQ5RD0M3Lz7R32TGrxqmjJOOs5CJFVd wFySvgOq+mMJwoCYTwAc5138ZtPEBa6UhGUyuB4e/tTlyOAn2dVTpTQWlV7kFcSBaLSbHGOd1PLsc wJvVcnWuxi7Lj7fSgzO8tNP2aaYgLnV8FGQeX+O3JXhPrM1OcUokkCbr0Z6/2u/Nn/bYzyd3wcCeg ZtWeRSQw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7SEk-0008RJ-Kf; Thu, 27 Feb 2020 23:06:34 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7SDb-0007Rp-Id for linux-arm-kernel@lists.infradead.org; Thu, 27 Feb 2020 23:05:25 +0000 Received: by mail-pl1-x644.google.com with SMTP id u3so411532plr.9 for ; Thu, 27 Feb 2020 15:05:23 -0800 (PST) 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=19Xkcz/2H7qw7NdRum+txTMYsSNMU8ssTmnGDdLyQzE=; b=HYWmfDreKAagDtTfzCvCE3tlM9ZiFz4+YpaXXD77EylMhM03FMpcAbda6nXMVkjrrU pz9GlPrziB2LoEQ6s73O3c/gJvIFHayLB0mragbmpeKRXQTlBPLsEdYQOkmZtg6SuPPW ZVC8lhzo+T/nAWVU4AQQnEp0Lmb8RfXMilfBpvkBZUCC7eAsN113YKs7JGc5amm0fiju n1PM/0Qmb8weImH0r+Pqch3Nqk39vWdCL1oOTqbYiVU7V64vh79ViP07yEc5J7WJjw8Q Md8oq1UUY0tA0wxW19mpFlWkqnx0CtrIhWFq5Jouu3vNp4BU5utZ9MqSeTg3MTOffxD/ 42WA== 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=19Xkcz/2H7qw7NdRum+txTMYsSNMU8ssTmnGDdLyQzE=; b=sp3ZVqmA4+4TYfgrbMbxCTsd8YU7kri29wJEU5GiMGVyjDVUaXW2V0eoakHsVVyvxo DZxG9QoA7d8Nvh2b7TMIoMdGQRjb42Exf2bEyxVxWOLwo8oVGiQNVfTsPPBMLWs7v5++ orB42B9x225ozbczGR89mhj5J1WyKqPgo8cuPC2hGp72mBjWuqHNkhdayq5BQyBqfuu1 6AjhiIOOfcZSSyz15n354yK/cBM1WFzbfopqzOg8t12Zhqbzm9yArfVvrLmPd7IDwAy8 +bY5Kdg+o4kemLoi+m4OmtdiwjaneVHq93jjTvTLpXtABRrCjfMLzmaIi/nRErjXAXEk 72cg== X-Gm-Message-State: APjAAAUqbXN8rQvO1H2QXyd1GAZV4aHH3C9fVON4lNd2TRhK2dh6ROJ2 feEOWRyzHIbR2YfJyiX9kdk= X-Google-Smtp-Source: APXvYqwaMyyWZohLLJCgnVR1nzQc5p/L96oyA99s9NZ7i/vWyQiAg0V2mpU/TCWnBSkf3jPwZ39cFA== X-Received: by 2002:a17:90a:8915:: with SMTP id u21mr1367639pjn.87.1582844722784; Thu, 27 Feb 2020 15:05:22 -0800 (PST) Received: from taoren-ubuntu-R90MNF91.thefacebook.com ([2620:10d:c090:500::4:d8f5]) by smtp.gmail.com with ESMTPSA id w2sm8275975pfw.43.2020.02.27.15.05.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 15:05:22 -0800 (PST) From: rentao.bupt@gmail.com To: Felipe Balbi , Greg Kroah-Hartman , Joel Stanley , Andrew Jeffery , Benjamin Herrenschmidt , Chunfeng Yun , Colin Ian King , Stephen Boyd , Rob Herring , Mark Rutland , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, taoren@fb.com Subject: [PATCH v5 4/7] ARM: dts: aspeed-g6: add usb functions Date: Thu, 27 Feb 2020 15:05:04 -0800 Message-Id: <20200227230507.8682-5-rentao.bupt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200227230507.8682-1-rentao.bupt@gmail.com> References: <20200227230507.8682-1-rentao.bupt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200227_150523_629713_E77E9928 X-CRM114-Status: GOOD ( 13.54 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:644 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rentao.bupt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tao Ren MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Tao Ren Add USB components and according pin groups in aspeed-g6 dtsi. Signed-off-by: Tao Ren Reviewed-by: Andrew Jeffery Acked-by: Benjamin Herrenschmidt Reviewed-by: Joel Stanley --- No change in v3/v4/v5. Changes in v2: - added port/endpoint properties for vhub dt node. arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 25 +++++++++++++ arch/arm/boot/dts/aspeed-g6.dtsi | 45 ++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi index 045ce66ca876..7028e21bdd98 100644 --- a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi +++ b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi @@ -1112,6 +1112,31 @@ groups = "UART9"; }; + pinctrl_usb2ah_default: usb2ah_default { + function = "USB2AH"; + groups = "USBA"; + }; + + pinctrl_usb2ad_default: usb2ad_default { + function = "USB2AD"; + groups = "USBA"; + }; + + pinctrl_usb2bh_default: usb2bh_default { + function = "USB2BH"; + groups = "USBB"; + }; + + pinctrl_usb2bd_default: usb2bd_default { + function = "USB2BD"; + groups = "USBB"; + }; + + pinctrl_usb11bhid_default: usb11bhid_default { + function = "USB11BHID"; + groups = "USBB"; + }; + pinctrl_vb_default: vb_default { function = "VB"; groups = "VB"; diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index 796976d275e1..0a29b3b57a9d 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -245,6 +245,51 @@ status = "disabled"; }; + ehci0: usb@1e6a1000 { + compatible = "aspeed,ast2600-ehci", "generic-ehci"; + reg = <0x1e6a1000 0x100>; + interrupts = ; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2ah_default>; + status = "disabled"; + }; + + ehci1: usb@1e6a3000 { + compatible = "aspeed,ast2600-ehci", "generic-ehci"; + reg = <0x1e6a3000 0x100>; + interrupts = ; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2bh_default>; + status = "disabled"; + }; + + uhci: usb@1e6b0000 { + compatible = "aspeed,ast2600-uhci", "generic-uhci"; + reg = <0x1e6b0000 0x100>; + interrupts = ; + #ports = <2>; + clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>; + status = "disabled"; + /* + * No default pinmux, it will follow EHCI, use an + * explicit pinmux override if EHCI is not enabled. + */ + }; + + vhub: usb-vhub@1e6a0000 { + compatible = "aspeed,ast2600-usb-vhub"; + reg = <0x1e6a0000 0x350>; + interrupts = ; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + aspeed,vhub-downstream-ports = <7>; + aspeed,vhub-generic-endpoints = <21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2ad_default>; + status = "disabled"; + }; + apb { compatible = "simple-bus"; #address-cells = <1>;