From patchwork Sun Mar 15 17:27:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 450319 X-Patchwork-Delegate: hdegoede@redhat.com 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 371A21400A0 for ; Mon, 16 Mar 2015 04:28:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 602CB4B62C; Sun, 15 Mar 2015 18:28:17 +0100 (CET) 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 IyXVH8yZmwxP; Sun, 15 Mar 2015 18:28:17 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 22E864B653; Sun, 15 Mar 2015 18:28:13 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4E6814A04A for ; Sun, 15 Mar 2015 18:28:09 +0100 (CET) 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 ltCecot2Z95N for ; Sun, 15 Mar 2015 18:28:09 +0100 (CET) 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 gagarine.paulk.fr (gagarine.paulk.fr [109.190.93.129]) by theia.denx.de (Postfix) with ESMTPS id 0D96F4A02A for ; Sun, 15 Mar 2015 18:28:06 +0100 (CET) Received: by gagarine.paulk.fr (Postfix, from userid 65534) id 53D2520AA3; Sun, 15 Mar 2015 18:28:05 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on gagarine.paulk.fr X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from armstrong.paulk.fr (armstrong.paulk.fr [82.233.88.171]) by gagarine.paulk.fr (Postfix) with ESMTPS id 0F00D20AA5; Sun, 15 Mar 2015 18:28:01 +0100 (CET) Received: from localhost.localdomain (aldrin [192.168.0.128]) by armstrong.paulk.fr (Postfix) with ESMTP id 3B37A3762F; Sun, 15 Mar 2015 18:28:00 +0100 (CET) From: Paul Kocialkowski To: u-boot@lists.denx.de Date: Sun, 15 Mar 2015 18:27:45 +0100 Message-Id: <1426440467-4525-2-git-send-email-contact@paulk.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426440467-4525-1-git-send-email-contact@paulk.fr> References: <1426440467-4525-1-git-send-email-contact@paulk.fr> Cc: Marek Vasut Subject: [U-Boot] [PATCH 2/4] sunxi: Avoid any assumption between musb gadget and host but fallback to host 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" musb might be used in gadget mode on sunxi, so we don't want to assume anything related to host mode, especially USB keyboard support. However, in case gadget mode is not explicitly used, fallback to host mode. Signed-off-by: Paul Kocialkowski --- board/sunxi/Kconfig | 2 +- include/configs/sunxi-common.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 9d0eb91..0b6a492 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -436,7 +436,7 @@ config USB_MUSB_SUNXI config USB_KEYBOARD boolean "Enable USB keyboard support" - default y + default n ---help--- Say Y here to add support for using a USB keyboard (typically used in combination with a graphical console). diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 1f7a1cb..ffd9f5c 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -297,13 +297,16 @@ extern int soft_i2c_gpio_scl; #endif #ifdef CONFIG_USB_MUSB_SUNXI +#ifndef CONFIG_MUSB_GADGET #define CONFIG_MUSB_HOST +#endif #define CONFIG_MUSB_PIO_ONLY #endif -#if defined CONFIG_USB_EHCI || defined CONFIG_USB_MUSB_SUNXI +#if defined CONFIG_USB_EHCI || defined CONFIG_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE +#define CONFIG_USB_KEYBOARD #endif #ifdef CONFIG_USB_KEYBOARD