From patchwork Sat May 13 13:57:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 762006 X-Patchwork-Delegate: iwamatsu@nigauri.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wQ7vR484Bz9s7r for ; Sun, 14 May 2017 00:07:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DOZh5xaP"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 4C71CC220F8; Sat, 13 May 2017 14:05:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 13A4EC220F4; Sat, 13 May 2017 13:59:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6672FC220A0; Sat, 13 May 2017 13:59:39 +0000 (UTC) Received: from mail-oi0-f66.google.com (mail-oi0-f66.google.com [209.85.218.66]) by lists.denx.de (Postfix) with ESMTPS id 45DA3C220A0 for ; Sat, 13 May 2017 13:58:41 +0000 (UTC) Received: by mail-oi0-f66.google.com with SMTP id w10so12753257oif.1 for ; Sat, 13 May 2017 06:58:41 -0700 (PDT) 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=0Lt6Mum/iN4sU+BIBJc1nCbjO5yX49HMHshPptBQjuM=; b=DOZh5xaPJVtY+/r/jpqHNPPxpv6SZJH8eFW7oeSAAf56QODqPtDR6dhXbdewBz1uwQ sZd59wqWnbIdioFYwd8VqpHQaxr4BpznWqgg+QI6sFfrbEh/uKxx7EYw1/Oh83nx4vml 5ciSlywcW50LtBaraF+/tPrreaGNNgQx4fRrK+Jvw765g1VvybFpVrgtMJL52ioTSKQd S+SHa0gEgUp+cmXrfNeUi4gN8/qSRejYgzG1+rLhQQ0XG14/MJYCF9I0YVj/+cgij9lT zT1Q3rPYVFEFc70HogpIf0rDDNzyeoKEoINBC2A/YWgvx6K2E9Xm6QjnkJ1ijkxUWNot DReA== 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=0Lt6Mum/iN4sU+BIBJc1nCbjO5yX49HMHshPptBQjuM=; b=qaf4d7Alq1oJdV0Z0+HvtQ7w7Pse0/AvjJ9xSnp/S9V6UyvBuiNXIsnY2JfNY28pz5 DEOynFzpnewkLB7xqx8qnjdGnKr8+Gj1px0nFAEb7iYR6hjb0lcOtXBOn8UtZ8f+zRLx 9RFeVDtxj7TAGJDpmqxHpkAUUbhG6Pdszh3jemX4Tj/zCgGnzUArzBbSk0T1xmIHeG8B C2EyU5vmj96/hP0wv6AIiEC0LFSGRPnx4UMQVtEYiDyOFBeCYIWDcKkM8WMwAXkvUohm KUch8bQy+qKDfpMg0e7ZJuE29Pza8+XwM9j7nXUQN32nJ3D4gHzALqOhNrmh/a1zpPVm VI2w== X-Gm-Message-State: AODbwcDkvcimnFu6OKKyUnhE5Hc7BwqS19uPOXGWtislcBtfWb7TMbX0 Tpk1e7HnrKkrWA== X-Received: by 10.157.63.143 with SMTP id r15mr3934865otc.89.1494683920230; Sat, 13 May 2017 06:58:40 -0700 (PDT) Received: from kurokawa.lan ([195.140.253.167]) by smtp.gmail.com with ESMTPSA id r203sm2946858oif.15.2017.05.13.06.58.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 May 2017 06:58:39 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Sat, 13 May 2017 15:57:49 +0200 Message-Id: <20170513135753.8478-19-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170513135753.8478-1-marek.vasut+renesas@gmail.com> References: <20170513135753.8478-1-marek.vasut+renesas@gmail.com> Cc: Hiroyuki Yokoyama , Marek Vasut Subject: [U-Boot] [PATCH 19/23] ARM: rmobile: salvator-x: Add USB support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Add support for the EHCI USB. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- board/renesas/salvator-x/salvator-x.c | 12 ++++++++++++ configs/salvator-x_defconfig | 6 ++++++ include/configs/salvator-x.h | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index acc541df0c..44e4006f5c 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -107,6 +107,9 @@ int board_init(void) mstp_clrbits_le32(MSTPSR1, SMSTPCR1, GSX_MSTP112); + /* USB1 pull-up */ + setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); + #ifdef CONFIG_RAVB /* EtherAVB Enable */ /* GPSR2 */ @@ -131,6 +134,15 @@ int board_init(void) /* IPSR3 */ gpio_request(GPIO_FN_AVB_AVTP_CAPTURE_B, NULL); + /* USB2_OVC */ + gpio_request(GPIO_GP_6_15, NULL); + gpio_direction_input(GPIO_GP_6_15); + + /* USB2_PWEN */ + gpio_request(GPIO_GP_6_14, NULL); + gpio_direction_output(GPIO_GP_6_14, 1); + gpio_set_value(GPIO_GP_6_14, 1); + /* AVB_PHY_RST */ gpio_request(GPIO_GP_2_10, NULL); gpio_direction_output(GPIO_GP_2_10, 0); diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index 3738fe4536..60e0b720bb 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -17,6 +17,12 @@ CONFIG_CMD_NFS=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_DHCP=y +CONFIG_CMD_USB=y +CONFIG_USB=y +CONFIG_USB_HOST=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_EHCI_RCAR_GEN3=y CONFIG_DOS_PARTITION=y CONFIG_MMC=y CONFIG_GENERIC_MMC=y diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 0e5c130b13..4ac9328e1b 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -62,6 +62,13 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x30 +/* USB */ +#ifdef CONFIG_R8A7795 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 +#else +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#endif + /* SDHI */ #define CONFIG_SH_SDHI_FREQ 200000000