From patchwork Mon Jul 13 19:01:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 494682 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CB23D1402E2 for ; Tue, 14 Jul 2015 05:03:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E9EA14B670; Mon, 13 Jul 2015 21:03:02 +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 v1_jS1mT33Es; Mon, 13 Jul 2015 21:03:02 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4475E4B6A9; Mon, 13 Jul 2015 21:03:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4BBF74B703 for ; Mon, 13 Jul 2015 21:03: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 DkWgfw8H1HuF for ; Mon, 13 Jul 2015 21:03:00 +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 mail-qg0-f48.google.com (mail-qg0-f48.google.com [209.85.192.48]) by theia.denx.de (Postfix) with ESMTPS id 6F7CD4B6F5 for ; Mon, 13 Jul 2015 21:02:54 +0200 (CEST) Received: by qget71 with SMTP id t71so160858565qge.2 for ; Mon, 13 Jul 2015 12:02:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references :organization; bh=Pqxvrfek9rurz3dYBALznq9/k1df9kJAKqf48AATb30=; b=dz4UN3iyD9sDRpeJvoTzkz+nlbpf3t1U/gO3qydCaMiZRYra58NDRIWzenzfsKrj2+ YE8C9ji0ofMWvB5FCyUvJQPOl4drY/Z+TarS8ZguHlMzCh+WGYduuLJCQysDVJUWAZqM c5+Yd5xWH5tPsh+R9/U6ZaHY2/C8s5auNGEXbWC83HannrKhPZ8TmnAs8IXePw3vN3PQ wG+8tTHnX5JhPx0wzJnbqaMPhhZc+dTgv1rJClkN9e9cT2pYRhZi/vfOJlfl6M7DTT5Y jpI49ZDeKuO9E8swnR4g40DmDNXUMVCIwheCEkoaYcQg+fk4t582wSLu6GN5yrytD8Rb mEdg== X-Received: by 10.55.15.144 with SMTP id 16mr54246401qkp.98.1436814173598; Mon, 13 Jul 2015 12:02:53 -0700 (PDT) Received: from localhost ([179.105.243.19]) by smtp.gmail.com with ESMTPSA id 125sm11241874qhx.44.2015.07.13.12.02.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jul 2015 12:02:52 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Mon, 13 Jul 2015 16:02:47 -0300 From: Otavio Salvador To: U-Boot Mailing List Date: Mon, 13 Jul 2015 16:01:07 -0300 Message-Id: <1436814070-9108-12-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1436814070-9108-1-git-send-email-otavio@ossystems.com.br> References: <1436814070-9108-1-git-send-email-otavio@ossystems.com.br> Organization: O.S. Systems Software LTDA. Cc: Tom Rini , Michael.Schanz@congatec.com, Otavio Salvador , Alejandro.de-cabo-Garcia@congatec.com Subject: [U-Boot] [PATCH v2 12/15] cgtqmx6eval: Add USB support 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" Add USB support. Signed-off-by: Otavio Salvador --- Changes in v2: - Use plan gpio API call (Marek) board/congatec/cgtqmx6eval/cgtqmx6eval.c | 44 ++++++++++++++++++++++++++++++++ include/configs/cgtqmx6eval.h | 15 +++++++++++ 2 files changed, 59 insertions(+) diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 60e1e9a..812f7bb 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -151,6 +151,11 @@ static iomux_v3_cfg_t enet_pads_ar8035[] = { MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), }; +static iomux_v3_cfg_t const usb_otg_pads[] = { + MX6_PAD_EIM_D22__USB_OTG_PWR | MUX_PAD_CTRL(NO_PAD_CTRL), + MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL), +}; + #define PC MUX_PAD_CTRL(I2C_PAD_CTRL) struct i2c_pads_info i2c_pad_info1 = { .scl = { @@ -460,6 +465,45 @@ int board_mmc_init(bd_t *bis) } #endif +int board_ehci_hcd_init(int port) +{ + switch (port) { + case 0: + imx_iomux_v3_setup_multiple_pads(usb_otg_pads, + ARRAY_SIZE(usb_otg_pads)); + /* + * set daisy chain for otg_pin_id on 6q. + * for 6dl, this bit is reserved + */ + imx_iomux_set_gpr_register(1, 13, 1, 0); + break; + case 1: + /* nothing to do */ + break; + default: + printf("Invalid USB port: %d\n", port); + return -EINVAL; + } + + return 0; +} + +int board_ehci_power(int port, int on) +{ + switch (port) { + case 0: + break; + case 1: + gpio_direction_output(IMX_GPIO_NR(5, 5), on); + break; + default: + printf("Invalid USB port: %d\n", port); + return -EINVAL; + } + + return 0; +} + int board_early_init_f(void) { setup_iomux_uart(); diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index df22534..ce995a8 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -77,6 +77,21 @@ #define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +/* USB Configs */ +#define CONFIG_CMD_USB +#define CONFIG_CMD_FAT +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_MX6 +#define CONFIG_USB_STORAGE +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_ASIX +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CONFIG_MXC_USB_FLAGS 0 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ +#define CONFIG_USB_KEYBOARD +#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP + #define CONFIG_DEFAULT_FDT_FILE "imx6q-congatec.dtb" #define CONFIG_EXTRA_ENV_SETTINGS \