From patchwork Wed Apr 5 19:20:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 747469 X-Patchwork-Delegate: sbabic@denx.de 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 3vywyk4ZKWz9s8T for ; Thu, 6 Apr 2017 05:34:38 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5EF14C21C63; Wed, 5 Apr 2017 19:30:33 +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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 058E2C21CAD; Wed, 5 Apr 2017 19:24:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DEEF3C21CAD; Wed, 5 Apr 2017 19:22:40 +0000 (UTC) Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by lists.denx.de (Postfix) with ESMTPS id DB0CAC21C49 for ; Wed, 5 Apr 2017 19:22:36 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 79so3285824pgf.0 for ; Wed, 05 Apr 2017 12:22:36 -0700 (PDT) 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=9ro0oqyQO1VGVRbkIVsi1T7/vdMt8a9Qi+jf+wdK5e0=; b=qIoM8NsUqcClqb8/YNkXjVSKKHHakA4/JtCEdkr3Q/sXgNrn8VkpvpASFdhGwLKQU5 YFMMs788MNVosbGzxHkD1yhYmHtvaOYoDJ9IBzKbJrZxWcYWh2m9ahV9eye92USRoK7K vPvY4udGX954nR+ML6f8bUHU9e7sb/dtyugI9Qp0+3xhD2h8dDoJcJl0wpYHFaZ4oPxd UWy380NfssNjHR2dms2ZUja+DwQnYAHGRTnzgbQdDnERy/30zwB9zvFHuszLL75UFjIe uLFH+Zir+sjcjr7ymVogX8KZ3ST/TDbTm6gAqmyQFL/6WurSKaSq6eXoJrOe7S3SYFrR GWvg== X-Gm-Message-State: AFeK/H1Dd4qCcPH0I3fyAYWlAW6i5ynheeGszhtnuPlTD5Ilu8cAN2co5NMdHRc7bJj4hw== X-Received: by 10.98.152.91 with SMTP id q88mr30762889pfd.69.1491420155587; Wed, 05 Apr 2017 12:22:35 -0700 (PDT) Received: from localhost.localdomain ([117.254.77.17]) by smtp.gmail.com with ESMTPSA id 189sm38970526pgd.30.2017.04.05.12.22.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 12:22:34 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Thu, 6 Apr 2017 00:50:26 +0530 Message-Id: <1491420041-12471-17-git-send-email-jagan@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491420041-12471-1-git-send-email-jagan@openedev.com> References: <1491420041-12471-1-git-send-email-jagan@openedev.com> Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH v3 16/31] ARM: i.MX6: sabresd: Enable DM_USB 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" From: Jagan Teki Enable DM_USB for dt supported sabresd config boards: - imx6q_sabresd_defconfig - imx6qp_sabresd_defconfig Cc: Stefano Babic Cc: Fabio Estevam Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- board/freescale/mx6sabresd/mx6sabresd.c | 4 ++-- configs/imx6q_sabresd_defconfig | 1 + configs/imx6qp_sabresd_defconfig | 1 + include/configs/mx6sabresd.h | 9 ++++++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 5776b39..a143dbb 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -515,7 +515,7 @@ int board_eth_init(bd_t *bis) return cpu_eth_init(bis); } -#ifdef CONFIG_USB_EHCI_MX6 +#if defined(CONFIG_USB_EHCI_MX6) && !defined(CONFIG_DM_USB) #define USB_OTHERREGS_OFFSET 0x800 #define UCTRL_PWR_POL (1 << 9) @@ -599,7 +599,7 @@ int board_init(void) #ifndef CONFIG_DM_I2C setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); #endif -#ifdef CONFIG_USB_EHCI_MX6 +#if defined(CONFIG_USB_EHCI_MX6) && !defined(CONFIG_DM_USB) setup_usb(); #endif diff --git a/configs/imx6q_sabresd_defconfig b/configs/imx6q_sabresd_defconfig index 84e34f1..9ac3c9c 100644 --- a/configs/imx6q_sabresd_defconfig +++ b/configs/imx6q_sabresd_defconfig @@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y +CONFIG_DM_USB=y # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set CONFIG_DM_PMIC_PFUZE100=y diff --git a/configs/imx6qp_sabresd_defconfig b/configs/imx6qp_sabresd_defconfig index f0be6ea..a01482c 100644 --- a/configs/imx6qp_sabresd_defconfig +++ b/configs/imx6qp_sabresd_defconfig @@ -58,6 +58,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y +CONFIG_DM_USB=y # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set CONFIG_DM_PMIC_PFUZE100=y diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 6abe7a4..4f6bb1b 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -70,12 +70,15 @@ /* USB Configs */ #ifdef CONFIG_USB_EHCI_MX6 -#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 1 /* Enabled USB controller number */ + +# ifndef CONFIG_DM_USB +# define CONFIG_MXC_USB_FLAGS 0 +# define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */ +# define CONFIG_EHCI_HCD_INIT_AFTER_RESET +# endif #endif #endif /* __MX6QSABRESD_CONFIG_H */